From: Steinar H. Gunderson <sesse@debian.org>
Date: Sat, 24 Nov 2007 17:16:51 +0000 (+0100)
Subject: Imported Debian patch 1.1.1-10
X-Git-Tag: debian/1%1.1.1-10^0
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=403f5f165b3b1114dbc97a8cf6ee5a47bf5abdb1;p=nfs-utils.git

Imported Debian patch 1.1.1-10
---

diff --git a/debian/changelog b/debian/changelog
index e4462ef..cfc8684 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nfs-utils (1:1.1.1-10) unstable; urgency=low
+
+  * 09-fix-nfsstat-option.patch: New patch, fixes so nfsstat help and man
+    pages say --mounts instead of the wrong --mounted. (Closes: #451965)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Sat, 24 Nov 2007 18:16:51 +0100
+
 nfs-utils (1:1.1.1-9) unstable; urgency=high
 
   * Re-add modprobing of the "nfs" module (leaving the sunrpc module, so as
diff --git a/debian/patches/09-fix-nfsstat-option.patch b/debian/patches/09-fix-nfsstat-option.patch
new file mode 100644
index 0000000..0da1fa9
--- /dev/null
+++ b/debian/patches/09-fix-nfsstat-option.patch
@@ -0,0 +1,26 @@
+Index: nfs-utils-1.1.1/utils/nfsstat/nfsstat.c
+===================================================================
+--- nfs-utils-1.1.1.orig/utils/nfsstat/nfsstat.c	2007-11-19 21:57:59.000000000 +0100
++++ nfs-utils-1.1.1/utils/nfsstat/nfsstat.c	2007-11-19 21:58:13.000000000 +0100
+@@ -207,7 +207,7 @@
+ {
+ 	printf("Usage: %s [OPTION]...\n\
+ \n\
+-  -m, --mounted\t\tShow statistics on mounted NFS filesystems\n\
++  -m, --mounts\t\tShow statistics on mounted NFS filesystems\n\
+   -c, --client\t\tShow NFS client statistics\n\
+   -s, --server\t\tShow NFS server statistics\n\
+   -2\t\t\tShow NFS version 2 statistics\n\
+Index: nfs-utils-1.1.1/utils/nfsstat/nfsstat.man
+===================================================================
+--- nfs-utils-1.1.1.orig/utils/nfsstat/nfsstat.man	2007-11-19 21:58:16.000000000 +0100
++++ nfs-utils-1.1.1/utils/nfsstat/nfsstat.man	2007-11-19 21:58:48.000000000 +0100
+@@ -35,7 +35,7 @@
+ .B \-4
+ Print only NFS v4 statistics. 
+ .TP
+-.B \-m, \-\-mounted
++.B \-m, \-\-mounts
+ Print information about each of the mounted \fBNFS\fR file systems.
+ 
+ If this option is used, all other options are ignored.
diff --git a/debian/patches/series b/debian/patches/series
index 7137944..e4310fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+09-fix-nfsstat-option.patch
 08-clarify-unexport.patch
 02-document-debian-init-scripts.patch
 03-sm-notify-in-sbin.patch