X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv-utils.git;a=blobdiff_plain;f=debian%2Frules;h=6ff8c3bea0c4a19892821d9b198bdebe349d40d1;hp=a06ad571c542780d24565568d803948a0c60a4e6;hb=186ea161e7d144dd8e3791f174a7173e2f399346;hpb=be9d557317b2cbcf307074aa126e70d49ca3500b

diff --git a/debian/rules b/debian/rules
index a06ad57..6ff8c3b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@
 subdirs_build=	ipif www-cgi 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)
 
@@ -57,7 +57,22 @@ override_dh_auto_install:
 		; \
 	done
 	-
-	mv debian/userv-www-cgi debian/userv-cgi
+	mv debian/userv-misc debian/userv-utils
+	-
+	set -e; cd debian/userv-ipif/usr/share/doc;	\
+		mv userv-ipif userv-utils;		\
+		cd userv-utils;				\
+		mv service.c.txt ipif.txt
+	cp -al debian/userv-ipif/. debian/userv-utils/.
+	-
+	set -e; cd debian/userv-www-cgi/usr/share/doc;	\
+		mv userv-cgi userv-utils;		\
+		cd userv-utils;				\
+		rename 's/^/ucgi-/' *
+	cp -al debian/userv-www-cgi/. debian/userv-utils/.
+	cp www-cgi/www-cgi \
+		debian/userv-utils/etc/userv/services.d/ucgi
+	-
 	mv debian/userv-groupmanage/usr/share/doc/groupmanage \
 	   debian/userv-groupmanage/usr/share/doc/userv-groupmanage
 	-
@@ -65,9 +80,12 @@ override_dh_auto_install:
 		$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: