Merge from alioth

But fix ud-replicate to use `$LOCALSYNCON' instead of `*$LOCALSYNCON*' in the case statement.

diff --cc debian/changelog
index 0459844,67ec0e9..7ad7d5a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -34,10 -20,15 +34,17 @@@ userdir-ldap (0.3.15+xxx) XXunstable; u
      filename
    * Remove use of deprecated functions from the string module
    * ud-arbimport: os.exit -> sys.exit
 +  * add simple ud-config script for use in shell scripts.  This allows
 +    querying config values.
  
-  -- Peter Palfrader <weasel@debian.org>  Thu, 10 Jan 2008 15:34:46 +0100
+   [ Marc 'HE' Brockschmidt ]
+   * Make the host ud-replicate syncs from configurable in userdir-ldap.conf,
+     instead of hardcoding it into the script. Also introduce a variable
+     containing a shell glob on which no remote sync is needed, so that
+     the db host doesn't need to have a key in the authorized_keys file
+     for the sshdist user
+ 
+  -- Marc 'HE' Brockschmidt <he@debian.org>  Thu, 27 Dec 2007 17:14:51 +0100
  
  userdir-ldap (0.3.15) unstable; urgency=low
  

diff --cc ud-replicate
index 1a0ca55,26818ed..0c17297
--- 1/ud-replicate
--- 2/ud-replicate
+++ b/ud-replicate
@@@ -37,7 -39,7 +39,7 @@@ lockfile -r 1 -l 3600 loc
  trap "rm -f lock" exit
  
  case $HOST in
- *samosa*)
 -*$LOCALSYNCON*)
++$LOCALSYNCON)
      udhost=
      ;;
  *)