X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv.git;a=blobdiff_plain;f=debian%2Frules;fp=debian%2Frules;h=66c929984674d24c40b1eda14cb9d380bc378067;hp=569161e7fc5a7671e9f8fe66f95141003ff9d6b7;hb=1d35a00dbbeded00ba674d74ac9241582b22627d;hpb=9c66781b8a9dd60bb3e23f9813700897e3bf8200

diff --git a/debian/rules b/debian/rules
index 569161e..66c9299 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,8 +29,8 @@ binary-arch:	checkroot build
 	install -d debian/tmp/var/run/$(package)/
 	cp debian/{postinst,prerm,postrm,conffiles} debian/tmp/DEBIAN/.
 	cp debian/initd debian/tmp/etc/init.d/userv
-	chmod +x debian/tmp/DEBIAN/{postinst,prerm,postrm}
-	chmod +x debian/tmp/etc/init.d/userv
+	chmod 755 debian/tmp/DEBIAN/{postinst,prerm,postrm}
+	chmod 755 debian/tmp/etc/init.d/userv
 	$(MAKE) LDFLAGS=-s INSTALL_PROGRAM='install -c -s' \
 		prefix=debian/tmp/usr etcdir=debian/tmp/etc \
 		docdir=debian/tmp/usr/doc/userv \
@@ -42,10 +42,14 @@ binary-arch:	checkroot build
 	ln -s changelog.gz debian/tmp/usr/doc/$(package)/changelog.Debian.gz
 	gzip -9v debian/tmp/usr/doc/$(package)/changelog debian/tmp/usr/man/man1/*.1
 	rm debian/tmp/usr/doc/userv/*.ps
+	-mkdir -p -m 0755 debian/tmp/usr/share/doc
+	mv debian/tmp/usr/doc/* debian/tmp/usr/share/doc/
+	mv debian/tmp/usr/man debian/tmp/usr/share/man
+	rm -rf debian/tmp/usr/doc
 	dpkg-shlibdeps daemon client
-	dpkg-gencontrol
+	dpkg-gencontrol -isp
 	chown -R root.root debian/tmp
-	chmod -R g-ws debian/tmp
+	chmod -R og=rX debian/tmp
 	chmod 700 debian/tmp/var/run/userv
 	dpkg --build debian/tmp ..