Merge 1.9.17 branch:

  * debian/rules: remove update-rc.d from the package
  * debian/control: update conflict with sysvinit to deal with moved
    update-rc.d

diff --git a/ChangeLog b/ChangeLog
index 1d321fd3a853e06965bae5cf98ea2f658f8c32cb..0850911ac9cf625ad12fc5b870435242ef4b6a4d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Oct 17 12:34:19 CDT 2001 Adam Heath <doogie@debian.org>
+
+  * Merge 1.9.17 branch:
+    * debian/rules: remove update-rc.d from the package
+    * debian/control: update conflict with sysvinit to deal with moved
+      update-rc.d
+
 Tue Oct 16 13:09:21 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * po/pl.po: Updated

diff --git a/debian/changelog b/debian/changelog
index 64b3f20e76d168a43825260aeae50d409dd1f4ba..281201ad251fc161beb5cc339b684de7c4badf4b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,6 +58,12 @@ dpkg (1.10) unstable; urgency=low
 
  -- Wichert Akkerman <wakkerma@debian.org>  Mon, 20 Aug 2001 14:54:38 +0200
 
+dpkg (1.9.17) unstable; urgency=low
+
+  * updated-rc.d moved to the sysvinit package. Closes: Bug#108887,#109282
+
+ -- Wichert Akkerman <wakkerma@debian.org>  Wed, 22 Aug 2001 01:24:52 +0200
+
 dpkg (1.9.16) unstable; urgency=low
 
   * Revert architecture-change to dpkg-source from 1.9.11, see ChangeLog