Fix some mis-merging of the 1.9 branch:

* debian/rules, debian/dpkg.conffiles: dselect was split to a separate deb,
  no longer install dselect.cfg into dpkg.deb.  Also, dpkg.cfg is no longer
  a conffile.

diff --git a/ChangeLog b/ChangeLog
index 668bc60e7a0305392b648602ffc1cbfc982ab26a..bf99769dea607272e427244721bcb5732396c416 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun May 26 01:10:24 CDT 2002 Adam Heath <doogie@debian.org>
+
+  * Fix some mis-merging of the 1.9 branch:
+    * debian/rules, debian/dpkg.conffiles: dselect was split to a separate
+      deb, no longer install dselect.cfg into dpkg.deb.  Also, dpkg.cfg is
+      no longer a conffile.
+    
 Sat May 25 22:45:06 CDT 2002 Adam Heath <doogie@debian.org>
 
   * Merge changes from 1.9.20 and 1.9.21.

diff --git a/debian/dpkg.conffiles b/debian/dpkg.conffiles
index 180c75b1c0a9a25b522a2fc051f010c8ac88075e..b08762686f6bdd6b7b6fd5c26ba3e4d71bb11a9f 100644 (file)
--- a/debian/dpkg.conffiles
+++ b/debian/dpkg.conffiles
@@ -1,4 +1,2 @@
-/etc/dpkg/dpkg.cfg
-/etc/dpkg/dselect.cfg
 /etc/dpkg/origins/debian
 /etc/alternatives/README

diff --git a/debian/rules b/debian/rules
index 95568c05d940ffb4157fb49bb93b475f90984e86..3f8b835303f48828536d130c3c676fca30e06a71 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -129,10 +129,6 @@ binary-dpkg-most binary-dpkg-static-most: binary-dpkg%-most: stamp-binary%
                done ; \
        done
 
-       install -d -m 755 -o root -g root $(TMP_DPKG)/etc/dpkg
-       install -p -m 644 -o root -g root debian/dselect.cfg \
-               $(TMP_DPKG)/etc/dpkg/
-
 # Now that dpkg has been installed, Debianize it
 # Policy stuff
        find $(TMP_DPKG)/usr/share/man -type f | xargs gzip -9f