X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=debian%2Frules;h=1ca73bfeec03c39c3b7cbfce94f114827341e616;hb=1422818798485844a564098732d296500ac4d7d5;hp=6f2476fc08522275d36a39bcf5aef72ba3cbb7c2;hpb=9e12b8afdff493484472237a47962f7729e90b28;p=mirror%2Fuserdir-ldap.git

diff --git a/debian/rules b/debian/rules
index 6f2476f..1ca73bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,9 @@
 # Made with the aid of debmake, by Christoph Lameter,
 # based on the sample debian/rules file for GNU hello by Ian Jackson.
 
-PYTHON:=/usr/bin/python
 package:=userdir-ldap
-pyversion:=`$(PYTHON) -c 'import sys; print sys.version[:3]'`
-i:=./debian/tmp
-pysite:=usr/lib/python$(pyversion)/site-packages
+i:=./debian/$(package)
+pysite:=usr/share/python-support
 
 build:
 	dh_testdir
@@ -24,7 +22,8 @@ instdirs = \
 	$(pysite)/userdir_ldap \
 	usr/share/doc/$(package)/samples \
 	etc/userdir-ldap/templates \
-	etc/cron.d
+	etc/cron.d \
+	etc/ldap/schema	
 
 binary-indep: build
 	dh_testdir
@@ -36,7 +35,7 @@ binary-indep: build
 	echo "userdir_gpg" >> $(i)/$(pysite)/userdir_ldap.pth
 	install -m 644 userdir_ldap.py userdir_gpg.py \
 		$(i)/$(pysite)/userdir_ldap/
-	install -m 755 {ud-forwardlist,ud-gpgimport,ud-info,ud-ldapshow,ud-userimport,ud-mailgate,ud-generate,ud-passchk,ud-useradd,ud-replicate,ud-xearth,ud-fingerserv,ud-echelon,ud-groupadd,ud-host,ud-zoneupdate} $(i)/usr/bin/
+	install -m 755 {ud-forwardlist,ud-gpgimport,ud-info,ud-ldapshow,ud-userimport,ud-mailgate,ud-generate,ud-passchk,ud-useradd,ud-replicate,ud-xearth,ud-fingerserv,ud-echelon,ud-groupadd,ud-host,ud-zoneupdate,ud-roleadd} $(i)/usr/bin/
 	install -m 755 sigcheck $(i)/usr/bin/
 	install -m 644 debian/ud-replicate.cron.d $(i)/etc/cron.d/ud-replicate
 
@@ -47,13 +46,15 @@ binary-indep: build
 	echo "# See /usr/share/doc/userdir-ldap" > $(i)/etc/userdir-ldap/generate.conf
 	chmod 644 $(i)/etc/userdir-ldap/generate.conf
 	install -m 644 templates/*-* $(i)/etc/userdir-ldap/templates/
+	install -m 644 userdir-ldap.schema $(i)/etc/ldap/schema/
 
+	dh_installdocs
 	dh_installchangelogs
-	dh_installmanpages
+	dh_installman
 	dh_fixperms
 	dh_compress
 	dh_installdeb
-	$(PYTHON) debian/python-dep >> debian/substvars
+	dh_pysupport
 	dh_gencontrol
 #	dh_makeshlibs
 	dh_md5sums