Merged from debian branch

diff --combined debian/changelog
index 67ec0e9,ab3ed40..5b480b4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,5 +1,6 @@@
  userdir-ldap (0.3.15+xxx) XXunstable; urgency=low
  
 +  [ Peter Palfrader ]
    * Ship userdir-ldap.schema with the package, add a note that it is
      now version-controlled in bzr on top of the file.
    * Get rid of debian/conffiles, wich only listed files in /etc anyway.
@@@ -11,24 -10,18 +11,34 @@@
    * Change the build dependency on python-support to be versioned >= 0.3.
    * ud-roleadd: Do not try to make role accounts of objectClass
      inetOrgPerson, that doesn't work.
+   * ud-fingerserv: implement daemonize() for non-inetd mode [sgran].
+   * ud-useradd: support usergroups [HE].
+   * ud-host/userdir-ldap.schema: Add 'purpose', 'physicalHost' to
+     debianServer schema and teach ud-host about [HE].
+   * ud-host: cleanup: Replace local copy HBaseDn of the centrally
+     configured HostBaseDn [HE].
+   * Add myself to uploaders.
+   * ud-generate: Set shadow expiry to 1 for locked accounts [mhy].
+   * update doc/slapd-config.txt: labeledURL was removed from the schema but
+     not the slapd.conf example.  Do that now [mhy].
  
 - -- Peter Palfrader <weasel@debian.org>  Wed, 26 Dec 2007 16:46:27 +0100
 +  [ Mark Hymers ]
 +  * ud-userimport, ud-groupadd, ud-roleadd, ud-useradd, userdir_ldap.py:
 +    Update ud-userimport to use the same objectClasses as
 +    ud-{user,group,role}add and abstract them out into userdir_ldap.py
 +  * ud-useradd: Avoid a TypeError exception when constructing the template
 +    filename
 +  * Remove use of deprecated functions from the string module
 +  * ud-arbimport: os.exit -> sys.exit
 +
 +  [ 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