Merge branch 'ubuntu'

[userv.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index bdd1fa991a2563431d219f62e07b745a69a62fc3..09c928700bf35b08d5bbadd009b8bcc2b5d317bc 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+SHELL=/bin/bash
 package=userv
 
 t=debian/tmp
@@ -37,10 +38,9 @@ binary-arch: checkroot build
        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,7 +52,8 @@ 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