X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=debian%2Frules;h=b13c7ab4e196e4d1229c70eef145e83cd8b7b5e7;hb=f4298d3c8cce17256396c5be7d1d3c920ee87938;hp=b1b4e55f550e54cb315c38f51ef56178436ba58e;hpb=44c3064f527a896dc394e527d94e4646afe21365;p=mirror%2Fuserdir-ldap.git

diff --git a/debian/rules b/debian/rules
index b1b4e55..b13c7ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,23 +11,17 @@ pysite:=usr/lib/python$(pyversion)/site-packages
 
 build:
 	dh_testdir
-	$(MAKE) -C web
 	touch build
 
 clean:
 	dh_testdir
 	-rm -f build
 	-find . -name '*.py[co]' | xargs rm -f
-	$(MAKE) -C web clean
 	-rm -rf $(i) debian/files* core debian/substvars
 
 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
@@ -42,27 +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