From: Steinar H. Gunderson <sesse@debian.org>
Date: Mon, 9 Jul 2007 10:54:09 +0000 (+0200)
Subject: Imported Debian patch 1.1.0-6
X-Git-Tag: debian/1%1.1.0-6^0
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=4b3ed9600c0f5d1ea3aa7340a9cc06c8d4ef6886;p=nfs-utils.git

Imported Debian patch 1.1.0-6
---

diff --git a/debian/changelog b/debian/changelog
index fd98994..8887d4f 100644
--- 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 f84fc73..0a015b4 100644
--- 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 fe2b273..40a2daf 100755
--- 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