Imported Debian patch 1.0.8+1.0.9pre1-2

diff --git a/debian/changelog b/debian/changelog
index f8705acbe1713b785f9fd286881f8f88f710e450..85d051303132e0ff36659ef72ca5e85981ea0238 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nfs-utils (1:1.0.8+1.0.9pre1-2) unstable; urgency=low
+
+  * Provide LSB dependency information in the nfs-common and nfs-kernel-server
+    init scripts; replaces the obsolete chkconfig info. (Closes: #376976)
+  * Update the long descriptions.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Thu,  6 Jul 2006 19:37:58 +0200
+
 nfs-utils (1:1.0.8+1.0.9pre1-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/control b/debian/control
index c4ac65c09d8a06d1790e1659ea2a3a7a2d2acc85..68e157199d1b534ff06859c2281c14b7eb70e886 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,10 +14,9 @@ Provides: knfs, nfs-server
 Conflicts: knfs, nfs-server
 Replaces: knfs, nfs-server
 Description: Kernel NFS server support
- Use this package if you have a fairly recent kernel (2.2.13 or better)
- and you want to use the kernel-mode NFS server.  The user-mode NFS
- server in the "nfs-user-server" package is slower but more featureful
- and easier to debug than the kernel-mode server.
+ Use this package if you want to use the kernel-mode NFS server.
+ The user-mode NFS server in the "nfs-user-server" package is slower
+ and less featureful but easier to debug than the kernel-mode server.
  .
  Upstream: SourceForge project "nfs", CVS module nfs-utils.
  .
@@ -30,8 +29,9 @@ Provides: nfs-client
 Conflicts: nfs-client
 Replaces: nfs-client, nfs-kernel-server (<< 1:1.0.7-5)
 Description: NFS support files common to client and server
- Use this package on any machine that does NFS either as client or
- server.  Programs included: lockd, statd, showmount, and nfsstat.
+ Use this package on any machine that uses NFS, either as client or
+ server.  Programs included: lockd, statd, showmount, nfsstat, gssd
+ and idmapd.
  .
  Upstream: SourceForge project "nfs", CVS module nfs-utils.
  .

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 8501601dcfb2e7d4e8caaa74304bc87ae0139fd5..5c34c9e7ae1fae9b72216e5cc9e907ddde7a34b0 100644 (file)
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -1,13 +1,15 @@
 #!/bin/sh
-#
-# nfs-common    This shell script takes care of starting and stopping
-#               common daemons required for NFS clients and servers.
-#
-# chkconfig: 345 20 80
-# description: NFS is a popular protocol for file sharing across \
-#             TCP/IP networks. This service provides NFS file \
-#             locking functionality.
-#
+
+### BEGIN INIT INFO
+# Provides:          nfs-common
+# Required-Start:    $time
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: NFS support files common to client and server
+# Description:       NFS is a popular protocol for file sharing across
+#                   TCP/IP networks. This service provides various
+#                    support functions for NFS mounts.
+### END INIT INFO
 
 # What is this?
 DESC="NFS common utilities"

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 15b3254933635dcea10582b9780ea970871453bb..aca28028a5eb4e782f6f7d4f42b4698d35f2c9df 100644 (file)
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -1,14 +1,16 @@
 #!/bin/sh
-#
-# nfs-kernel-server
-#              This shell script takes care of starting and stopping
-#               the kernel-mode NFS server.
-#
-# chkconfig: 345 60 20
-# description: NFS is a popular protocol for file sharing across TCP/IP \
-#              networks. This service provides NFS server functionality, \
-#              which is configured via the /etc/exports file.
-#
+
+### BEGIN INIT INFO
+# Provides:          nfs-kernel-server
+# Required-Start:    $portmap $time
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Kernel NFS server support
+# Description:       NFS is a popular protocol for file sharing across
+#                   TCP/IP networks. This service provides NFS server
+#                    functionality, which is configured via the
+#                    /etc/exports file.
+### END INIT INFO
 
 # What is this?
 DESC="NFS kernel daemon"