Imported Debian patch 1.1.0-6

diff --git a/debian/changelog b/debian/changelog
index fd98994807a553a81e5a03bdaaa2ecf9e1b2ce8c..8887d4fb1c4626849fdda94baf4d85e26eaa943d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nfs-utils (1:1.1.0-6) unstable; urgency=low
+
+  * Enable {mount,umount}.{nfs,nfs4}, in line with util-linux 2.13 no longer
+    supporting NFS mounts.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Mon, 09 Jul 2007 12:54:09 +0200
+
 nfs-utils (1:1.1.0-5) unstable; urgency=low
 
   * Install the sm-notify binary, as rpc.statd seems to want to run it at

diff --git a/debian/nfs-common.install b/debian/nfs-common.install
index f84fc73cae30e989863b648fd2b0b510f4ca3773..0a015b4e4def2c40cdef776edad7bea41bf2337a 100644 (file)
--- a/debian/nfs-common.install
+++ b/debian/nfs-common.install
@@ -1,3 +1,7 @@
+debian/tmp/sbin/mount.nfs
+debian/tmp/sbin/mount.nfs4
+debian/tmp/sbin/umount.nfs
+debian/tmp/sbin/umount.nfs4
 debian/tmp/usr/sbin/rpc.statd sbin/
 debian/tmp/usr/sbin/sm-notify sbin/
 debian/tmp/usr/sbin/showmount sbin/

diff --git a/debian/rules b/debian/rules
index fe2b273985852ddb2f1587bd75c008e66d9f8c57..40a2daf4b996a6ae63228b8954427c64e3a7824f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,7 @@ build-stamp:
        CFLAGS="-g -O2 -Wall" ./configure \
                --mandir='$${prefix}/share/man' \
                --enable-secure-statd \
-               --with-tcp-wrappers \
-               --enable-mount
+               --with-tcp-wrappers
        $(MAKE)
        touch build-stamp