X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=debian%2Fchangelog;h=944e08a93b81454b9b9870635cda8af0a8beb0f5;hb=refs%2Ftags%2Fdebian%2F1%251.0.8-7;hp=ab98c8b096938d5a658923fecd9a3902c1b5adbe;hpb=c8635994190cad7c5eefde5869ef16a434834aa0;p=nfs-utils.git

diff --git a/debian/changelog b/debian/changelog
index ab98c8b..944e08a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+nfs-utils (1:1.0.8-7) unstable; urgency=low
+
+  * For some odd reason (ie. human error) this package has branched into two
+    different versions from 1:1.0.8-5 on. This package rejoins the two branches.
+    The changelog from the other 1:1.0.8-5 (which was probably never accepted
+    except as part of 1:1.0.8-6) is repeated for convenience and automated bug
+    closing below:
+  * Patch nfs-common and nfs-kernel-server init scripts to make them more LSB
+    compatible, fixing issues with heartbeat2; based on patches by Kilian
+    CAVALOTTI. (Closes: #371084, #371085)
+    * Add --oknodo to start-stop-daemon in start targets, to make a second
+      "start" invocation return exit status 0.
+    * Add status targets to the two init scripts, with correct output and
+      exit codes.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Thu, 08 Jun 2006 17:31:28 +0200
+
 nfs-utils (1:1.0.8-5) unstable; urgency=low
 
   * Make nfs-kernel-server depend on at least version 1.0.8 of nfs-common;