X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=debian%2Frules;h=b49cd7b6ad4e191d7db5481070c70f72a7349bd8;hb=50a9e1ca77ee3f36febc8afda740f12d2888ae2e;hp=56dae6a09408e6f275746e5b526d1b12a9050b56;hpb=f3ed9081bcc472b79a53be4feb28e01b17b5c1fd;p=mirror%2Fuserdir-ldap-cgi.git

diff --git a/debian/rules b/debian/rules
index 56dae6a..b49cd7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 # based on the sample debian/rules file for GNU hello by Ian Jackson.
 
 package:=userdir-ldap-cgi
-i:=./debian/tmp
+i:=./debian/$(package)
 
 build:
 	dh_testdir
@@ -14,12 +14,14 @@ build:
 clean:
 	dh_testdir
 	-rm -f build
-	-rm -rf $(i) debian/files* core debian/substvars debian/debhelper.log
+	-rm -rf debian/files* core debian/substvars debian/debhelper.log html/*.html
 
 instdirs = \
 	var/www/userdir-ldap \
+	var/www/userdir-ldap/Pics \
 	var/cache/userdir-ldap/web-cookies \
 	var/cache/userdir-ldap/hosts \
+	var/cache/userdir-ldap/totp \
 	usr/share/doc/$(package) \
 	usr/lib/userdir-ldap-cgi
 
@@ -32,11 +34,14 @@ binary-indep: build
 
 	install -m 755 *.cgi $(i)/var/www/userdir-ldap/
 	install -m 644 Util.pm $(i)/var/www/userdir-ldap/
-	install -m 644 html/index.html $(i)/var/www/
+	#install -m 644 html/index.html $(i)/var/www/
+	install -m 644 html/Pics/*.png $(i)/var/www/userdir-ldap/Pics/
+	install -m 644 html/*.css $(i)/var/www/userdir-ldap/
 	install -m 644 html/doc-direct.html $(i)/var/www/userdir-ldap/
 	install -m 644 html/doc-general.html $(i)/var/www/userdir-ldap/
 	install -m 644 html/doc-hosts.html $(i)/var/www/userdir-ldap/
 	install -m 644 html/doc-mail.html $(i)/var/www/userdir-ldap/
+	install -m 644 html/doc-mail-handling.html $(i)/var/www/userdir-ldap/
 	install -m 644 html/forward.html $(i)/var/www/userdir-ldap/
 	install -m 644 html/hostinfo.html $(i)/var/www/userdir-ldap/
 	install -m 644 html/login.html $(i)/var/www/userdir-ldap/
@@ -44,14 +49,19 @@ binary-indep: build
 	install -m 644 html/searchform.html $(i)/var/www/userdir-ldap/
 	install -m 644 html/searchhelp.html $(i)/var/www/userdir-ldap/
 	install -m 644 html/searchresults.html $(i)/var/www/userdir-ldap/
+	install -m 644 html/fetch-totp-seed.html $(i)/var/www/userdir-ldap/
 	install -m 644 html/update.html $(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/
+	chown www-data:www-data $(i)/var/cache/userdir-ldap/totp/
+	chmod u=rwx,g=,o= $(i)/var/cache/userdir-ldap/totp/
 
 	install -m 755 password-qualify-check $(i)/usr/lib/userdir-ldap-cgi
 
 	install -m 644 apache-config.txt $(i)/usr/share/doc/$(package)
 
+	dh_link
+
 	dh_installchangelogs
 	dh_installcron
 	dh_fixperms --exclude=web-cookies