From c6712b71e259e01fbc46f8d64ab9b2b914c8f934 Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sesse@debian.org>
Date: Sun, 30 Mar 2008 01:35:44 +0100
Subject: [PATCH] Imported Debian patch 1.1.2-2

---
 debian/changelog                                   | 10 ++++++++++
 debian/control                                     |  4 ++--
 ...fy-in-sbin.patch => 01-sm-notify-in-sbin.patch} |  0
 .../patches/02-document-debian-init-scripts.patch  | 14 --------------
 debian/patches/series                              |  3 +--
 5 files changed, 13 insertions(+), 18 deletions(-)
 rename debian/patches/{03-sm-notify-in-sbin.patch => 01-sm-notify-in-sbin.patch} (100%)
 delete mode 100644 debian/patches/02-document-debian-init-scripts.patch

diff --git a/debian/changelog b/debian/changelog
index 86bd2d5..f5e7638 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+nfs-utils (1:1.1.2-2) unstable; urgency=low
+
+  * Remove ${misc:Depends} from binary variables -- it is not used, and not
+    generated by anything, so all it does is generate warnings during build.
+  * Remove 02-document-debian-init-scripts.patch; upstream has a patch
+    replacing it.
+  * Rename 03-sm-notify-in-sbin.patch to 01-sm-notify-in-sbin.patch.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Sun, 30 Mar 2008 01:35:44 +0100
+
 nfs-utils (1:1.1.2-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index b9036d6..a8f337d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Homepage: http://nfs.sourceforge.net/
 Package: nfs-kernel-server
 Priority: optional
 Architecture: any
-Depends: nfs-common (>= 1:1.0.8-1), ucf, lsb-base (>= 1.3-9ubuntu3), ${shlibs:Depends}, ${misc:Depends}, libblkid1 (>= 1.39+1.40-WIP-2006.11.14+dfsg-2)
+Depends: nfs-common (>= 1:1.0.8-1), ucf, lsb-base (>= 1.3-9ubuntu3), ${shlibs:Depends}, libblkid1 (>= 1.39+1.40-WIP-2006.11.14+dfsg-2)
 Provides: knfs, nfs-server
 Conflicts: knfs, nfs-server
 Replaces: knfs, nfs-server
@@ -31,7 +31,7 @@ Description: support for NFS kernel server
 
 Package: nfs-common
 Architecture: any
-Depends: portmap | rpcbind, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), netbase (>= 4.24), initscripts (>= 2.86.ds1-38.1), ${shlibs:Depends}, ${misc:Depends}
+Depends: portmap | rpcbind, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), netbase (>= 4.24), initscripts (>= 2.86.ds1-38.1), ${shlibs:Depends}
 Provides: nfs-client
 Conflicts: nfs-client
 Replaces: nfs-client, nfs-kernel-server (<< 1:1.0.7-5), mount (<< 2.13~)
diff --git a/debian/patches/03-sm-notify-in-sbin.patch b/debian/patches/01-sm-notify-in-sbin.patch
similarity index 100%
rename from debian/patches/03-sm-notify-in-sbin.patch
rename to debian/patches/01-sm-notify-in-sbin.patch
diff --git a/debian/patches/02-document-debian-init-scripts.patch b/debian/patches/02-document-debian-init-scripts.patch
deleted file mode 100644
index 380ac7a..0000000
--- a/debian/patches/02-document-debian-init-scripts.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: nfs-utils-1.0.11~git-20070205/utils/exportfs/exports.man
-===================================================================
---- nfs-utils-1.0.11~git-20070205.orig/utils/exportfs/exports.man
-+++ nfs-utils-1.0.11~git-20070205/utils/exportfs/exports.man
-@@ -34,6 +34,9 @@ double quotes. You can also specify spac
- the export name using a backslash followed by the character code as three
- octal digits.
- .PP
-+To apply changes to this file, run exportfs \-ra or /etc/init.d/nfs-kernel-server
-+reload (the latter being a distribution-specific extension).
-+.PP
- .SS Machine Name Formats
- NFS clients may be specified in a number of ways:
- .IP "single host
diff --git a/debian/patches/series b/debian/patches/series
index 1b1c418..6cf83a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-02-document-debian-init-scripts.patch
-03-sm-notify-in-sbin.patch
+01-sm-notify-in-sbin.patch
-- 
2.39.2