Imported Debian patch 1.0.9-4

diff --git a/debian/changelog b/debian/changelog
index 2b89c9702eaf9035b7deb548de07fd7b5b6a8a98..d04bcafb5d2a208e5521c35868f3579006ead7d3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+nfs-utils (1:1.0.9-4) unstable; urgency=low
+
+  * Remove versioned dependency on coreutils, as we don't use it indirectly,
+    only via ucf (so the dependency should be there). This makes the package
+    somewhat easier to backport to sarge.
+  * Remove the word "Debian" from our patch against the exports(5) man page,
+    as Debian is not the only distribution using these packages.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Sun, 16 Jul 2006 01:59:13 +0200
+
 nfs-utils (1:1.0.9-3) unstable; urgency=low
 
   * Don't automatically assume that the kernel is modular if /sbin/modprobe

diff --git a/debian/control b/debian/control
index 48e2290f1acc08516d03a456bafe02ba8d01c074..345d8fd961cd16f2655aac61b52db0f84df949ae 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Description: Kernel NFS server support
 
 Package: nfs-common
 Architecture: any
-Depends: coreutils (>= 5.93-1), portmap, sysvinit (>= 2.80-1), adduser, ucf, lsb-base (>= 1.3-9ubuntu3), ${shlibs:Depends}
+Depends: portmap, sysvinit (>= 2.80-1), adduser, ucf, lsb-base (>= 1.3-9ubuntu3), ${shlibs:Depends}
 Provides: nfs-client
 Conflicts: nfs-client
 Replaces: nfs-client, nfs-kernel-server (<< 1:1.0.7-5)

diff --git a/utils/exportfs/exports.man b/utils/exportfs/exports.man
index fd6d4be4a74bfe53a44799eef5fcabc7399e2fa1..1d10d04295c0356c02b57ce3a57100db7f35ec16 100644 (file)
--- a/utils/exportfs/exports.man
+++ b/utils/exportfs/exports.man
@@ -29,8 +29,8 @@ double quotes. You can also specify spaces or other unusual character in
 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 (on Debian)
-/etc/init.d/nfs-kernel-server reload.
+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: