From: Wichert Akkerman Date: Tue, 2 Jul 2002 07:47:47 +0000 (+0000) Subject: Backport fixed from HEAD X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8504224c7805bdf71c88007bcee85afecab5ad11;p=dpkg Backport fixed from HEAD --- diff --git a/ChangeLog b/ChangeLog index 48b6a14c..8f9e5cd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Jul 2 09:46:01 CEST 2002 Wichert Akkerman + + * Merge from HEAD: + + scripts/dpkg-genchanges.pl: Add ~ to the list of legal characters + in a package filename + + scripts/dpkg-checkbuilddeps.pl: remove forced check for build-essential, + we should not hardcode Debian policy into dpkg + Tue Jul 2 09:41:44 CEST 2002 Wichert Akkerman * debian/control: sync dpkg and dpkg-static dependencies, fix double diff --git a/debian/changelog b/debian/changelog index 113cd9b8..42f3e0bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,14 @@ dpkg (1.10.1) unstable; urgency=low - * Add conflict with dpkg-iasearch which intruded on our namespace - * Replace manpages-de which includes one of our manpages Closes: - #151485. - * Don't always call autoheader when building. Closes: #151471. + * Add conflict with dpkg-iasearch which intruded on our namespace. + * Replace manpages-de which includes one of our manpages. Closes: #151485 + * Don't always call autoheader when building. Closes: #151471 * Fix double conflict in dpkg. Closes: Bug#151581 - * Move dselect methods to dselect package + * Move dselect methods to dselect package. * dpkg-checkbuilddeps no longer checks for build-essential. dpkg should - not hardcode Debian policy - * Make dpkg-genchanges accept ~ as part of a package filename + not hardcode Debian policy. + * Make dpkg-genchanges accept ~ as part of a package filename. + Closes: Bug#150739 -- Wichert Akkerman UNRELEASED diff --git a/debian/rules b/debian/rules index 809fe225..18cbb6e5 100755 --- a/debian/rules +++ b/debian/rules @@ -97,18 +97,20 @@ binary-dpkg-most binary-dpkg-static-most: binary-dpkg%-most: stamp-binary% install -d -m 755 -o root -g root $(TMP_DPKG)/usr/lib/dpkg install -d -m 755 -o root -g root $(TMP_DPKG)/usr/bin install -d -m 755 -o root -g root $(TMP_DPKG)/sbin + install -d -m 755 -o root -g root $(TMP_DPKG)/var/lib/dpkg -test -d $(INSTALL_TMP)/etc && cp -a $(INSTALL_TMP)/etc $(TMP_DPKG)/ - cp -a $(INSTALL_TMP)/var $(TMP_DPKG)/ + set -e ; for i in info alternatives parts updates ; do \ + mv $(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/ 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/lib/dpkg/methods $(TMP_DPKG)/usr/lib/dpkg/ cp -a $(INSTALL_TMP)/usr/share/locale $(TMP_DPKG)/usr/share/ set -e ; for i in dpkg-split dpkg-query ; do \ cp -a $(INSTALL_TMP)/usr/bin/$$i $(TMP_DPKG)/usr/bin/ ; \ done - set -ex ; for i in dpkg dpkg-deb md5sum ; do \ + set -e ; for i in dpkg dpkg-deb md5sum ; do \ cp -a $(INSTALL_TMP)/usr/bin/$$i$(static) $(TMP_DPKG)/usr/bin/$$i ; \ done set -e ; for i in ChangeLog THANKS TODO copyright ; do \ @@ -231,6 +233,12 @@ binary-dselect: stamp-binary install -d -m 755 -o root -g root $(TMP_DSELECT)/usr/bin mv $(INSTALL_TMP)/usr/bin/dselect $(TMP_DSELECT)/usr/bin/ + install -d -m 755 -o root -g root $(TMP_DSELECT)/usr/lib + mv $(INSTALL_TMP)/usr/lib/dpkg/methods $(TMP_DSELECT)/usr/lib/dpkg/ + + install -d -m 755 -o root -g root $(TMP_DSELECT)/var/lib/dpkg + mv $(INSTALL_TMP)/var/lib/dpkg/methods $(TMP_DSELECT)/var/lib/dpkg/ + set -e ; for i in "" de fr ja sv ; do \ install -d -m 755 -o root -g root $(TMP_DSELECT)/usr/share/man/$$i/man8 ; \ for m in dselect.8 ; do \ diff --git a/version-nr b/version-nr index 4dae2985..09601587 100644 --- a/version-nr +++ b/version-nr @@ -1 +1 @@ -1.10.1 +1.11