X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=debian%2Frules;h=b13c7ab4e196e4d1229c70eef145e83cd8b7b5e7;hb=87d069ae7d00250f252d33074bdf86f1b74430a0;hp=cac28fb49c85b3f863b9dcbcb6e82454f7944878;hpb=2414d2c6298b0d35567b1a4adb9896e163e3ce00;p=mirror%2Fuserdir-ldap.git

diff --git a/debian/rules b/debian/rules
index cac28fb..b13c7ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,11 +21,7 @@ clean:
 
 instdirs = \
 	usr/bin \
-	usr/share/man/man1 \
 	$(pysite)/userdir_ldap \
-	var/www/userdir-ldap \
-	var/cache/userdir-ldap/web-cookies \
-	var/cache/userdir-ldap/hosts \
 	usr/share/doc/$(package)/samples \
 	etc/userdir-ldap/templates \
 	etc/cron.d
@@ -40,26 +36,22 @@ 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
-	install -m 644 web/*.tab $(i)/var/www/userdir-ldap/
-	install -m 644 web/*.html $(i)/var/www/userdir-ldap/
-	install -m 644 web/*.cfg $(i)/var/www/userdir-ldap/
-	install -m 644 web/*.pm $(i)/var/www/userdir-ldap/
-	install -m 755 web/*.cgi $(i)/var/www/userdir-ldap/
-	chown www-data.www-data $(i)/var/cache/userdir-ldap/web-cookies/
-	chmod u=rwx,g=,o= $(i)/var/cache/userdir-ldap/web-cookies/
-	
-	install -m 644 doc/{apache-config.txt,slapd-config.txt} $(i)/usr/share/doc/$(package)
+
+	install -m 644 doc/slapd-config.txt $(i)/usr/share/doc/$(package)
 	install -m 644 doc/samples/ud-* $(i)/usr/share/doc/$(package)/samples
 	gzip -9 $(i)/usr/share/doc/$(package)/*.txt
 	install -m 644 userdir-ldap.conf $(i)/etc/userdir-ldap/
 	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/
-	
+
+	dh_installdocs
+	dh_installchangelogs
 	dh_installmanpages
-	dh_fixperms --exclude=web-cookies
+	dh_fixperms
 	dh_compress
 	dh_installdeb
 	$(PYTHON) debian/python-dep >> debian/substvars