include required-stop

[userv.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 09c928700bf35b08d5bbadd009b8bcc2b5d317bc..97bced17663819ef0f28f733e85f03d7059df542 100755 (executable)
--- 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
-       -$(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)
@@ -36,7 +36,6 @@ 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/
        install -m 755 debian/{postinst,prerm,postrm} $t/DEBIAN/.
        install -m 644 debian/conffiles $t/DEBIAN/.
@@ -57,9 +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
-       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