From: Steinar H. Gunderson <sesse@debian.org>
Date: Sat, 29 Dec 2007 22:25:36 +0000 (+0100)
Subject: Imported Debian patch 1.1.1-12
X-Git-Tag: debian/1%1.1.1-12^0
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=dfdb4426f10e97dc188ee79d0fe9fef625eb6987;p=nfs-utils.git

Imported Debian patch 1.1.1-12
---

diff --git a/debian/changelog b/debian/changelog
index c36025b..d481e1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+nfs-utils (1:1.1.1-12) unstable; urgency=medium
+
+  * Comment in dh_strip again, which probably was commented out during a
+    debugging session at some point.
+  * Don't exclude mount.nfs from dh_fixperms; make it suid root manually after
+    dh_fixperms instead. Makes it world and group readable as it should be.
+    (Closes: #458239)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Sat, 29 Dec 2007 23:25:36 +0100
+
 nfs-utils (1:1.1.1-11) unstable; urgency=low
 
   * 10-no-flush-blkid-cache.diff: New patch from Theodore Ts'o, removes
diff --git a/debian/rules b/debian/rules
index dcd8fb4..5a65ec5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,9 +41,10 @@ binary-arch: build
 	dh_installman
 	dh_link
 	dh_installchangelogs ChangeLog
-	#dh_strip
+	dh_strip
 	dh_compress
-	dh_fixperms -Xmount.nfs
+	dh_fixperms
+	chmod u+s debian/nfs-common/sbin/mount.nfs
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol