Backport fixed from HEAD

diff --git a/ChangeLog b/ChangeLog
index 48b6a14cace8f4fde7f99efdcfae613a52a56d41..8f9e5cd3e51db62fb93e795b69404deb35393178 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Jul  2 09:46:01 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
+
+  * 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 <wichert@deephackmode.org>
 
   * debian/control: sync dpkg and dpkg-static dependencies, fix double

diff --git a/debian/changelog b/debian/changelog
index 113cd9b8bd9c2a9af066e8c430af7725bd1d8d48..42f3e0bdb1afd75e7abc216fb556370022b58bd4 100644 (file)
--- 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 <wakkerma@debian.org>  UNRELEASED
 

diff --git a/debian/rules b/debian/rules
index 809fe225e602287823dc8b7be713e5d7f77bc5c4..18cbb6e5faeffe0f47ddb7c33b295abe92d0d14f 100755 (executable)
--- 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 4dae2985b58cc788127f922e33b8e9ae4c41da60..0960158701930b839b78fde76dd2f55b01f91c06 100644 (file)
--- a/version-nr
+++ b/version-nr
@@ -1 +1 @@
-1.10.1
+1.11