X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv-utils.git;a=blobdiff_plain;f=debian%2Frules;h=b8b47aa6e777af52ffb37a967d8305d29f899176;hp=2c604d862651734cb35d4498a95d78b0c90ac8ed;hb=af0fdc2725972c0723e14ffe34a5dfae5c0b3594;hpb=0324503152d6edb67572b45225745441913ae55e

diff --git a/debian/rules b/debian/rules
index 2c604d8..b8b47aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-# Copyright 1996-2013 Ian Jackson <ijackson@chiark.greenend.org.uk>
+# Copyright 1996-2013,2016 Ian Jackson <ijackson@chiark.greenend.org.uk>
 # Copyright 1998 David Damerell <damerell@chiark.greenend.org.uk>
 # Copyright 1999,2003
 #    Chancellor Masters and Scholars of the University of Cambridge
@@ -19,13 +19,15 @@
 # You should have received a copy of the GNU General Public License
 # along with userv-utils; if not, see http://www.gnu.org/licenses/.
 
-subdirs_build=	ipif www-cgi git-daemon
+subdirs_build=	ipif ucgi git-daemon
 subdirs_nobuild=dyndns groupmanage misc
 package=	userv-utils
-packages_indep=	userv-dyndns userv-groupmanage userv-misc userv-git-daemon
+packages_indep=	userv-dyndns userv-groupmanage userv-utils userv-git-daemon
 packages_arch=	userv-ipif userv-cgi
 packages=	$(packages_indep) $(packages_arch)
 
+SHELL=/bin/bash
+
 cwd=	$(shell pwd)
 d=	$(cwd)/debian
 
@@ -37,7 +39,7 @@ override_dh_auto_configure:
 override_dh_auto_build:
 	$(checkdir)
 	set -e; for s in $(subdirs_build); do \
-		$(MAKE) -C $$s all depr=disable; \
+		$(MAKE) -C $$s all; \
 	done
 	touch build
 
@@ -53,22 +55,39 @@ override_dh_auto_install:
 			prefix=$$t/usr \
 			etcdir=$$t/etc \
 			vardir=$$t/var \
-			depr=disable \
 			gituser=root \
 		; \
 	done
 	-
-	mv debian/userv-www-cgi debian/userv-cgi
-	mv debian/userv-groupmanage/usr/share/doc/groupmanage \
-	   debian/userv-groupmanage/usr/share/doc/userv-groupmanage
+	mv debian/userv-misc debian/userv-utils
+	-
+	mv $d/userv-ipif/usr/share/doc/userv-ipif/{service.c.txt,ipif.txt}
+	-
+	set -e; cd debian/userv-ucgi/usr/share/doc/userv-ucgi;	\
+		rename 's/^/ucgi-/' *
+	-
+	set -e; cd debian/userv-groupmanage/usr/share/doc;	\
+		mv groupmanage userv-groupmanage
+	-
+	set -e; for p in userv-ipif userv-ucgi; do		\
+		(cd debian/$$p/usr/share/doc;			\
+		 mv $$p userv-utils);				\
+		cp -al debian/$$p/. debian/userv-utils/.;	\
+	done
+	-
+	perl -pe 's{/usr/local/}{/usr/}' ucgi/www-cgi	\
+		>debian/userv-utils/etc/userv/services.d/www-cgi
 	-
 	rename 's/\.example$$//' $d/userv-ipif/etc/userv/vpn/*.example \
 		$d/userv-dyndns/etc/userv/dyndns-service-users.example \
 		$d/userv-groupmanage/etc/groupmanage.conf.example
 	rename 's/\.distrib$$//' $d/*/etc/userv/services.d/*.distrib
-	rename 's/$$/\.disabled/' $d/userv-misc/etc/userv/services.d/mailq
 	-
-	mv $d/userv-misc/usr/bin/mailq $d/userv-misc/usr/bin/mailq.userv
+	mv $d/userv-utils/usr/bin/mailq $d/userv-utils/usr/bin/mailq.userv
+	-
+	set -e; cd $d/userv-utils/etc/userv;			\
+		mkdir services-available;			\
+		mv services.d/* services-available/
 
 override_dh_install: