Imported Debian patch 1.1.6-1

diff --git a/debian/changelog b/debian/changelog
index fa6dd018ea8d86834279d15d7e36157d9ebfd7ce..169ebfe98953b504d1a285c8f670fc584504cb53 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+nfs-utils (1:1.1.6-1) unstable; urgency=low
+
+  * New upstream release. Patch status:
+    * 01-sm-notify-in-sbin.patch: Refreshed.
+    * 03-handle-mtab-symlink.patch: No change.
+    * 07-remove-duplicate-exports-paragraphs.patch: No change.
+    * 10-493659-nfs.man.patch: Refreshed.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Mon, 20 Apr 2009 21:10:47 +0200
+
 nfs-utils (1:1.1.5-2) unstable; urgency=low
 
   * Standards version is 3.8.1

diff --git a/debian/patches/01-sm-notify-in-sbin.patch b/debian/patches/01-sm-notify-in-sbin.patch
index fcfcaade3afe7fb119dbdc5b0f29112543650808..825e2566026ebb71ed89bee72970a2cd3cece81f 100644 (file)
--- a/debian/patches/01-sm-notify-in-sbin.patch
+++ b/debian/patches/01-sm-notify-in-sbin.patch
@@ -1,8 +1,8 @@
-Index: nfs-utils-1.1.4/utils/statd/statd.c
+Index: nfs-utils-1.1.6/utils/statd/statd.c
 ===================================================================
---- nfs-utils-1.1.4.orig/utils/statd/statd.c
-+++ nfs-utils-1.1.4/utils/statd/statd.c
-@@ -222,7 +222,7 @@ static void run_sm_notify(int outport)
+--- nfs-utils-1.1.6.orig/utils/statd/statd.c
++++ nfs-utils-1.1.6/utils/statd/statd.c
+@@ -233,7 +233,7 @@ static void run_sm_notify(int outport)
        char *av[6];
        int ac = 0;
  

diff --git a/debian/patches/10-493659-nfs.man.patch b/debian/patches/10-493659-nfs.man.patch
index c9aead298d11ce1c35f763e39e9f84c3edd7d66f..3b45faea02086a90ff00e0d8d66e7c97735e2c36 100644 (file)
--- a/debian/patches/10-493659-nfs.man.patch
+++ b/debian/patches/10-493659-nfs.man.patch
@@ -1,10 +1,11 @@
 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=493659
 patch by nbreen@ofb.net (Nicholas Breen)
 
-diff -Nru nfs-utils-1.1.3_orig/utils/mount/nfs.man nfs-utils-1.1.3/utils/mount/nfs.man
---- nfs-utils-1.1.3_orig/utils/mount/nfs.man   2008-07-27 14:01:45.000000000 -0700
-+++ nfs-utils-1.1.3/utils/mount/nfs.man        2008-08-03 16:47:06.904343379 -0700
-@@ -799,7 +799,7 @@
+Index: nfs-utils-1.1.6/utils/mount/nfs.man
+===================================================================
+--- nfs-utils-1.1.6.orig/utils/mount/nfs.man
++++ nfs-utils-1.1.6/utils/mount/nfs.man
+@@ -835,7 +835,7 @@ dropped requests, but this can result in
  and server load.
  .P
  However, UDP can be quite effective in specialized settings where