X-Git-Url: https://git.distorted.org.uk/~mdw/userv-utils/blobdiff_plain/0324503152d6edb67572b45225745441913ae55e..b943240f15db6b7684fbd241dc0ab5445390dde5:/debian/rules

diff --git a/debian/rules b/debian/rules
index 2c604d8..499179b 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
@@ -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)
 
@@ -37,7 +37,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,11 +53,11 @@ override_dh_auto_install:
 			prefix=$$t/usr \
 			etcdir=$$t/etc \
 			vardir=$$t/var \
-			depr=disable \
 			gituser=root \
 		; \
 	done
 	-
+	mv debian/userv-misc debian/userv-utils
 	mv debian/userv-www-cgi debian/userv-cgi
 	mv debian/userv-groupmanage/usr/share/doc/groupmanage \
 	   debian/userv-groupmanage/usr/share/doc/userv-groupmanage
@@ -66,9 +66,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: