Merge packaging cleanup from alioth (including template dir install location fix)

diff --combined debian/changelog
index aea77b4,64a6dcd..c6fc647
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -24,8 -24,6 +24,8 @@@ userdir-ldap (0.3.15+xxx) XXunstable; u
    * ud-generate: Set shadow expiry to 1 for locked accounts.
    * update doc/slapd-config.txt: labeledURL was removed from the schema but
      not the slapd.conf example.  Do that now.
 +  * add simple ud-config script for use in shell scripts.  This allows
 +    querying config values.
  
    [ Marc 'HE' Brockschmidt ]
    * Make the host ud-replicate syncs from configurable in userdir-ldap.conf,
@@@ -38,10 -36,6 +38,10 @@@
      debianServer schema and teach ud-host about it
    * ud-host: cleanup: Replace local copy HBaseDn of the centrally
      configured HostBaseDn.
 +  * ud-generate: Mark that no passwords are exported also in the
 +    generated passwd file, not only in the shadow file (by using a "*"
 +    as password (meaning "no password"), instead of "x" (meaning "do I
 +    look like a passwd from the nineties? Look into /etc/shadow!")).
  
    [ Joerg Jaspert ]
    * Enhance copyright file a bit, also adding a pointer to our repository
@@@ -51,8 -45,16 +51,16 @@@
  
    [ Stephen Gran ]
    * ud-fingerserv: implement daemonize() for non-inetd mode.
+   * Packaging cleanup
+   * Use standard debhelper tools
+   * Create all files we ship instead of echoing them into creation at build
+     time
+   * Typo fix in copyright
+   * Update Standards-Version to 3.7.3 (no changes)
+   * Build manpages at build time (add Build-Depend on yodl)
+   * Install built manpages
  
-  -- Joerg Jaspert <joerg@debian.org>  Fri, 28 Dec 2007 16:29:35 +0100
+  -- Stephen Gran <sgran@debian.org>  Mon, 07 Jan 2008 01:50:15 +0000
  
  userdir-ldap (0.3.15) unstable; urgency=low
  

diff --combined debian/install
index 0000000,348510a..a3cca0f
mode 000000,100644..100644
--- /dev/null
--- 2/debian/install
+++ b/debian/install
@@@ -1,0 -1,25 +1,25 @@@
 -templates/ etc/userdir-ldap/templates/
+ userdir_ldap.pth usr/share/python-support/
+ userdir_ldap.py usr/share/python-support/userdir_ldap/
+ userdir_gpg.py usr/share/python-support/userdir_ldap/
+ ud-forwardlist usr/bin
+ ud-gpgimport usr/bin
+ ud-info usr/bin
+ ud-ldapshow usr/bin
+ ud-userimport usr/bin
+ ud-mailgate usr/bin
+ ud-generate usr/bin
+ ud-passchk usr/bin
+ ud-useradd usr/bin
+ ud-replicate usr/bin
+ ud-xearth usr/bin
+ ud-fingerserv usr/bin
+ ud-echelon usr/bin
+ ud-groupadd usr/bin
+ ud-host usr/bin
+ ud-zoneupdate usr/bin
+ ud-roleadd usr/bin
+ sigcheck usr/bin
+ userdir-ldap.conf etc/userdir-ldap/
+ generate.conf etc/userdir-ldap/
++templates/ etc/userdir-ldap/
+ userdir-ldap.schema etc/ldap/schema/