Imported Debian patch 1.1.2-2

diff --git a/debian/changelog b/debian/changelog
index 86bd2d5dc8dd34eea614eab11e7d7c163ca654b3..f5e7638b12b813087d78c111ce8e98484d465f20 100644 (file)
--- 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 b9036d65fdb3aa89eecd3e416159d85bf6aaaf6b..a8f337d32509e8e3e6b476b79179fa2ec1ae6a00 100644 (file)
--- 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/01-sm-notify-in-sbin.patch b/debian/patches/01-sm-notify-in-sbin.patch
new file mode 100644 (file)
index 0000000..7cd9541
--- /dev/null
+++ b/debian/patches/01-sm-notify-in-sbin.patch
@@ -0,0 +1,13 @@
+Index: nfs-utils-1.1.0/utils/statd/statd.c
+===================================================================
+--- nfs-utils-1.1.0.orig/utils/statd/statd.c
++++ nfs-utils-1.1.0/utils/statd/statd.c
+@@ -223,7 +223,7 @@ static void run_sm_notify(int outport)
+       char *av[6];
+       int ac = 0;
+ 
+-      av[ac++] = "/usr/sbin/sm-notify";
++      av[ac++] = "/sbin/sm-notify";
+       if (run_mode & MODE_NODAEMON)
+               av[ac++] = "-d";
+       if (outport) {

diff --git a/debian/patches/02-document-debian-init-scripts.patch b/debian/patches/02-document-debian-init-scripts.patch
deleted file mode 100644 (file)
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/03-sm-notify-in-sbin.patch b/debian/patches/03-sm-notify-in-sbin.patch
deleted file mode 100644 (file)
index 7cd9541..0000000
--- a/debian/patches/03-sm-notify-in-sbin.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: nfs-utils-1.1.0/utils/statd/statd.c
-===================================================================
---- nfs-utils-1.1.0.orig/utils/statd/statd.c
-+++ nfs-utils-1.1.0/utils/statd/statd.c
-@@ -223,7 +223,7 @@ static void run_sm_notify(int outport)
-       char *av[6];
-       int ac = 0;
- 
--      av[ac++] = "/usr/sbin/sm-notify";
-+      av[ac++] = "/sbin/sm-notify";
-       if (run_mode & MODE_NODAEMON)
-               av[ac++] = "-d";
-       if (outport) {

diff --git a/debian/patches/series b/debian/patches/series
index 1b1c4187fcbc354c429bf9a915f67e4c16f6354a..6cf83a08b734ab47e49b40dca89888d3862357c7 100644 (file)
--- 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