Imported Debian patch 1.1.1-12

diff --git a/debian/changelog b/debian/changelog
index c36025b523328d7a213607611de579fd747438a7..d481e1bdec3ed1eb1d890911bf4fed3e7763c398 100644 (file)
--- 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 dcd8fb4d066843d5d41693119c9cbbb4ef0bdcdb..5a65ec5ccf949a0c8361a25f7caad1c770e3eed4 100755 (executable)
--- 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