From 21dd0171407bb047466cf8605a6187fd0d5f7d09 Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sesse@debian.org>
Date: Mon, 20 Apr 2009 21:10:47 +0200
Subject: [PATCH] Imported Debian patch 1.1.6-1

---
 debian/changelog                          | 10 ++++++++++
 debian/patches/01-sm-notify-in-sbin.patch |  8 ++++----
 debian/patches/10-493659-nfs.man.patch    |  9 +++++----
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa6dd01..169ebfe 100644
--- 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 fcfcaad..825e256 100644
--- 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 c9aead2..3b45fae 100644
--- 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  
-- 
2.39.5