X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=debian%2Frules;h=abd95f147aa42d25608a613176da4360b3d42582;hb=39fea3528117f4ed33155c0083b132aa45a52140;hp=454da0abc1ffa9823376eb97ea46e2f4d0ab55b6;hpb=eae592f7884ae95cabd41c3984a8672ecae961c2;p=mirror%2Fuserdir-ldap-cgi.git

diff --git a/debian/rules b/debian/rules
index 454da0a..abd95f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,30 +4,35 @@
 # based on the sample debian/rules file for GNU hello by Ian Jackson.
 
 package:=userdir-ldap-cgi
-i:=./debian/tmp
+i:=./debian/$(package)
 
-build:
+build: build-indep
+
+build-indep:
 	dh_testdir
 	$(MAKE) -C html
-	touch build
 
 clean:
 	dh_testdir
-	-rm -f build
-	-rm -rf $(i) debian/files* core debian/substvars debian/debhelper.log html/*.html
+	dh_clean
+	-rm -rf debian/files* core debian/substvars debian/debhelper.log html/*.html html/domains.tab
 
 instdirs = \
 	var/www/userdir-ldap \
+	var/www/userdir-ldap/js \
+	var/www/userdir-ldap/js/DataTables-1.10.20 \
+	var/www/userdir-ldap/js/DataTables-1.10.20/images \
 	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
 
 binary-indep: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs $(instdirs)
 	dh_installdocs
 
@@ -36,6 +41,10 @@ binary-indep: build
 	#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/*.js $(i)/var/www/userdir-ldap/js
+	install -m 644 html/js/DataTables-1.10.20/*.css $(i)/var/www/userdir-ldap/js/
+	install -m 644 html/js/DataTables-1.10.20/*.js $(i)/var/www/userdir-ldap/js/
+	install -m 644 html/js/DataTables-1.10.20/images/* $(i)/var/www/userdir-ldap/js/DataTables-1.10.20/images/
 	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/
@@ -48,9 +57,12 @@ 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
 
@@ -60,7 +72,7 @@ binary-indep: build
 
 	dh_installchangelogs
 	dh_installcron
-	dh_fixperms --exclude=web-cookies
+	dh_fixperms --exclude=web-cookies --exclude=totp
 	dh_compress
 	dh_installdeb
 	dh_gencontrol
@@ -73,4 +85,4 @@ binary-arch: build
 
 binary:	binary-indep binary-arch
 
-.PHONY: binary binary-arch binary-indep clean
+.PHONY: build build-indep binary binary-arch binary-indep clean