From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 10 Jan 2008 15:07:10 +0000 (+0100)
Subject: Merge from alioth
X-Git-Tag: userdir-ldap-0.3.16~4
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7d60d9e30d7bc316b356ce98406c799106ab8428;hp=-c;p=mirror%2Fuserdir-ldap.git

Merge from alioth
---

7d60d9e30d7bc316b356ce98406c799106ab8428
diff --combined debian/install
index a3cca0f,50577ee..9758639
--- a/debian/install
+++ b/debian/install
@@@ -1,6 -1,7 +1,7 @@@
  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-config usr/bin
  ud-forwardlist usr/bin
  ud-gpgimport usr/bin
  ud-info usr/bin
@@@ -21,5 -22,5 +22,5 @@@ ud-roleadd usr/bi
  sigcheck usr/bin
  userdir-ldap.conf etc/userdir-ldap/
  generate.conf etc/userdir-ldap/
 -templates/ etc/userdir-ldap/templates/
 +templates/ etc/userdir-ldap/
  userdir-ldap.schema etc/ldap/schema/