Remove /usr/sbin/start-stop-daemon.

diff --git a/ChangeLog b/ChangeLog
index 914d0fad77f08c649cdf109e865f9f4b4b7eb57b..8d05af86704be317de05cedaf13cdfef99b75e6e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Aug 29 15:13:59 CDT 2002 Adam Heath <doogie@debian.org>
+
+  * debian/rules: Remove /usr/sbin/start-stop-daemon.
+
 Thu Aug 29 14:51:35 CDT 2002 Adam Heath <doogie@debian.org>
 
   * lib/dbmodify.c, lib/dump.c, lib/lock.c, lib/startup.c, lib/tarfn.c

diff --git a/debian/changelog b/debian/changelog
index 4393c97236a6fb8acf7d1369aed400c1834becaf..0d361c1412f9f686e52635ff86f1f82dc12a8180 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ dpkg (1.10.5) unstable; urgency=low
   * Fix corruption of available file, caused by use of memory that was
     previously freed.  Closes: #154257.
   * Fix several minor memleaks.
+  * Remove /usr/sbin/start-stop-daemon.  Closes: #156437.
 
  -- Adam Heath <doogie@debian.org>  UNRELEASED
 

diff --git a/debian/rules b/debian/rules
index 220033b8233baf24a18aedadbfdc1c0156a41b97..cfb0cc763b6a3957158feac7a855f3e3bcbe9c47 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -103,8 +103,8 @@ binary-dpkg-most binary-dpkg-static-most: binary-dpkg%-most: stamp-binary%
        set -e ; for i in info alternatives parts updates ; do \
                cp -a $(INSTALL_TMP)/var/lib/dpkg/$$i $(TMP_DPKG)/var/lib/dpkg/ ; \
        done
-       cp -a $(INSTALL_TMP)/usr/sbin/start-stop-daemon $(TMP_DPKG)/sbin/
        cp -a $(INSTALL_TMP)/usr/sbin $(TMP_DPKG)/usr/
+       mv $(TMP_DPKG)/usr/sbin/start-stop-daemon $(TMP_DPKG)/sbin/
        cp -a $(INSTALL_TMP)/usr/lib/dpkg/mksplit $(TMP_DPKG)/usr/lib/dpkg/
        cp -a $(INSTALL_TMP)/usr/lib/dpkg/enoent $(TMP_DPKG)/usr/lib/dpkg/
        cp -a $(INSTALL_TMP)/usr/share/locale $(TMP_DPKG)/usr/share/