From: Adam Heath Date: Sun, 26 May 2002 06:15:09 +0000 (+0000) Subject: Fix some mis-merging of the 1.9 branch: X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32b0e5ba5c387684314b6fba382fa9e8e3a8fb5b;p=dpkg 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 668bc60e..bf99769d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun May 26 01:10:24 CDT 2002 Adam Heath + + * 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 * Merge changes from 1.9.20 and 1.9.21. diff --git a/debian/dpkg.conffiles b/debian/dpkg.conffiles index 180c75b1..b0876268 100644 --- 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 95568c05..3f8b8353 100755 --- 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