X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv.git;a=blobdiff_plain;f=debian%2Frules;h=97bced17663819ef0f28f733e85f03d7059df542;hp=eef6216bfb4c5112b903fdfa423fefb59c0345c9;hb=d7a37ea561658a73e9927165cf85ca67d7f1396e;hpb=5df3f68d0d1f7d3e82a4421ca5252b2be7c540f7

diff --git a/debian/rules b/debian/rules
index eef6216..97bced1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,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
+	rm -f build build-arch
 	$(MAKE) -i distclean || $(MAKE) -f Makefile.in distclean
-	rm -rf *~ $t debian/*~ debian/files* debian/substvars*
-	rm -rf spec.html
+	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)
@@ -56,8 +56,9 @@ binary-arch:	checkroot build
 	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
+	dh_fixperms -Pdebian/tmp
+	chown root.root debian/tmp/usr/bin/userv
+	chmod 4755 debian/tmp/usr/bin/userv
 	dpkg --build $t ..
 
 define checkdir