From 4a0578bda2962ce8af9773622cd1b35ad77964a6 Mon Sep 17 00:00:00 2001
From: ian <ian>
Date: Fri, 7 Apr 2006 18:49:35 +0000
Subject: [PATCH] SHELL=/bin/bash in debian/rules; use of install(8).  Closes:
 #263979.

---
 debian/changelog | 3 ++-
 debian/rules     | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 44137ec..8e22194 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,9 @@ userv (1.0.3.99-0.0.1) unstable; urgency=low
   Packaging improvements (including Debian packaging fixes):
   * Compress uservd(8) manpage.  Closes: #244735.
   * spec.tex and spec.html are autogenerated: clean and .cvsignore them.
+  * SHELL=/bin/bash in debian/rules; use of install(8).  Closes: #263979.
 
- --
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Fri,  7 Apr 2006 19:47:36 +0100
 
 userv (1.0.3-2) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index c29fc87..09c9287 100755
--- 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 \
-- 
2.30.2