X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=debian%2Frules;h=97bced17663819ef0f28f733e85f03d7059df542;hb=93dc755251df6490871f5b719d62d7f3ddfced32;hp=bdd1fa991a2563431d219f62e07b745a69a62fc3;hpb=15d3633b2c184da3d11e5d692add12ea8d00b341;p=userv.git

diff --git a/debian/rules b/debian/rules
index bdd1fa9..97bced1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+SHELL=/bin/bash
 package=userv
 
 t=debian/tmp
@@ -10,24 +11,24 @@ else
 	INSTOPTS= INSTALL_PROGRAM='install -c'
 endif
 
-build:
+build: build-arch build-indep
+
+build-arch:
 	$(checkdir)
 	./configure --prefix=/usr
 	$(MAKE) all docs
-	touch build
+	touch build-arch
 
 clean:
 	$(checkdir)
-	-rm -f build
-	-$(MAKE) -i distclean || $(MAKE) -f Makefile.in distclean
-	-rm -rf *~ $t debian/*~ debian/files* debian/substvars*
-	-rm -rf spec.html
+	rm -f build build-arch
+	$(MAKE) -i distclean || $(MAKE) -f Makefile.in distclean
+	rm -rf *~ $t
+	rm -rf spec.html spec.ps debian/substvars*
+	dh_clean
 
-binary-indep:	checkroot build
-	$(checkdir)
-# There are no architecture-independent files to be uploaded
-# generated by this package.  If there were any they would be
-# made here.
+build-indep:
+binary-indep:
 
 binary-arch:	checkroot build
 	$(checkdir)
@@ -35,12 +36,10 @@ binary-arch:	checkroot build
 	install -d $t/{DEBIAN,etc/init.d} $t/usr/{sbin,bin}
 	install -d $t/etc/userv/{override,default}.d
 	install -d $t/usr/share/doc/$(package)/examples/
-	install -d $t/var/run/$(package)/
 	install -d $t/usr/share/lintian/overrides/
-	cp debian/{postinst,prerm,postrm,conffiles} $t/DEBIAN/.
-	cp debian/initd $t/etc/init.d/userv
-	chmod 755 $t/DEBIAN/{postinst,prerm,postrm}
-	chmod 755 $t/etc/init.d/userv
+	install -m 755 debian/{postinst,prerm,postrm} $t/DEBIAN/.
+	install -m 644 debian/conffiles $t/DEBIAN/.
+	install -m 755 debian/initd $t/etc/init.d/userv
 	$(MAKE) $(INSTOPTS) \
 		prefix=$t/usr etcdir=$t/etc \
 		docdir=$t/usr/share/doc/userv \
@@ -52,13 +51,14 @@ binary-arch:	checkroot build
 	cp system.default system.override $t/usr/share/doc/$(package)/examples
 	ln -s changelog.gz $t/usr/share/doc/$(package)/changelog.Debian.gz
 	gzip -9v $t/usr/share/doc/$(package)/changelog \
-		$t/usr/share/man/man1/*.1 $t/usr/share/doc/userv/*.ps
+		$t/usr/share/man/man1/*.1 $t/usr/share/man/man8/*.8 \
+		$t/usr/share/doc/userv/*.ps
 	cp debian/lintian $t/usr/share/lintian/overrides/userv
 	dpkg-shlibdeps daemon client
 	dpkg-gencontrol -isp
-	chown -R root.root $t
-	chmod -R og=rX $t
-	chmod 700 $t/var/run/userv
+	dh_fixperms -Pdebian/tmp
+	chown root.root debian/tmp/usr/bin/userv
+	chmod 4755 debian/tmp/usr/bin/userv
 	dpkg --build $t ..
 
 define checkdir