diff -pruN 1.21.22/configure.ac 1.21.22ubuntu1/configure.ac
--- 1.21.22/configure.ac	2023-05-11 01:54:31.000000000 +0000
+++ 1.21.22ubuntu1/configure.ac	2023-05-17 05:14:09.000000000 +0000
@@ -72,7 +72,7 @@ DPKG_WITH_DIR([zshcompletionsdir], [${da
   [zsh vendor completions directory [DATADIR/zsh/vendor-completions]])
 
 # Set default dpkg-deb values
-DPKG_DEB_COMPRESSOR([xz])
+DPKG_DEB_COMPRESSOR([zstd])
 
 # Checks for programs.
 AC_PROG_SED
diff -pruN 1.21.22/debian/changelog 1.21.22ubuntu1/debian/changelog
--- 1.21.22/debian/changelog	2023-05-11 02:04:01.000000000 +0000
+++ 1.21.22ubuntu1/debian/changelog	2023-05-17 15:55:17.000000000 +0000
@@ -1,3 +1,46 @@
+dpkg (1.21.22ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - dpkg-gencontrol: Fix Package-Type override handling for ddeb support.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'nocheck' in build options by default
+      on Ubuntu/riscv64.  Overridable in debian/rules with
+      'DEB_BUILD_OPTIONS := $(filter-out nocheck,$(DEB_BUILD_OPTIONS))'.
+    - scripts/Dpkg/Vendor/Ubuntu.pm, scripts/dpkg-buildpackage.pl:
+      Set 'nocheck' for riscv64 using a new 'update-buildopts' hook and make
+      it effective with old style debhelper, too.
+    - dpkg-dev: Depend on lto-disabled-list.
+    - dpkg-buildflags: Read package source names from lto-disabled-list,
+      to build without lto optimizations. When adding a source package to the
+      list, please also file a launchpad issue and tag it with 'lto'.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'noudeb' build profile by
+      default. Override this by exporting DEB_BUILD_PROFILE='!noudeb' which
+      will be stripped, and thus building with udebs.
+    - build: Switch default dpkg-deb compression from xz to zstd.
+      Keep compressing dpkg.deb with xz to help bootstrapping on non-Ubuntu
+      systems.
+    - set default zstd compression level to 19
+    - scripts/Dpkg/Vendor/Debian.pm: Always include "-fdebug-prefix-map"
+      to build flags.  Map path to "/usr/src/PKGNAME-PKGVER" instead of
+      ".", honouring the DWARF standard which prohibits relative paths
+      in DW_AT_comp_dir.
+    - scripts/{mk/buildflags.mk,t.mk}: Add support for DEB_BUILD_DEBUGPATH.
+    - man/dpkg-buildflags.pod: Document new behaviour of "fdebugmap" and
+      new DEB_BUILD_DEBUGPATH variable.
+    - Fix dpkg handling of --path-exclude for read-only paths (LP: #2003789).
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 17 May 2023 17:55:17 +0200
+
 dpkg (1.21.22) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -10,6 +53,49 @@ dpkg (1.21.22) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Thu, 11 May 2023 04:04:01 +0200
 
+dpkg (1.21.21ubuntu1) lunar; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - dpkg-gencontrol: Fix Package-Type override handling for ddeb support.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'nocheck' in build options by default
+      on Ubuntu/riscv64.  Overridable in debian/rules with
+      'DEB_BUILD_OPTIONS := $(filter-out nocheck,$(DEB_BUILD_OPTIONS))'.
+    - scripts/Dpkg/Vendor/Ubuntu.pm, scripts/dpkg-buildpackage.pl:
+      Set 'nocheck' for riscv64 using a new 'update-buildopts' hook and make
+      it effective with old style debhelper, too.
+    - dpkg-dev: Depend on lto-disabled-list.
+    - dpkg-buildflags: Read package source names from lto-disabled-list,
+      to build without lto optimizations. When adding a source package to the
+      list, please also file a launchpad issue and tag it with 'lto'.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'noudeb' build profile by
+      default. Override this by exporting DEB_BUILD_PROFILE='!noudeb' which
+      will be stripped, and thus building with udebs.
+    - build: Switch default dpkg-deb compression from xz to zstd.
+      Keep compressing dpkg.deb with xz to help bootstrapping on non-Ubuntu
+      systems.
+    - set default zstd compression level to 19
+    - scripts/Dpkg/Vendor/Debian.pm: Always include "-fdebug-prefix-map"
+      to build flags.  Map path to "/usr/src/PKGNAME-PKGVER" instead of
+      ".", honouring the DWARF standard which prohibits relative paths
+      in DW_AT_comp_dir.
+    - scripts/{mk/buildflags.mk,t.mk}: Add support for DEB_BUILD_DEBUGPATH.
+    - man/dpkg-buildflags.pod: Document new behaviour of "fdebugmap" and
+      new DEB_BUILD_DEBUGPATH variable.
+    - Fix dpkg handling of --path-exclude for read-only paths (LP: #2003789).
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 02 Mar 2023 09:31:57 +0100
+
 dpkg (1.21.21) unstable; urgency=medium
 
   * Architecture support:
@@ -21,6 +107,49 @@ dpkg (1.21.21) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Sat, 25 Feb 2023 04:39:29 +0100
 
+dpkg (1.21.20ubuntu2) lunar; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - dpkg-gencontrol: Fix Package-Type override handling for ddeb support.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'nocheck' in build options by default
+      on Ubuntu/riscv64.  Overridable in debian/rules with
+      'DEB_BUILD_OPTIONS := $(filter-out nocheck,$(DEB_BUILD_OPTIONS))'.
+    - scripts/Dpkg/Vendor/Ubuntu.pm, scripts/dpkg-buildpackage.pl:
+      Set 'nocheck' for riscv64 using a new 'update-buildopts' hook and make
+      it effective with old style debhelper, too.
+    - dpkg-dev: Depend on lto-disabled-list.
+    - dpkg-buildflags: Read package source names from lto-disabled-list,
+      to build without lto optimizations. When adding a source package to the
+      list, please also file a launchpad issue and tag it with 'lto'.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'noudeb' build profile by
+      default. Override this by exporting DEB_BUILD_PROFILE='!noudeb' which
+      will be stripped, and thus building with udebs.
+    - build: Switch default dpkg-deb compression from xz to zstd.
+      Keep compressing dpkg.deb with xz to help bootstrapping on non-Ubuntu
+      systems.
+    - set default zstd compression level to 19
+    - scripts/Dpkg/Vendor/Debian.pm: Always include "-fdebug-prefix-map"
+      to build flags.  Map path to "/usr/src/PKGNAME-PKGVER" instead of
+      ".", honouring the DWARF standard which prohibits relative paths
+      in DW_AT_comp_dir.
+    - scripts/{mk/buildflags.mk,t.mk}: Add support for DEB_BUILD_DEBUGPATH.
+    - man/dpkg-buildflags.pod: Document new behaviour of "fdebugmap" and
+      new DEB_BUILD_DEBUGPATH variable.
+    - Fix dpkg handling of --path-exclude for read-only paths (LP: #2003789).
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 08 Feb 2023 08:32:52 +0100
+
 dpkg (1.21.20) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -71,6 +200,54 @@ dpkg (1.21.20) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Tue, 07 Feb 2023 12:19:12 +0100
 
+dpkg (1.21.19ubuntu3) lunar; urgency=medium
+
+  * Fix dpkg handling of --path-exclude for read-only paths (LP: #2003789).
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Tue, 31 Jan 2023 17:59:24 +0100
+
+dpkg (1.21.19ubuntu2) lunar; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - dpkg-gencontrol: Fix Package-Type override handling for ddeb support.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'nocheck' in build options by default
+      on Ubuntu/riscv64.  Overridable in debian/rules with
+      'DEB_BUILD_OPTIONS := $(filter-out nocheck,$(DEB_BUILD_OPTIONS))'.
+    - scripts/Dpkg/Vendor/Ubuntu.pm, scripts/dpkg-buildpackage.pl:
+      Set 'nocheck' for riscv64 using a new 'update-buildopts' hook and make
+      it effective with old style debhelper, too.
+    - dpkg-dev: Depend on lto-disabled-list.
+    - dpkg-buildflags: Read package source names from lto-disabled-list,
+      to build without lto optimizations. When adding a source package to the
+      list, please also file a launchpad issue and tag it with 'lto'.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'noudeb' build profile by
+      default. Override this by exporting DEB_BUILD_PROFILE='!noudeb' which
+      will be stripped, and thus building with udebs.
+    - build: Switch default dpkg-deb compression from xz to zstd.
+      Keep compressing dpkg.deb with xz to help bootstrapping on non-Ubuntu
+      systems.
+    - set default zstd compression level to 19
+    - scripts/Dpkg/Vendor/Debian.pm: Always include "-fdebug-prefix-map"
+      to build flags.  Map path to "/usr/src/PKGNAME-PKGVER" instead of
+      ".", honouring the DWARF standard which prohibits relative paths
+      in DW_AT_comp_dir.
+    - scripts/{mk/buildflags.mk,t.mk}: Add support for DEB_BUILD_DEBUGPATH.
+    - man/dpkg-buildflags.pod: Document new behaviour of "fdebugmap" and
+      new DEB_BUILD_DEBUGPATH variable.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 26 Jan 2023 22:53:58 +0100
+
 dpkg (1.21.19) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -104,6 +281,73 @@ dpkg (1.21.19) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Tue, 24 Jan 2023 23:39:50 +0100
 
+dpkg (1.21.18ubuntu3) lunar; urgency=medium
+
+  * scripts/Dpkg/Vendor/Ubuntu.pm: Move debugpath-related changes to
+    here.
+  * scripts/Dpkg/Vendor/Debian.pm: Revert debugpath-related changes;
+    they're Ubuntu-specific.
+
+ -- Sergio Durigan Junior <sergio.durigan@canonical.com>  Sun, 15 Jan 2023 23:01:44 -0500
+
+dpkg (1.21.18ubuntu2) lunar; urgency=medium
+
+  [ Shengjing Zhu ]
+  * Dpkg::Vendor::Ubuntu: Respect options env when override features
+    (LP: #2002582)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 13 Jan 2023 17:36:24 +0100
+
+dpkg (1.21.18ubuntu1) lunar; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - dpkg-gencontrol: Fix Package-Type override handling for ddeb support.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'nocheck' in build options by default
+      on Ubuntu/riscv64.  Overridable in debian/rules with
+      'DEB_BUILD_OPTIONS := $(filter-out nocheck,$(DEB_BUILD_OPTIONS))'.
+    - scripts/Dpkg/Vendor/Ubuntu.pm, scripts/dpkg-buildpackage.pl:
+      Set 'nocheck' for riscv64 using a new 'update-buildopts' hook and make
+      it effective with old style debhelper, too.
+    - Dpkg::Vendor::Ubuntu: Add new lto feature in new optimize area, taken
+      from
+      https://git.hadrons.org/cgit/debian/dpkg/dpkg.git/log/?h=next/1.21.x
+    - dpkg-dev: Depend on lto-disabled-list.
+    - dpkg-buildflags: Read package source names from lto-disabled-list,
+      to build without lto optimizations. When adding a source package to the
+      list, please also file a launchpad issue and tag it with 'lto'.
+    - Turn on LTO optimizations on amd64, arm64, ppc64el, s390x.
+      See https://wiki.ubuntu.com/ToolChain/LTO for more information.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'noudeb' build profile by
+      default. Override this by exporting DEB_BUILD_PROFILE='!noudeb' which
+      will be stripped, and thus building with udebs.
+    - build: Switch default dpkg-deb compression from xz to zstd.
+      Keep compressing dpkg.deb with xz to help bootstrapping on non-Ubuntu
+      systems.
+    - set default zstd compression level to 19
+    - scripts/Dpkg/Vendor/Debian.pm: Always include "-fdebug-prefix-map"
+      to build flags.  Map path to "/usr/src/PKGNAME-PKGVER" instead of
+      ".", honouring the DWARF standard which prohibits relative paths
+      in DW_AT_comp_dir.
+    - scripts/{mk/buildflags.mk,t.mk}: Add support for DEB_BUILD_DEBUGPATH.
+    - man/dpkg-buildflags.pod: Document new behaviour of "fdebugmap" and
+      new DEB_BUILD_DEBUGPATH variable.
+
+  * Drop changes included in Debian:
+    - Add Zstd compression and decompression support for binary packages.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 12 Jan 2023 22:05:02 +0100
+
 dpkg (1.21.18) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -129,6 +373,82 @@ dpkg (1.21.18) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Tue, 10 Jan 2023 18:46:37 +0100
 
+dpkg (1.21.17ubuntu5) lunar; urgency=medium
+
+  * scripts/Dpkg/Vendor/Debian.pm: Fix FTBFS caused by some typos and
+    a missing variable declaration.
+
+ -- Sergio Durigan Junior <sergio.durigan@canonical.com>  Mon, 09 Jan 2023 13:45:27 -0500
+
+dpkg (1.21.17ubuntu4) lunar; urgency=medium
+
+  [ Gianfranco Costamagna ]
+  * Cherry-pick 1.21.12ubuntu2 change, lost during merge
+
+  [ Sergio Durigan Junior ]
+  * scripts/Dpkg/Vendor/Debian.pm: Always include "-fdebug-prefix-map"
+    to build flags.  Map path to "/usr/src/PKGNAME-PKGVER" instead of
+    ".", honouring the DWARF standard which prohibits relative paths
+    in DW_AT_comp_dir.
+  * scripts/{mk/buildflags.mk,t.mk}: Add support for DEB_BUILD_DEBUGPATH.
+  * man/dpkg-buildflags.pod: Document new behaviour of "fdebugmap" and
+    new DEB_BUILD_DEBUGPATH variable.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 09 Jan 2023 17:36:35 +0100
+
+dpkg (1.21.17ubuntu3) lunar; urgency=medium
+
+  [ Gianfranco Costamagna ]
+  * Upload the work from Zhu
+  * Reduce delta even more by stripping duplicated orig files.
+
+  [ Shengjing Zhu ]
+  * Remove duplicated lto flags (LP: #2002201)
+  * Move lto-disabled hook to Dpkg::Vendor::Ubuntu
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 09 Jan 2023 13:19:52 +0100
+
+dpkg (1.21.17ubuntu1) lunar; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - dpkg-gencontrol: Fix Package-Type override handling for ddeb support.
+    - Add Zstd compression and decompression support for binary packages.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'nocheck' in build options by default
+      on Ubuntu/riscv64.  Overridable in debian/rules with
+      'DEB_BUILD_OPTIONS := $(filter-out nocheck,$(DEB_BUILD_OPTIONS))'.
+    - scripts/Dpkg/Vendor/Ubuntu.pm, scripts/dpkg-buildpackage.pl:
+      Set 'nocheck' for riscv64 using a new 'update-buildopts' hook and make
+      it effective with old style debhelper, too.
+    - Dpkg::Vendor::Debian: Add new lto feature in new optimize area, taken
+      from
+      https://git.hadrons.org/cgit/debian/dpkg/dpkg.git/log/?h=next/1.21.x
+    - dpkg-dev: Depend on lto-disabled-list.
+    - dpkg-buildflags: Read package source names from lto-disabled-list,
+      to build without lto optimizations. When adding a source package to the
+      list, please also file a launchpad issue and tag it with 'lto'.
+    - Turn on LTO optimizations on amd64, arm64, ppc64el, s390x.
+      See https://wiki.ubuntu.com/ToolChain/LTO for more information.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'noudeb' build profile by
+      default. Override this by exporting DEB_BUILD_PROFILE='!noudeb' which
+      will be stripped, and thus building with udebs.
+    - build: Switch default dpkg-deb compression from xz to zstd.
+      Keep compressing dpkg.deb with xz to help bootstrapping on non-Ubuntu
+      systems.
+    - Don't install dpkg-fsys-usrunmess script.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 07 Jan 2023 13:19:13 +0100
+
 dpkg (1.21.17) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -259,6 +579,47 @@ dpkg (1.21.14) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Sun, 01 Jan 2023 23:48:16 +0100
 
+dpkg (1.21.13ubuntu1) lunar; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - dpkg-gencontrol: Fix Package-Type override handling for ddeb support.
+    - Add Zstd compression and decompression support for binary packages.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'nocheck' in build options by default
+      on Ubuntu/riscv64.  Overridable in debian/rules with
+      'DEB_BUILD_OPTIONS := $(filter-out nocheck,$(DEB_BUILD_OPTIONS))'.
+    - scripts/Dpkg/Vendor/Ubuntu.pm, scripts/dpkg-buildpackage.pl:
+      Set 'nocheck' for riscv64 using a new 'update-buildopts' hook and make
+      it effective with old style debhelper, too.
+    - Dpkg::Vendor::Debian: Add new lto feature in new optimize area, taken
+      from
+      https://git.hadrons.org/cgit/debian/dpkg/dpkg.git/log/?h=next/1.21.x
+    - dpkg-dev: Depend on lto-disabled-list.
+    - dpkg-buildflags: Read package source names from lto-disabled-list,
+      to build without lto optimizations. When adding a source package to the
+      list, please also file a launchpad issue and tag it with 'lto'.
+    - Turn on LTO optimizations on amd64, arm64, ppc64el, s390x.
+      See https://wiki.ubuntu.com/ToolChain/LTO for more information.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'noudeb' build profile by
+      default. Override this by exporting DEB_BUILD_PROFILE='!noudeb' which
+      will be stripped, and thus building with udebs.
+    - build: Switch default dpkg-deb compression from xz to zstd.
+      Keep compressing dpkg.deb with xz to help bootstrapping on non-Ubuntu
+      systems.
+    - Don't install dpkg-fsys-usrunmess script.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 24 Dec 2022 15:57:09 +0100
+
 dpkg (1.21.13) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -321,6 +682,47 @@ dpkg (1.21.12) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Tue, 06 Dec 2022 04:27:57 +0100
 
+dpkg (1.21.11ubuntu2) lunar; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - dpkg-gencontrol: Fix Package-Type override handling for ddeb support.
+    - Add Zstd compression and decompression support for binary packages.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'nocheck' in build options by default
+      on Ubuntu/riscv64.  Overridable in debian/rules with
+      'DEB_BUILD_OPTIONS := $(filter-out nocheck,$(DEB_BUILD_OPTIONS))'.
+    - scripts/Dpkg/Vendor/Ubuntu.pm, scripts/dpkg-buildpackage.pl:
+      Set 'nocheck' for riscv64 using a new 'update-buildopts' hook and make
+      it effective with old style debhelper, too.
+    - Dpkg::Vendor::Debian: Add new lto feature in new optimize area, taken
+      from
+      https://git.hadrons.org/cgit/debian/dpkg/dpkg.git/log/?h=next/1.21.x
+    - dpkg-dev: Depend on lto-disabled-list.
+    - dpkg-buildflags: Read package source names from lto-disabled-list,
+      to build without lto optimizations. When adding a source package to the
+      list, please also file a launchpad issue and tag it with 'lto'.
+    - Turn on LTO optimizations on amd64, arm64, ppc64el, s390x.
+      See https://wiki.ubuntu.com/ToolChain/LTO for more information.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'noudeb' build profile by
+      default. Override this by exporting DEB_BUILD_PROFILE='!noudeb' which
+      will be stripped, and thus building with udebs.
+    - build: Switch default dpkg-deb compression from xz to zstd.
+      Keep compressing dpkg.deb with xz to help bootstrapping on non-Ubuntu
+      systems.
+    - Don't install dpkg-fsys-usrunmess script.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 03 Dec 2022 10:11:38 +0100
+
 dpkg (1.21.11) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -651,6 +1053,47 @@ dpkg (1.21.10) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Thu, 01 Dec 2022 12:12:14 +0100
 
+dpkg (1.21.9ubuntu1) kinetic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - dpkg-gencontrol: Fix Package-Type override handling for ddeb support.
+    - Add Zstd compression and decompression support for binary packages.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'nocheck' in build options by default
+      on Ubuntu/riscv64.  Overridable in debian/rules with
+      'DEB_BUILD_OPTIONS := $(filter-out nocheck,$(DEB_BUILD_OPTIONS))'.
+    - scripts/Dpkg/Vendor/Ubuntu.pm, scripts/dpkg-buildpackage.pl:
+      Set 'nocheck' for riscv64 using a new 'update-buildopts' hook and make
+      it effective with old style debhelper, too.
+    - Dpkg::Vendor::Debian: Add new lto feature in new optimize area, taken
+      from
+      https://git.hadrons.org/cgit/debian/dpkg/dpkg.git/log/?h=next/1.21.x
+    - dpkg-dev: Depend on lto-disabled-list.
+    - dpkg-buildflags: Read package source names from lto-disabled-list,
+      to build without lto optimizations. When adding a source package to the
+      list, please also file a launchpad issue and tag it with 'lto'.
+    - Turn on LTO optimizations on amd64, arm64, ppc64el, s390x.
+      See https://wiki.ubuntu.com/ToolChain/LTO for more information.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'noudeb' build profile by
+      default. Override this by exporting DEB_BUILD_PROFILE='!noudeb' which
+      will be stripped, and thus building with udebs.
+    - build: Switch default dpkg-deb compression from xz to zstd.
+      Keep compressing dpkg.deb with xz to help bootstrapping on non-Ubuntu
+      systems.
+    - Don't install dpkg-fsys-usrunmess script.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 03 Jul 2022 00:00:34 +0200
+
 dpkg (1.21.9) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -679,6 +1122,47 @@ dpkg (1.21.9) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Fri, 01 Jul 2022 11:25:58 +0200
 
+dpkg (1.21.8ubuntu1) kinetic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - dpkg-gencontrol: Fix Package-Type override handling for ddeb support.
+    - Add Zstd compression and decompression support for binary packages.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'nocheck' in build options by default
+      on Ubuntu/riscv64.  Overridable in debian/rules with
+      'DEB_BUILD_OPTIONS := $(filter-out nocheck,$(DEB_BUILD_OPTIONS))'.
+    - scripts/Dpkg/Vendor/Ubuntu.pm, scripts/dpkg-buildpackage.pl:
+      Set 'nocheck' for riscv64 using a new 'update-buildopts' hook and make
+      it effective with old style debhelper, too.
+    - Dpkg::Vendor::Debian: Add new lto feature in new optimize area, taken
+      from
+      https://git.hadrons.org/cgit/debian/dpkg/dpkg.git/log/?h=next/1.21.x
+    - dpkg-dev: Depend on lto-disabled-list.
+    - dpkg-buildflags: Read package source names from lto-disabled-list,
+      to build without lto optimizations. When adding a source package to the
+      list, please also file a launchpad issue and tag it with 'lto'.
+    - Turn on LTO optimizations on amd64, arm64, ppc64el, s390x.
+      See https://wiki.ubuntu.com/ToolChain/LTO for more information.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'noudeb' build profile by
+      default. Override this by exporting DEB_BUILD_PROFILE='!noudeb' which
+      will be stripped, and thus building with udebs.
+    - build: Switch default dpkg-deb compression from xz to zstd.
+      Keep compressing dpkg.deb with xz to help bootstrapping on non-Ubuntu
+      systems.
+    - Don't install dpkg-fsys-usrunmess script.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 26 May 2022 13:18:43 +0200
+
 dpkg (1.21.8) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -711,6 +1195,47 @@ dpkg (1.21.8) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Wed, 25 May 2022 10:39:29 +0200
 
+dpkg (1.21.7ubuntu3) kinetic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - dpkg-gencontrol: Fix Package-Type override handling for ddeb support.
+    - Add Zstd compression and decompression support for binary packages.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'nocheck' in build options by default
+      on Ubuntu/riscv64.  Overridable in debian/rules with
+      'DEB_BUILD_OPTIONS := $(filter-out nocheck,$(DEB_BUILD_OPTIONS))'.
+    - scripts/Dpkg/Vendor/Ubuntu.pm, scripts/dpkg-buildpackage.pl:
+      Set 'nocheck' for riscv64 using a new 'update-buildopts' hook and make
+      it effective with old style debhelper, too.
+    - Dpkg::Vendor::Debian: Add new lto feature in new optimize area, taken
+      from
+      https://git.hadrons.org/cgit/debian/dpkg/dpkg.git/log/?h=next/1.21.x
+    - dpkg-dev: Depend on lto-disabled-list.
+    - dpkg-buildflags: Read package source names from lto-disabled-list,
+      to build without lto optimizations. When adding a source package to the
+      list, please also file a launchpad issue and tag it with 'lto'.
+    - Turn on LTO optimizations on amd64, arm64, ppc64el, s390x.
+      See https://wiki.ubuntu.com/ToolChain/LTO for more information.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'noudeb' build profile by
+      default. Override this by exporting DEB_BUILD_PROFILE='!noudeb' which
+      will be stripped, and thus building with udebs.
+    - build: Switch default dpkg-deb compression from xz to zstd.
+      Keep compressing dpkg.deb with xz to help bootstrapping on non-Ubuntu
+      systems.
+    - Don't install dpkg-fsys-usrunmess script.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 11 May 2022 18:02:48 +0200
+
 dpkg (1.21.7) unstable; urgency=medium
 
   - The “Social Contract §3: We will not hide problems”
@@ -1015,6 +1540,52 @@ dpkg (1.21.2) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Sun, 13 Mar 2022 20:17:35 +0100
 
+dpkg (1.21.1ubuntu2) jammy; urgency=medium
+
+  * Don't install dpkg-fsys-usrunmess script. (LP: #1968022)
+
+ -- Dimitri John Ledkov <dimitri.ledkov@canonical.com>  Wed, 06 Apr 2022 10:40:25 +0100
+
+dpkg (1.21.1ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - dpkg-gencontrol: Fix Package-Type override handling for ddeb support.
+    - Add Zstd compression and decompression support for binary packages.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'nocheck' in build options by default
+      on Ubuntu/riscv64.  Overridable in debian/rules with
+      'DEB_BUILD_OPTIONS := $(filter-out nocheck,$(DEB_BUILD_OPTIONS))'.
+    - scripts/Dpkg/Vendor/Ubuntu.pm, scripts/dpkg-buildpackage.pl:
+      Set 'nocheck' for riscv64 using a new 'update-buildopts' hook and make
+      it effective with old style debhelper, too.
+    - Dpkg::Vendor::Debian: Add new lto feature in new optimize area, taken
+      from
+      https://git.hadrons.org/cgit/debian/dpkg/dpkg.git/log/?h=next/1.21.x
+    - dpkg-dev: Depend on lto-disabled-list.
+    - dpkg-buildflags: Read package source names from lto-disabled-list,
+      to build without lto optimizations. When adding a source package to the
+      list, please also file a launchpad issue and tag it with 'lto'.
+    - Turn on LTO optimizations on amd64, arm64, ppc64el, s390x.
+      See https://wiki.ubuntu.com/ToolChain/LTO for more information.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'noudeb' build profile by
+      default. Override this by exporting DEB_BUILD_PROFILE='!noudeb' which
+      will be stripped, and thus building with udebs.
+    - build: Switch default dpkg-deb compression from xz to zstd.
+      Keep compressing dpkg.deb with xz to help bootstrapping on non-Ubuntu
+      systems.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 06 Jan 2022 08:44:08 +0100
+
 dpkg (1.21.1) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -1252,6 +1823,59 @@ dpkg (1.21.0) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Sun, 05 Dec 2021 16:32:45 +0100
 
+dpkg (1.20.9ubuntu3) jammy; urgency=medium
+
+  * scripts/Dpkg/Vendor/Ubuntu.pm: When checking for the correct
+    maintainer field, also look for canonical.com email addresses
+    (LP: #1951988)
+
+ -- William 'jawn-smith' Wilson <jawn-smith@ubuntu.com>  Thu, 02 Dec 2021 15:38:08 -0600
+
+dpkg (1.20.9ubuntu2) impish; urgency=medium
+
+  * build: Switch default dpkg-deb compression from xz to zstd. (LP: #1923845)
+    Keep compressing dpkg.deb with xz to help bootstrapping on non-Ubuntu
+    systems.
+
+ -- Balint Reczey <balint@balintreczey.hu>  Mon, 14 Jun 2021 16:04:10 +0200
+
+dpkg (1.20.9ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - dpkg-gencontrol: Fix Package-Type override handling for ddeb support.
+    - Add Zstd compression and decompression support for binary packages.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'nocheck' in build options by default
+      on Ubuntu/riscv64.  Overridable in debian/rules with
+      'DEB_BUILD_OPTIONS := $(filter-out nocheck,$(DEB_BUILD_OPTIONS))'.
+    - scripts/Dpkg/Vendor/Ubuntu.pm, scripts/dpkg-buildpackage.pl:
+      Set 'nocheck' for riscv64 using a new 'update-buildopts' hook and make
+      it effective with old style debhelper, too.
+    - Dpkg::Vendor::Debian: Add new lto feature in new optimize area, taken
+      from
+      https://git.hadrons.org/cgit/debian/dpkg/dpkg.git/log/?h=next/1.21.x
+    - dpkg-dev: Depend on lto-disabled-list.
+    - dpkg-buildflags: Read package source names from lto-disabled-list,
+      to build without lto optimizations. When adding a source package to the
+      list, please also file a launchpad issue and tag it with 'lto'.
+    - Turn on LTO optimizations on amd64, arm64, ppc64el, s390x.
+      See https://wiki.ubuntu.com/ToolChain/LTO for more information.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'noudeb' build profile by
+      default. Override this by exporting DEB_BUILD_PROFILE='!noudeb' which
+      will be stripped, and thus building with udebs. LP: #1884836
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 14 Apr 2021 12:32:22 +0200
+
 dpkg (1.20.8) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -1289,6 +1913,60 @@ dpkg (1.20.8) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Tue, 13 Apr 2021 22:17:05 +0200
 
+dpkg (1.20.7.1ubuntu4) hirsute; urgency=medium
+
+  * Turn on LTO optimizations on amd64, arm64, ppc64el, s390x.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 19 Mar 2021 14:44:20 +0100
+
+dpkg (1.20.7.1ubuntu3) hirsute; urgency=medium
+
+  * scripts/Dpkg/Vendor/Ubuntu.pm: set 'noudeb' build profile by
+    default. Override this by exporting DEB_BUILD_PROFILE='!noudeb' which
+    will be stripped, and thus building with udebs. LP: #1884836
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 18 Feb 2021 19:58:48 +0000
+
+dpkg (1.20.7.1ubuntu2) hirsute; urgency=medium
+
+  * Dpkg::Vendor::Debian: Add new lto feature in new optimize area, taken
+    from
+    https://git.hadrons.org/cgit/debian/dpkg/dpkg.git/log/?h=next/1.21.x
+  * dpkg-dev: Depend on lto-disabled-list.
+  * dpkg-buildflags: Read package source names from lto-disabled-list,
+    to build without lto optimizations. When adding a source package to the
+    list, please also file a launchpad issue and tag it with 'lto'.
+  * LTO optimizations are still turned off. To turn them on for a package
+    build, append 'optimize=+lto' to DEB_BUILD_MAINT_OPTIONS before calling
+    dpkg-buildflags.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 28 Jan 2021 10:00:33 +0100
+
+dpkg (1.20.7.1ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - dpkg-gencontrol: Fix Package-Type override handling for ddeb support.
+    - Add Zstd compression and decompression support for binary packages.
+    - scripts/Dpkg/Vendor/Ubuntu.pm: set 'nocheck' in build options by default
+      on Ubuntu/riscv64.  Overridable in debian/rules with
+      'DEB_BUILD_OPTIONS := $(filter-out nocheck,$(DEB_BUILD_OPTIONS))'.
+    - scripts/Dpkg/Vendor/Ubuntu.pm, scripts/dpkg-buildpackage.pl:
+      Set 'nocheck' for riscv64 using a new 'update-buildopts' hook and make
+      it effective with old style debhelper, too.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 12 Jan 2021 12:45:46 +0100
+
 dpkg (1.20.7) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -1504,6 +2182,42 @@ dpkg (1.20.6) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Fri, 08 Jan 2021 04:39:40 +0100
 
+dpkg (1.20.5ubuntu3) hirsute; urgency=medium
+
+  * scripts/Dpkg/Vendor/Ubuntu.pm, scripts/dpkg-buildpackage.pl:
+    Set 'nocheck' for riscv64 using a new 'update-buildopts' hook and make it
+    effective with old style debhelper, too.
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Fri, 16 Oct 2020 21:18:40 +0200
+
+dpkg (1.20.5ubuntu2) groovy; urgency=medium
+
+  * scripts/Dpkg/Vendor/Ubuntu.pm: set 'nocheck' in build options by default
+    on Ubuntu/riscv64.  Overridable in debian/rules with
+    'DEB_BUILD_OPTIONS := $(filter-out nocheck,$(DEB_BUILD_OPTIONS))'.
+    LP: #1891686.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 31 Aug 2020 00:34:46 +0000
+
+dpkg (1.20.5ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - dpkg-gencontrol: Fix Package-Type override handling for ddeb support.
+    - Add Zstd compression and decompression support for binary packages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 28 Jul 2020 13:33:55 +0200
+
 dpkg (1.20.5) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -2046,6 +2760,45 @@ dpkg (1.20.0) experimental; urgency=medi
 
  -- Guillem Jover <guillem@debian.org>  Sun, 08 Mar 2020 03:31:40 +0100
 
+dpkg (1.19.7ubuntu4) groovy; urgency=medium
+
+  * Remove non-working, and warning triggering prerequisites on suffix rule
+    definitions in man/Makefile
+  * Run autoreconf
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Thu, 04 Jun 2020 12:24:07 +0200
+
+dpkg (1.19.7ubuntu3) focal; urgency=medium
+
+  * No-change rebuild for libgcc-s1 package name change.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 23 Mar 2020 07:12:54 +0100
+
+dpkg (1.19.7ubuntu2) eoan; urgency=medium
+
+  * d/rules: always run dh_autoreconf (LP: #1842947)
+
+ -- Dan Streetman <ddstreet@canonical.com>  Thu, 05 Sep 2019 17:05:14 -0400
+
+dpkg (1.19.7ubuntu1) eoan; urgency=medium
+
+  * Merge from current Debian testing; remaining Ubuntu changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - dpkg-gencontrol: Fix Package-Type override handling for ddeb support.
+    - Add Zstd compression and decompression support for binary packages.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Wed, 10 Jul 2019 13:36:57 -0600
+
 dpkg (1.19.7) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -2083,6 +2836,25 @@ dpkg (1.19.7) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Mon, 03 Jun 2019 23:22:35 +0200
 
+dpkg (1.19.6ubuntu1) disco; urgency=medium
+
+  * Merge from current Debian testing; remaining Ubuntu changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - dpkg-gencontrol: Fix Package-Type override handling for ddeb support.
+    - Add Zstd compression and decompression support for binary packages.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 02 Apr 2019 15:36:17 -0600
+
 dpkg (1.19.6) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -2125,6 +2897,25 @@ dpkg (1.19.6) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Mon, 25 Mar 2019 15:08:26 +0100
 
+dpkg (1.19.5ubuntu1) disco; urgency=medium
+
+  * Merge from current Debian testing; remaining Ubuntu changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - dpkg-gencontrol: Fix Package-Type override handling for ddeb support.
+    - Add Zstd compression and decompression support for binary packages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 01 Mar 2019 10:55:21 +0100
+
 dpkg (1.19.5) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -2223,6 +3014,37 @@ dpkg (1.19.5) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Sat, 23 Feb 2019 18:00:54 +0100
 
+dpkg (1.19.4ubuntu3) disco; urgency=medium
+
+  * scripts/Dpkg/Source/Package.pm: use Dpkg::Source:Format (closes: #921031)
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 19 Feb 2019 07:37:22 -0700
+
+dpkg (1.19.4ubuntu2) disco; urgency=medium
+
+  * scripts/Dpkg/Shlibs/Objdump.pm: use Dpkg::IPC to fix armhf ABI checks.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 18 Feb 2019 07:24:04 -0700
+
+dpkg (1.19.4ubuntu1) disco; urgency=medium
+
+  * Merge from current Debian testing; remaining Ubuntu changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - dpkg-gencontrol: Fix Package-Type override handling for ddeb support.
+    - Add Zstd compression and decompression support for binary packages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 23 Jan 2019 17:52:07 +0100
+
 dpkg (1.19.4) unstable; urgency=medium
 
   * start-stop-daemon: Do not sanity check the pidfile when it is specified as
@@ -2398,6 +3220,35 @@ dpkg (1.19.3) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Tue, 22 Jan 2019 14:26:04 +0100
 
+dpkg (1.19.2ubuntu2) disco; urgency=medium
+
+  * scripts/Dpkg/Vendor/Ubuntu.pm: Instead of running the Debian hooks after
+    the Ubuntu buildflags are set up, run them first, and then strip/prepend
+    the bits we need to change. This fixes compiler optimisation on ppc64el.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 07 Dec 2018 10:51:35 -0700
+
+dpkg (1.19.2ubuntu1) disco; urgency=medium
+
+  * Merge from current Debian testing; remaining Ubuntu changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - dpkg-gencontrol: Fix Package-Type override handling for ddeb support.
+    - Add Zstd compression and decompression support for binary packages.
+  * Fix implicit declaration of getenv in i18n.c and signedness errors in
+    zstd patches (nod to Gianfranco Costamagna for being a human -Werror).
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 27 Nov 2018 11:28:33 -0700
+
 dpkg (1.19.2) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -2793,6 +3644,154 @@ dpkg (1.19.1) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Wed, 26 Sep 2018 15:13:22 +0200
 
+dpkg (1.19.0.5ubuntu5) cosmic; urgency=medium
+
+  * Manually do autoreconf -fi to pick up new automake 1.16
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 13 Sep 2018 13:46:04 +0200
+
+dpkg (1.19.0.5ubuntu4) cosmic; urgency=medium
+
+  * Apply patch from upstream to add frontend locking:
+    - Add support for frontend locking. This makes it possible for frontends
+      using this new protocol, to safely lock the dpkg database w/o risk of
+      race conditions with other dpkg instances or frontends supporting the
+      same protocol. Thanks to Julian Andres Klode <jak@debian.org>.
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Wed, 08 Aug 2018 10:58:53 +0200
+
+dpkg (1.19.0.5ubuntu3) cosmic; urgency=medium
+
+  * No-change rebuild for ncurses soname changes.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 03 May 2018 15:19:09 +0000
+
+dpkg (1.19.0.5ubuntu2) bionic; urgency=medium
+
+  * Add Zstandard compression and decompression support for binary packages
+    (LP: #1764220)
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Mon, 16 Apr 2018 04:25:21 +0200
+
+dpkg (1.19.0.5ubuntu1) bionic; urgency=medium
+
+  * Merge from current Debian testing; remaining Ubuntu changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - dpkg-gencontrol: Fix Package-Type override handling for ddeb support.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Wed, 24 Jan 2018 15:19:21 -0700
+
+dpkg (1.19.0.5) unstable; urgency=medium
+
+  * Fix directory traversal with dpkg-deb --raw-extract, by guaranteeing
+    that the DEBIAN pathname does not exist. Closes: #879982
+    Reported by Jakub Wilk <jwilk@jwilk.net>.
+  * Rename DPKG_GAIN_ROOT_CMD to DEB_GAIN_ROOT_CMD in the R³ support, as
+    the variable is expected to be set by any builder, not just dpkg. And
+    introduce ephemereal backwards compatibility even though there are no
+    known users.
+  * Do not set DEB_GAIN_ROOT_CMD in dpkg-buildpackage when the R³ value is
+    <implementations-keywords>, following the specification.
+  * Specify that DEB_GAIN_ROOT_CMD in R³ should preserve the environment.
+    Proposed by Josh Triplett <josh@joshtriplett.org>.
+  * Specify new DEB_RULES_REQUIRES_ROOT variable for R³ support.
+  * Declare R³ specification as "recommendation, stable" with version 1.0.
+  * Architecture support:
+    - Add support for riscv64 CPU. Closes: #822914
+      Thanks to Manuel A. Fernandez Montecelo <mafm@debian.org>
+  * Perl modules:
+    - Dpkg::Vendor::Debian: Use proper %use_feature key. This was causing perl
+      errors on paths not accapted for fixdebugpath.
+      Reported by Mattia Rizzolo <mattia@debian.org>, on IRC. Closes: #881051
+    - Check that $state->{seen} exists instead of $state being just defined.
+      Fixes regression in dpkg-gensymbols symbols output.
+      Thanks to Dmitry Shachnev <mitya57@debian.org>. Closes: #880166
+    - Mark hurd-i386 as having gcc builtin PIE in Dpkg::Vendor::Debian.
+      Requested by Samuel Thibault <sthibault@debian.org>.
+
+ -- Guillem Jover <guillem@debian.org>  Wed, 17 Jan 2018 03:27:34 +0100
+
+dpkg (1.19.0.4ubuntu1) bionic; urgency=medium
+
+  * Merge from current Debian unstable; remaining Ubuntu changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - dpkg-gencontrol: Fix Package-Type override handling for ddeb support.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Wed, 25 Oct 2017 18:17:32 -0600
+
+dpkg (1.19.0.4) unstable; urgency=medium
+
+  * Perl modules:
+    - Check that $tarname is defined before use in Dpkg::Source::Package::V1.
+      Thanks to Christoph Biedl <debian.axhn@manchmal.in-ulm.de>.
+      Closes: #879124
+  * Packaging:
+    - Add Breaks on debhelper << 10.10.1~ to dpkg-dev, so that debhelper users
+      wanting to use R³ support do not need a versioned dependency on dpkg-dev.
+    - Add Breaks dgit << 3.13~ to libdpkg-perl, as older dgit versions assumed
+      that Dpkg::Compression::Process was available, via implicit import
+      from Dpkg::Source::Package.
+      Reported by Ian Jackson <ijackson@chiark.greenend.org.uk>.
+
+ -- Guillem Jover <guillem@debian.org>  Sun, 22 Oct 2017 23:47:08 +0200
+
+dpkg (1.19.0.3) unstable; urgency=medium
+
+  * Pass the correct source stanza to the dpkg-buildpackage code parsing the
+    Rules-Requires-Root field. This meant the field was being ignored.
+  * Setup and check rootcommand in dpkg-buildpackage only if it is going to
+    be needed. Reported by Niels Thykier <niels@thykier.net>.
+  * Documentation:
+    - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
+      Spotted by Helge Kreutzmann <debian@helgefjell.de>.
+  * Packaging:
+    - Comment out Rules-Requires-Root field until debhelper supports it.
+
+ -- Guillem Jover <guillem@debian.org>  Sat, 21 Oct 2017 16:01:15 +0200
+
+dpkg (1.19.0.2) unstable; urgency=medium
+
+  * Fix logic in dpkg-buildpackage to decide whether to run build targets,
+    which broke tons of packages that are violating Debian policy MUSTs.
+    Thanks to James Clarke <jrtc27@debian.org>. Closes: #878899
+  * Do not try to recompute hashes for the .dsc file when signing binary-only
+    builds in dpkg-buildpackage. Reported by Ximin Luo <infinity0@debian.org>.
+  * Packaging:
+    - Add Breaks to libdpkg-perl against pkg-kde-tools (<< 0.15.28~), as
+      that package is using private modules with no API guarantees, that
+      obviously broke due to recent changes in 1.19.0. Closes: #878919
+
+ -- Guillem Jover <guillem@debian.org>  Wed, 18 Oct 2017 01:28:20 +0200
+
+dpkg (1.19.0.1) unstable; urgency=medium
+
+  * Packaging:
+    - Install update-alternatives policykit-1 file.
+  * Test suite:
+    - Skip Dpkg::OpenPGP test if gpg is not present.
+
+ -- Guillem Jover <guillem@debian.org>  Tue, 17 Oct 2017 04:50:11 +0200
+
 dpkg (1.19.0) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -3013,6 +4012,26 @@ dpkg (1.19.0) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Tue, 17 Oct 2017 01:51:16 +0200
 
+dpkg (1.18.24ubuntu1) artful; urgency=medium
+
+  * Merge from current Debian testing; remaining Ubuntu changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - dpkg-gencontrol: Fix Package-Type override handling for ddeb support.
+  * scripts/Dpkg/Vendor/Ubuntu.pm: Drop hardening changes merged upstream.
+  * dpkg-buildpackage: Drop stale debian/files cleaning, solved differently.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 05 Jun 2017 11:35:51 -0600
+
 dpkg (1.18.24) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -3089,6 +4108,61 @@ dpkg (1.18.24) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Wed, 17 May 2017 13:16:25 +0200
 
+dpkg (1.18.23ubuntu7) artful; urgency=medium
+
+  * scripts/Dpkg/Vendor/Debian.pm: Re-enable PIE on all architectures.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 09 May 2017 23:48:36 -0600
+
+dpkg (1.18.23ubuntu6) artful; urgency=medium
+
+  * dpkg-buildpackage: Move debian/files test and removal to after clean.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 09 May 2017 23:45:31 -0600
+
+dpkg (1.18.23ubuntu5) artful; urgency=medium
+
+  * dpkg-buildpackage: Remove stale debian/files during initialisation.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 09 May 2017 22:05:49 -0600
+
+dpkg (1.18.23ubuntu4) artful; urgency=medium
+
+  * dpkg-genchanges: Add buildinfo files to changes now that LP is fixed.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 21 Apr 2017 12:00:18 -0600
+
+dpkg (1.18.23ubuntu3) artful; urgency=medium
+
+  * dpkg-gencontrol: Fix Package-Type override handling (LP: #1623256)
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Thu, 20 Apr 2017 20:51:40 -0600
+
+dpkg (1.18.23ubuntu2) artful; urgency=medium
+
+  * dpkg-genchanges: Don't add buildinfo files to the changes file.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Thu, 20 Apr 2017 19:43:01 -0600
+
+dpkg (1.18.23ubuntu1) artful; urgency=medium
+
+  * Merge from Debian (LP: #1654905, #1652945); remaining Ubuntu changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+  * scripts/Dpkg/Vendor/Ubuntu.pm: Drop obsolete hardening-wrapper control.
+  * scripts/Dpkg/Vendor/Debian.pm: Adjust PIE builtin architecture list.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Wed, 19 Apr 2017 10:28:59 -0600
+
 dpkg (1.18.23) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -3775,6 +4849,30 @@ dpkg (1.18.11) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Sun, 06 Nov 2016 03:09:02 +0100
 
+dpkg (1.18.10ubuntu2) zesty; urgency=medium
+
+  * Cherry-pick patch from git to limit preallocation to files over
+    16KiB, fixing installation performance regression (LP: #1663749)
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 10 Apr 2017 04:08:19 -0600
+
+dpkg (1.18.10ubuntu1) yakkety; urgency=medium
+
+  * Merge from Debian testing; remaining Ubuntu changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 12 Aug 2016 11:35:16 -0600
+
 dpkg (1.18.10) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -3826,6 +4924,25 @@ dpkg (1.18.10) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Sun, 31 Jul 2016 12:57:02 +0200
 
+dpkg (1.18.9ubuntu2) yakkety; urgency=medium
+
+  * Cherry pick the following patch from git to fix APT's testsuite
+
+  [ Guillem Jover ]
+  * When activating file triggers on conffile purge, use the conffile name
+    instead of the real pathname it might refer to. This fixes a segfault
+    when using --instdir, or when the conffile has been moved around and
+    replaced with a symlink to the target.
+    Regression introduced in dpkg 1.18.8. Closes: #830267
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Fri, 08 Jul 2016 06:42:07 +0200
+
+dpkg (1.18.9ubuntu1) yakkety; urgency=medium
+
+  * Merge with Debian unstable, pulling in fix for dpkg-buildpackage.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 04 Jul 2016 04:48:25 -0600
+
 dpkg (1.18.9) unstable; urgency=medium
 
   * Require Dpkg::Control::Info in dpkg-buildpackage.
@@ -3837,6 +4954,23 @@ dpkg (1.18.9) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Mon, 04 Jul 2016 09:23:13 +0200
 
+dpkg (1.18.8ubuntu1) yakkety; urgency=medium
+
+  * Merge from Debian unstable (LP: #1491145); remaining Ubuntu changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 04 Jul 2016 02:45:33 -0600
+
 dpkg (1.18.8) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -3971,6 +5105,24 @@ dpkg (1.18.8) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Sun, 03 Jul 2016 19:01:56 +0200
 
+dpkg (1.18.7ubuntu1) yakkety; urgency=medium
+
+  * Merge from Debian unstable; remaining changes in the Ubuntu delta:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+  * Drop Breaks/Conflicts for triggers/upgrades now that xenial is released.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Thu, 12 May 2016 05:37:45 -0600
+
 dpkg (1.18.7) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -4245,6 +5397,30 @@ dpkg (1.18.5) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Mon, 02 May 2016 04:14:57 +0200
 
+dpkg (1.18.4ubuntu2) yakkety; urgency=medium
+
+  * No-change rebuild to pick up -fPIE on amd64 and ppc64el.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 29 Apr 2016 13:53:32 +0200
+
+dpkg (1.18.4ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian testing; remaining changes in the Ubuntu delta:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - Carry over Breaks/Conflicts for triggers/upgrades until post-16.04.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 12 Jan 2016 14:24:21 -0700
+
 dpkg (1.18.4) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -4323,6 +5499,24 @@ dpkg (1.18.4) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Fri, 25 Dec 2015 13:20:26 +0100
 
+dpkg (1.18.3ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian testing; remaining changes in the Ubuntu delta:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - Carry over Breaks/Conflicts for triggers/upgrades until post-16.04.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 23 Oct 2015 16:20:32 +0100
+
 dpkg (1.18.3) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -4393,6 +5587,39 @@ dpkg (1.18.3) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Mon, 21 Sep 2015 07:11:42 +0200
 
+dpkg (1.18.2ubuntu5) wily; urgency=medium
+
+  * Pull packaging changes from 1.18.3 to fix libdir issues (LP: #1504761)
+  * Fix an off-by-one write access in dpkg-deb when parsing the deb magic.
+  * Fix a segfault when using «dpkg --no-act» with a synthetic --admindir.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Sat, 17 Oct 2015 12:47:12 -0600
+
+dpkg (1.18.2ubuntu4) wily; urgency=medium
+
+  * Add a Breaks on software-center (<< 13.10-0ubuntu9~) for trigger loops.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 11 Sep 2015 11:11:01 -0600
+
+dpkg (1.18.2ubuntu3) wily; urgency=medium
+
+  * Cherrypick fix from git to be less strict about week day parsing.
+  * Extend the above to also be less strict about month name parsing.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Wed, 26 Aug 2015 16:39:42 -0600
+
+dpkg (1.18.2ubuntu2) wily; urgency=medium
+
+  * Add a Breaks on dbus (<< 1.8.12-1ubuntu6~) to avoid the noawait trigger.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 18 Aug 2015 13:51:02 -0600
+
+dpkg (1.18.2ubuntu1) wily; urgency=medium
+
+  * Merge with Debian unstable, bringing in a whole host of new bugfixes.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Thu, 13 Aug 2015 02:05:42 -0600
+
 dpkg (1.18.2) unstable; urgency=low
 
   [ Guillem Jover ]
@@ -4506,6 +5733,24 @@ dpkg (1.18.2) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Mon, 03 Aug 2015 15:40:21 +0200
 
+dpkg (1.18.1ubuntu1) wily; urgency=medium
+
+  * Merge from Debian testing; remaining changes in the Ubuntu delta:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+  * Carry over Breaks/Conflicts for triggers/upgrades until post-16.04.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 27 Jul 2015 15:45:43 -0600
+
 dpkg (1.18.1) unstable; urgency=low
 
   [ Guillem Jover ]
@@ -4804,6 +6049,107 @@ dpkg (1.18.0) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Mon, 18 May 2015 15:08:31 +0200
 
+dpkg (1.17.25ubuntu1) vivid; urgency=medium
+
+  * Merge with Debian, pulling in the upstream fix for CVE-2015-0840,
+    a couple of updated translations, and several trivial bug fixes.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 10 Apr 2015 21:36:44 -0600
+
+dpkg (1.17.25) unstable; urgency=medium
+
+  [ Guillem Jover ]
+  * Do not leak kvm descriptors in start-stop-daemon on GNU/kFreeBSD systems.
+    Based on a patch by Jeff Epler <jepler@unpythonic.net>. Closes: #779467
+  * Fix OpenPGP Armor Header Line parsing in Dpkg::Control::Hash. We should
+    only accept [\r\t ] as trailing whitespace, although RFC4880 does not
+    clarify what whitespace really maps to, we should really match the GnuPG
+    implementation anyway, as that's what we use to verify the signatures.
+    Reported by Jann Horn <jann@thejh.net>. Fixes CVE-2015-0840.
+  * Use correct versions in Conflicts for removed packages. Closes: #776984
+  * Use backports friendly versions in Breaks/Conflicts.
+    Reported by Thorsten Glaser <tg@debian.org>.
+  * Fix perl warning in dpkg-genchanges when parsing BY-HAND file entries.
+    Regression introduced in dpkg 1.17.7. Closes: #781074
+
+  [ Updated programs translations ]
+  * Dutch (Frans Spiesschaert). Closes: #779953
+  * Hungarian (Úr Balázs).
+
+ -- Guillem Jover <guillem@debian.org>  Thu, 09 Apr 2015 23:40:47 +0200
+
+dpkg (1.17.24ubuntu2) vivid; urgency=medium
+
+  * SECURITY UPDATE: OpenPGP Armor Header Line parsing issue
+    - scripts/Dpkg/Control/HashCore.pm: adjust whitespace parsing.
+    - scripts/Makefile.*, scripts/t/Dpkg_Control.t,
+      scripts/t/Dpkg_Control/bogus-armor-formfeed.dsc: added tests.
+    - Patch thanks to Guillem Jover
+    - CVE-2015-0840
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Thu, 09 Apr 2015 11:41:14 -0400
+
+dpkg (1.17.24ubuntu1) vivid; urgency=medium
+
+  * Merge with Debian unstable, which pulls in bugfixes, and disables
+    dependency checks on trigger processing, quieting trigger cycles.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 20 Mar 2015 22:21:07 -0600
+
+dpkg (1.17.24) unstable; urgency=low
+
+  [ Guillem Jover ]
+  * Add missing versioned Breaks on packages creating trigger cycles.
+    Namely debian-security-support, doc-base, gitweb, grace, install-info,
+    libapache2-mod-php5, libapache2-mod-php5filter, php5-fpm and xine-ui.
+    Closes: #774794
+  * Switch versioned Breaks for trigger cycles from <= to << relations (with
+    the necessary version adjustments).
+  * Add Conflicts for removed packages expecting dpkg to ship install-info.
+    Namely octave3.2-info, octave3.0-info and polgen-doc. Closes: #776984
+  * Do not accept unknown user or group names on «dpkg-statoverride --add».
+    Regression introduced in dpkg 1.17.11. Closes: #775124
+  * Check that HAVE_DECL_SYS_SIGLIST is 0 instead of undefined, to fix a
+    build failure on uclibc based systems. Closes: #777044
+    Based on a patch by Alex Potapenko <opotapenko@gmail.com>.
+  * Disable dependency checks on trigger processing. There are still trigger
+    cycles showing up this close to the Debian release, which are hard to
+    detect automatically as they are caused by maintainer script actions.
+    Requested by Niels Thykier <niels@thykier.net> (Debian Release Manager).
+
+  [ Raphaël Hertzog ]
+  * Drop myself from Uploaders.
+
+  [ Updated programs translations ]
+  * All complete languages (shadow package).
+  * Thai (Theppitak Karoonboonyanan).
+
+  [ Updated manpages translations ]
+  * German (Helge Kreutzmann).
+
+ -- Guillem Jover <guillem@debian.org>  Sun, 22 Feb 2015 22:54:51 +0100
+
+dpkg (1.17.23ubuntu1) vivid; urgency=medium
+  
+  * Merge from Debian unstable.  Remaining changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - Bump fontconfig Breaks to match Ubuntu version; can be reverted after
+      vivid ships, as the Debian Breaks version was higher than trusty's.
+    - Add ureadahead to the long list of trigger-related Breaks as well.
+  * Remove multiarch upgrade code from postinst, which is no longer needed.
+ 
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 05 Dec 2014 10:52:37 -0700
+
 dpkg (1.17.23) unstable; urgency=low
 
   [ Guillem Jover ]
@@ -4922,6 +6268,38 @@ dpkg (1.17.22) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Fri, 28 Nov 2014 02:02:34 +0100
 
+dpkg (1.17.21ubuntu2) vivid; urgency=medium
+
+  * Cherry-pick from Debian (LP: #1394893)
+    + Add Breaks on old man-db, fontconfig and readahead-fedora packages using
+      awaiting triggers, as they produce trigger cycles. Closes: #768599
+  * Modify the above to specify the version of fontconfig that included this
+    change in Ubuntu, and to add ureadahead.
+
+ -- Iain Lane <iain.lane@canonical.com>  Mon, 08 Dec 2014 12:09:15 +0000
+
+dpkg (1.17.21ubuntu1) vivid; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Add logic to the postinst to `dpkg --add-architecture i386' on new
+      installs on amd64, mimicking our previous behaviour with the conffile.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+  * drop po/pot delta that was generated by MoM
+  * run touch configure configure.ac build-aux/* to ensure that timestamps
+    match and automake is not invoked again
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 29 Oct 2014 10:07:32 +0100
+
 dpkg (1.17.21) unstable; urgency=low
 
   [ Guillem Jover ]
@@ -5252,6 +6630,26 @@ dpkg (1.17.14) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Mon, 06 Oct 2014 00:11:08 +0200
 
+dpkg (1.17.13ubuntu1) utopic; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Allow -fstack-protector on arm64 now that GCC and glibc support it.
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Add logic to the postinst to `dpkg --add-architecture i386' on new
+      installs on amd64, mimicking our previous behaviour with the conffile.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Thu, 21 Aug 2014 12:35:23 -0600
+
 dpkg (1.17.13) unstable; urgency=low
 
   [ Guillem Jover ]
@@ -5291,6 +6689,25 @@ dpkg (1.17.13) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Tue, 19 Aug 2014 20:14:45 +0200
 
+dpkg (1.17.12ubuntu1) utopic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Add logic to the postinst to `dpkg --add-architecture i386' on new
+      installs on amd64, mimicking our previous behaviour with the conffile.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 17 Aug 2014 13:14:31 +0200
+
 dpkg (1.17.12) unstable; urgency=low
 
   [ Guillem Jover ]
@@ -5449,6 +6866,26 @@ dpkg (1.17.11) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Sat, 09 Aug 2014 17:16:27 +0200
 
+dpkg (1.17.10ubuntu1) utopic; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Allow -fstack-protector on arm64 now that GCC and glibc support it.
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Add logic to the postinst to `dpkg --add-architecture i386' on new
+      installs on amd64, mimicking our previous behaviour with the conffile.
+    - Apply a workaround from mvo to consider ^rc packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 09 Jun 2014 12:18:09 -0600
+
 dpkg (1.17.10) unstable; urgency=medium
 
   [ Guillem Jover ]
@@ -5542,6 +6979,12 @@ dpkg (1.17.10) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Thu, 05 Jun 2014 20:18:04 +0200
 
+dpkg (1.17.9ubuntu1) utopic; urgency=medium
+
+  * Merge with Debian unstable, fixing the testsuite's failure to fail.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Wed, 30 Apr 2014 08:24:27 -0600
+
 dpkg (1.17.9) unstable; urgency=high
 
   [ Guillem Jover ]
@@ -5574,6 +7017,13 @@ dpkg (1.17.9) unstable; urgency=high
 
  -- Guillem Jover <guillem@debian.org>  Wed, 30 Apr 2014 05:45:20 +0200
 
+dpkg (1.17.8ubuntu1) utopic; urgency=medium
+
+  * Merge with Debian unstable to bring in several bugfixes, including
+    the hostile patch unpack directory traversal fix for CVE-2014-0471
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 28 Apr 2014 21:16:49 -0600
+
 dpkg (1.17.8) unstable; urgency=high
 
   [ Guillem Jover ]
@@ -5604,6 +7054,27 @@ dpkg (1.17.8) unstable; urgency=high
 
  -- Guillem Jover <guillem@debian.org>  Mon, 28 Apr 2014 13:33:11 +0200
 
+dpkg (1.17.7ubuntu1) utopic; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Allow -fstack-protector on arm64 now that GCC and glibc support it.
+    - Change native source version/format mismatch errors into warnings
+      until the dust settles on Debian bug 737634 about override options.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.
+    - Special-case arm{el,hf} ELF objects in Shlibs/Objdump.pm for multilib.
+    - Map unqualified package names of multiarch-same packages to the native
+      arch instead of throwing an error, so that we don't break on upgrade
+      when there are unqualified names stored in the dpkg trigger database.
+    - Add logic to the postinst to `dpkg --add-architecture i386' on new
+      installs on amd64, mimicking our previous behaviour with the conffile.
+    - Apply a workaround from mvo to consider RC packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+  * Drop obsolete migration code and guards from pre-trusty dpkg versions.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 21 Apr 2014 18:14:10 -0600
+
 dpkg (1.17.7) unstable; urgency=low
 
   [ Guillem Jover ]
@@ -5787,6 +7258,64 @@ dpkg (1.17.6) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Wed, 15 Jan 2014 05:29:45 +0100
 
+dpkg (1.17.5ubuntu5) trusty; urgency=medium
+
+  * Allow -fstack-protector on arm64 now that GCC and glibc support it.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 07 Mar 2014 18:47:57 +0800
+
+dpkg (1.17.5ubuntu4) trusty; urgency=medium
+
+  * Update the ppc64 buildflags vendor overrides for ppc64el instead, and
+    make the implementation respect DEB_BUILD_OPTIONS=noopt (LP: #1279128)
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 11 Feb 2014 18:49:27 -0700
+
+dpkg (1.17.5ubuntu3) trusty; urgency=medium
+
+  * Change native source version/format mismatch errors into warnings until
+    the dust settles on Debian bug 737634 about revert or override options.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Wed, 05 Feb 2014 07:26:29 -0700
+
+dpkg (1.17.5ubuntu2) trusty; urgency=medium
+
+  * Backport patch from 1.17.6 to fix file descriptor leaks (LP: #1270132)
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 17 Jan 2014 11:01:47 -0700
+
+dpkg (1.17.5ubuntu1) trusty; urgency=medium
+
+  * Merge from Debian testing.  Remaining changes:
+    - Change the multiarch downgrade version checks in prerm/postrm
+      from 1.16.2 to 1.16.0~ to reflect when multiarch landed in Ubuntu.
+    - Migrate dpkg multiarch conffile (and other multi-arch-related
+      conf settings) to the new DB with dpkg --add-architecture, but
+      keep a copy of the old conffile if it was modified.
+    - Out of paranoia, keep an option handler for foreign-architecture
+      that informs people that they need to scrub their config files
+      and upgrade, on the off chance that the above migration fails
+      for some reason (this mitigates the chances of leaving users with
+      a dpkg that fails to run due to a broken config).
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.  This is useful for tools
+      that hide the dpkg terminal by default and use apport for bug
+      reporting with the untranslated error message.
+    - Apply patch from Steve McIntyre to special-case armhf/armel ELF
+      objects in Shlibs/Objdump.pm, so we don't get incorrect deps.
+    - lib/dpkg/pkg-spec.c: map unqualified package names of multiarch-same
+      packages to the native arch instead of throwing an error, so that we
+      don't break on upgrade when there are unqualified names stored in
+      dpkg's own trigger database.
+    - Add logic to the postinst to `dpkg --add-architecture i386' on new
+      installs on amd64, and to also do so on upgrades from pre-conffile
+      Ubuntu versions, mimicking our previous behaviour with the conffile.
+    - Apply a workaround from mvo to consider RC packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+ 
+ -- Adam Conrad <adconrad@ubuntu.com>  Thu, 16 Jan 2014 16:41:23 -0700
+
 dpkg (1.17.5) unstable; urgency=low
 
   [ Guillem Jover ]
@@ -5994,6 +7523,40 @@ dpkg (1.17.2) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Thu, 05 Dec 2013 04:56:31 +0100
 
+dpkg (1.17.1ubuntu1) trusty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Change the multiarch downgrade version checks in prerm/postrm
+      from 1.16.2 to 1.16.0~ to reflect when multiarch landed in Ubuntu.
+    - Migrate dpkg multiarch conffile (and other multi-arch-related
+      conf settings) to the new DB with dpkg --add-architecture, but
+      keep a copy of the old conffile if it was modified.
+    - Out of paranoia, keep an option handler for foreign-architecture
+      that informs people that they need to scrub their config files
+      and upgrade, on the off chance that the above migration fails
+      for some reason (this mitigates the chances of leaving users with
+      a dpkg that fails to run due to a broken config).
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.  This is useful for tools
+      that hide the dpkg terminal by default and use apport for bug
+      reporting with the untranslated error message.
+    - Apply patch from Steve McIntyre to special-case armhf/armel ELF
+      objects in Shlibs/Objdump.pm, so we don't get incorrect deps.
+    - lib/dpkg/pkg-spec.c: map unqualified package names of multiarch-same
+      packages to the native arch instead of throwing an error, so that we
+      don't break on upgrade when there are unqualified names stored in
+      dpkg's own trigger database.
+    - Add logic to the postinst to `dpkg --add-architecture i386' on new
+      installs on amd64, and to also do so on upgrades from pre-conffile
+      Ubuntu versions, mimicking our previous behaviour with the conffile.
+    - Apply a workaround from mvo to consider RC packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - Add ppc64el/powerpc64le support to cputable (backported from 1.17.2).
+  * Forward-port manpages-it dpkg/dpkg-dev/dselect Replaces from 1.16.12.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Sun, 17 Nov 2013 10:42:09 +0000
+
 dpkg (1.17.1) unstable; urgency=low
 
   * Man pages cleanup:
@@ -6184,6 +7747,120 @@ dpkg (1.17.0) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Fri, 26 Jul 2013 23:54:54 +0200
 
+dpkg (1.16.12ubuntu1) saucy; urgency=low
+
+  * Merge with Debian stable-proposed-updates, remaining changes:
+    - Change the multiarch downgrade version checks in prerm/postrm
+      from 1.16.2 to 1.16.0~ to reflect when multiarch landed in Ubuntu.
+    - Migrate dpkg multiarch conffile (and other multi-arch-related
+      conf settings) to the new DB with dpkg --add-architecture, but
+      keep a copy of the old conffile if it was modified.
+    - Out of paranoia, keep an option handler for foreign-architecture
+      that informs people that they need to scrub their config files
+      and upgrade, on the off chance that the above migration fails
+      for some reason (this mitigates the chances of leaving users with
+      a dpkg that fails to run due to a broken config).
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.  This is useful for tools
+      that hide the dpkg terminal by default and use apport for bug
+      reporting with the untranslated error message.
+    - Apply patch from Steve McIntyre to special-case armhf/armel ELF
+      objects in Shlibs/Objdump.pm, so we don't get incorrect deps.
+    - lib/dpkg/pkg-spec.c: map unqualified package names of multiarch-same
+      packages to the native arch instead of throwing an error, so that we
+      don't break on upgrade when there are unqualified names stored in
+      dpkg's own trigger database.
+    - Add logic to the postinst to `dpkg --add-architecture i386' on new
+      installs on amd64, and to also do so on upgrades from pre-conffile
+      Ubuntu versions, mimicking our previous behaviour with the conffile.
+    - Apply a workaround from mvo to consider RC packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+    - Don't set unsupported -fstack-protector in dpkg-buildflags on arm64.
+  * Add ppc64el/powerpc64le support to cputable (backported from 1.17.2)
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 04 Oct 2013 00:26:28 -0600
+
+dpkg (1.16.12) stable; urgency=low
+
+  * Fix value caching in Dpkg::Arch by not shadowing the variables.
+    Closes: #724949
+
+ -- Guillem Jover <guillem@debian.org>  Mon, 30 Sep 2013 16:52:37 +0200
+
+dpkg (1.16.11) stable; urgency=low
+
+  [ Raphaël Hertzog ]
+  * Fix usage of non-existent _() function in multiple places of the Perl
+    code. Thanks to Lincoln Myers <lincoln@netapp.com> for the patch.
+    Closes: #708607
+
+  [ Guillem Jover ]
+  * Fix chmod() arguments order in Dpkg::Source::Quilt. Closes: #710265
+    Thanks to Pablo Oliveira <pablo@sifflez.org>.
+  * Only ignore older packages if the existing version is informative. This
+    allows any program using libdpkg to parse the available file to see again
+    packages with versions lesser than 0-0 (like 0~0-0). Closes: #676664
+  * Fix use after free in dpkg_arch_load_list() on libdpkg.
+    Reported by Pedro Ribeiro <pedrib@gmail.com>.
+
+  [ Updated programs translations ]
+  * Vietnamese (Trần Ngọc Quân). Closes: #715334
+
+  [ Added man page translations ]
+  * Italian (Beatrice Torracca). Closes: #711647
+
+  [ Updated man page translations ]
+  * Japanese (TAKAHASHI Motonobu). Closes: #704240
+
+ -- Guillem Jover <guillem@debian.org>  Mon, 23 Sep 2013 16:51:18 +0200
+
+dpkg (1.16.10ubuntu3) saucy; urgency=low
+
+  * scripts/Dpkg/Shlibs/Objdump.pm: Adjust armel/armhf special-casing
+    in dpkg-shlibdeps to try the new ELF ABI flags before arch tags.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 08 Jul 2013 08:05:57 -0600
+
+dpkg (1.16.10ubuntu2) saucy; urgency=low
+
+  * Don't set -fstack-protector in dpkg-buildflags on arm64 (not yet
+    supported).
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 11 Jun 2013 09:33:34 +0200
+
+dpkg (1.16.10ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Change the multiarch downgrade version checks in prerm/postrm
+      from 1.16.2 to 1.16.0~ to reflect when multiarch landed in Ubuntu.
+    - Migrate dpkg multiarch conffile (and other multi-arch-related
+      conf settings) to the new DB with dpkg --add-architecture, but
+      keep a copy of the old conffile if it was modified.
+    - Out of paranoia, keep an option handler for foreign-architecture
+      that informs people that they need to scrub their config files
+      and upgrade, on the off chance that the above migration fails
+      for some reason (this mitigates the chances of leaving users with
+      a dpkg that fails to run due to a broken config).
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.  This is useful for tools
+      that hide the dpkg terminal by default and use apport for bug
+      reporting with the untranslated error message.
+    - Apply patch from Steve McIntyre to special-case armhf/armel ELF
+      objects in Shlibs/Objdump.pm, so we don't get incorrect deps.
+    - lib/dpkg/pkg-spec.c: map unqualified package names of multiarch-same
+      packages to the native arch instead of throwing an error, so that we
+      don't break on upgrade when there are unqualified names stored in
+      dpkg's own trigger database.
+    - Add logic to the postinst to `dpkg --add-architecture i386' on new
+      installs on amd64, and to also do so on upgrades from pre-conffile
+      Ubuntu versions, mimicking our previous behaviour with the conffile.
+    - Apply a workaround from mvo to consider RC packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 22 Mar 2013 12:09:02 -0600
+
 dpkg (1.16.10) unstable; urgency=low
 
   [ Guillem Jover ]
@@ -6217,6 +7894,46 @@ dpkg (1.16.10) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Fri, 08 Mar 2013 04:41:26 +0100
 
+dpkg (1.16.9ubuntu2) raring; urgency=low
+
+  * Revert build-dependency from gettext:any to gettext, now that gettext is
+    Multi-Arch: foreign.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 29 Nov 2012 15:03:29 +0000
+
+dpkg (1.16.9ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Change the multiarch downgrade version checks in prerm/postrm
+      from 1.16.2 to 1.16.0~ to reflect when multiarch landed in Ubuntu.
+    - Migrate dpkg multiarch conffile (and other multi-arch-related
+      conf settings) to the new DB with dpkg --add-architecture, but
+      keep a copy of the old conffile if it was modified.
+    - Out of paranoia, keep an option handler for foreign-architecture
+      that informs people that they need to scrub their config files
+      and upgrade, on the off chance that the above migration fails
+      for some reason (this mitigates the chances of leaving users with
+      a dpkg that fails to run due to a broken config).
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.  This is useful for tools
+      that hide the dpkg terminal by default and use apport for bug
+      reporting with the untranslated error message.
+    - Build-depend on gettext:any for cross-building support.
+    - Apply patch from Steve McIntyre to special-case armhf/armel ELF
+      objects in Shlibs/Objdump.pm, so we don't get incorrect deps.
+    - lib/dpkg/pkg-spec.c: map unqualified package names of multiarch-same
+      packages to the native arch instead of throwing an error, so that we
+      don't break on upgrade when there are unqualified names stored in
+      dpkg's own trigger database.
+    - Add logic to the postinst to `dpkg --add-architecture i386' on new
+      installs on amd64, and to also do so on upgrades from pre-conffile
+      Ubuntu versions, mimicking our previous behaviour with the conffile.
+    - Apply a workaround from mvo to consider RC packages as multiarch,
+      during the dpkg consistency checks. (see LP: 1015567 and 1057367).
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 23 Oct 2012 16:45:37 +0100
+
 dpkg (1.16.9) unstable; urgency=low
 
   [ Raphaël Hertzog ]
@@ -6337,6 +8054,77 @@ dpkg (1.16.8) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Sat, 21 Jul 2012 02:11:04 +0200
 
+dpkg (1.16.7ubuntu6) quantal; urgency=low
+
+  [ RaphaÃ«l Hertzog ]
+  * Fix dpkg-source regression in "3.0 (quilt)" source packages while
+    unapplying patches that remove all files in a directory. Closes:
+    #683547  (LP: #1057886)
+
+ -- Barry Warsaw <barry@ubuntu.com>  Mon, 01 Oct 2012 14:39:06 -0400
+
+dpkg (1.16.7ubuntu5) quantal; urgency=low
+
+  * Fix scoping issues in dpkg postinst, so we don't end up doing
+    the foreign-architecture migration on every single dpkg upgrade
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 28 Sep 2012 18:37:28 -0600
+
+dpkg (1.16.7ubuntu4) quantal; urgency=low
+
+  * Apply a workaround from mvo to consider RC packages as multiarch,
+    during the dpkg consistency checks. (LP: #1015567). Opened bug 1057367
+    to upgrade status database.
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>  Thu, 27 Sep 2012 09:40:47 +0100
+
+dpkg (1.16.7ubuntu3) quantal; urgency=low
+
+  * Restore the :native qualier to the implicit build-essential
+    dep in dpkg-checkbuilddeps, now that build-essential is fixed
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 13 Jul 2012 21:43:37 -0600
+
+dpkg (1.16.7ubuntu2) quantal; urgency=low
+
+  * Remove the :native qualifier from the automatic build-dep on
+    build-essential in dpkg-checkbuilddeps: this broke everything
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 06 Jul 2012 04:03:53 -0600
+
+dpkg (1.16.7ubuntu1) quantal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Change the multiarch downgrade version checks in prerm/postrm
+      from 1.16.2 to 1.16.0~ to reflect when multiarch landed in Ubuntu.
+    - Migrate dpkg multiarch conffile (and other multi-arch-related
+      conf settings) to the new DB with dpkg --add-architecture, but
+      keep a copy of the old conffile if it was modified.
+    - Out of paranoia, keep an option handler for foreign-architecture
+      that informs people that they need to scrub their config files
+      and upgrade, on the off chance that the above migration fails
+      for some reason (this mitigates the chances of leaving users with
+      a dpkg that fails to run due to a broken config).
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.  This is useful for tools
+      that hide the dpkg terminal by default and use apport for bug
+      reporting with the untranslated error message.
+    - Build-depend on gettext:any for cross-building support.
+    - Apply patch from Steve McIntyre to special-case armhf/armel ELF
+      objects in Shlibs/Objdump.pm, so we don't get incorrect deps.
+    - lib/dpkg/pkg-spec.c: map unqualified package names of multiarch-same
+      packages to the native arch instead of throwing an error, so that we
+      don't break on upgrade when there are unqualified names stored in
+      dpkg's own trigger database.
+    - Add logic to the postinst to `dpkg --add-architecture i386' on new
+      installs on amd64, and to also do so on upgrades from pre-conffile
+      Ubuntu versions, mimicking our previous behaviour with the conffile.
+  * Alter the foreign-architecture option handler to output to stderr
+    instead of stdout, for people who prefer their stdout less noisy.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 06 Jul 2012 02:17:10 -0600
+
 dpkg (1.16.7) unstable; urgency=low
 
   [ Guillem Jover ]
@@ -6455,6 +8243,37 @@ dpkg (1.16.5) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Sat, 30 Jun 2012 04:28:51 +0200
 
+dpkg (1.16.4.3ubuntu1) quantal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Change the multiarch downgrade version checks in prerm/postrm
+      from 1.16.2 to 1.16.0~ to reflect when multiarch landed in Ubuntu.
+    - Migrate dpkg multiarch conffile (and other multi-arch-related
+      conf settings) to the new DB with dpkg --add-architecture, but
+      keep a copy of the old conffile if it was modified.
+    - Out of paranoia, keep an option handler for foreign-architecture
+      that informs people that they need to scrub their config files
+      and upgrade, on the off chance that the above migration fails
+      for some reason (this mitigates the chances of leaving users with
+      a dpkg that fails to run due to a broken config).
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.  This is useful for tools
+      that hide the dpkg terminal by default and use apport for bug
+      reporting with the untranslated error message.
+    - Build-depend on gettext:any for cross-building support.
+    - Apply patch from Steve McIntyre to special-case armhf/armel ELF
+      objects in Shlibs/Objdump.pm, so we don't get incorrect deps.
+    - lib/dpkg/pkg-spec.c: map unqualified package names of multiarch-same
+      packages to the native arch instead of throwing an error, so that we
+      don't break on upgrade when there are unqualified names stored in
+      dpkg's own trigger database.
+  * Add logic to the postinst to `dpkg --add-architecture i386' on new
+    installs on amd64, and to also do so on upgrades from pre-conffile
+    Ubuntu versions, mimicking our previous behaviour with the conffile.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Wed, 20 Jun 2012 22:57:24 -0600
+
 dpkg (1.16.4.3) unstable; urgency=low
 
   * On «update-alternatives --install» only warn for now on out of range
@@ -6557,6 +8376,40 @@ dpkg (1.16.4) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Thu, 07 Jun 2012 23:43:19 +0200
 
+dpkg (1.16.3ubuntu2) quantal; urgency=low
+
+  * lib/dpkg/pkg-spec.c: map unqualified package names of multiarch-same
+    packages to the native arch instead of throwing an error, so that we
+    don't break on upgrade when there are unqualified names stored in dpkg's
+    own trigger database.  LP: #1015329.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 19 Jun 2012 18:08:02 -0700
+
+dpkg (1.16.3ubuntu1) quantal; urgency=low
+
+  * Merge with 1.16.3 from unstable:
+    - Change the multiarch downgrade version checks in prerm/postrm
+      from 1.16.2 to 1.16.0~ to reflect when multiarch landed in Ubuntu.
+    - Migrate dpkg multiarch conffile (and other multi-arch-related
+      conf settings) to the new DB with dpkg --add-architecture, but
+      keep a copy of the old conffile if it was modified.
+    - Out of paranoia, keep an option handler for foreign-architecture
+      that informs people that they need to scrub their config files
+      and upgrade, on the off chance that the above migration fails
+      for some reason (this mitigates the chances of leaving users with
+      a dpkg that fails to run due to a broken config).
+  * Changes remaining from previous Ubuntu versions:
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.  This is useful for tools
+      that hide the dpkg terminal by default and use apport for bug
+      reporting with the untranslated error message.
+    - Build-depend on gettext:any for cross-building support.
+    - Apply patch from Steve McIntyre to special-case armhf/armel ELF
+      objects in Shlibs/Objdump.pm, so we don't get incorrect deps.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Thu, 07 Jun 2012 10:07:38 -0600
+
 dpkg (1.16.3) unstable; urgency=low
 
   [ Guillem Jover ]
@@ -6790,6 +8643,85 @@ dpkg (1.16.2) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Mon, 19 Mar 2012 07:27:12 +0100
 
+dpkg (1.16.1.2ubuntu8) quantal; urgency=low
+
+  * Revert hack to export compiler flags in dpkg-buildpackage.  Any package
+    depending on this should be fixed to use dpkg-buildflags instead.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 30 Apr 2012 12:49:51 +0100
+
+dpkg (1.16.1.2ubuntu7) precise; urgency=low
+
+  * Apply missing patch from upstream to let dselect's resolver deal
+    with multi-arch Provides in the same way as dpkg (LP: #853679)
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Thu, 12 Apr 2012 16:59:09 -0600
+
+dpkg (1.16.1.2ubuntu6) precise; urgency=low
+
+  * Build-depend on gettext:any for cross-building support.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sun, 08 Apr 2012 23:22:31 +0100
+
+dpkg (1.16.1.2ubuntu5) precise; urgency=low
+
+  * New version of previous patch, many thanks Raphaël Hertzog! (LP: #902603)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 16 Dec 2011 11:23:51 +0100
+
+dpkg (1.16.1.2ubuntu4) precise; urgency=low
+
+  * dpkg: Do not try to disappear other packages from the same set. Packages
+    within a set can rightfully share files and should not be disappeared in
+    the case where they share all the files. Many thanks to Raphaël Hertzog
+    for the fix! (Closes: #652063, LP: #902603)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 15 Dec 2011 11:33:28 +0100
+
+dpkg (1.16.1.2ubuntu3) precise; urgency=low
+
+  * Don't perform is_armhf tests in parse_objdump_output() unless
+    we have a file handle defined.  This is an impossible situation
+    at runtime, but trips up the testsuite oprtating on fake data.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 02 Dec 2011 15:46:35 -0700
+
+dpkg (1.16.1.2ubuntu2) precise; urgency=low
+
+  * Apply patch from Steve McIntyre to special-case armhf/armel ELF
+    objects in Shlibs/Objdump.pm, so we don't get incorrect deps.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 02 Dec 2011 12:24:40 -0700
+
+dpkg (1.16.1.2ubuntu1) precise; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Merge from git://git.debian.org/users/hertzog/dpkg.git
+      pu/multiarch/full for multiarch support.
+    - On upgrade from 1.16.0~ubuntu[1-3], if /var/lib/dpkg/info/$arch is a
+      directory, migrate the contents to var/lib/dpkg/info; and handle the
+      reverse on downgrade.  This does not handle metadata for packages of
+      foreign architectures.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.  This is useful for tools
+      that hide the dpkg terminal by default and use apport for bug
+      reporting with the untranslated error message.
+    - Add /etc/dpkg/dpkg.cfg.d/multiarch as a conffile on amd64, so that
+      users are guaranteed to always have it after upgrade even if they
+      don't use update-manager for the upgrade itself.
+    - Continue exporting compiler flags in dpkg-buildpackage until after
+      Ubuntu 12.04 LTS.
+    - Add Pre-Depends on tar >= 1.23 (satisfied in stable) to dpkg due to it
+      using the ‘--warning=no-timestamp’ option.
+    - Strip -Werror=format-security from the flags exported to the
+      environment from dpkg-buildpackage.
+    - Don't export build flags for packages using debhelper compat level 9
+      or above.
+    - Mark dpkg-dev and libdpkg-perl as Multi-Arch foreign. Closes: #648217
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sun, 27 Nov 2011 09:49:08 +0000
+
 dpkg (1.16.1.2) unstable; urgency=medium
 
   [ Raphaël Hertzog ]
@@ -6804,6 +8736,50 @@ dpkg (1.16.1.2) unstable; urgency=medium
 
  -- Raphaël Hertzog <hertzog@debian.org>  Fri, 25 Nov 2011 11:18:30 +0100
 
+dpkg (1.16.1.1ubuntu3) precise; urgency=low
+
+  * Backport from upstream:
+    - Mark dpkg-dev and libdpkg-perl as Multi-Arch foreign. Closes: #648217
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sat, 12 Nov 2011 14:54:29 +0000
+
+dpkg (1.16.1.1ubuntu2) precise; urgency=low
+
+  * Don't export build flags for packages using debhelper compat level 9 or
+    above.  This is a layering violation which will go away after 12.04 (see
+    https://lists.ubuntu.com/archives/ubuntu-devel/2011-November/034351.html).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 01 Nov 2011 15:36:14 -0400
+
+dpkg (1.16.1.1ubuntu1) precise; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Merge from git://git.debian.org/users/hertzog/dpkg.git
+      pu/multiarch/full for multiarch support.
+    - On upgrade from 1.16.0~ubuntu[1-3], if /var/lib/dpkg/info/$arch is a
+      directory, migrate the contents to var/lib/dpkg/info; and handle the
+      reverse on downgrade.  This does not handle metadata for packages of
+      foreign architectures.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.  This is useful for tools
+      that hide the dpkg terminal by default and use apport for bug
+      reporting with the untranslated error message.
+    - Add /etc/dpkg/dpkg.cfg.d/multiarch as a conffile on amd64, so that
+      users are guaranteed to always have it after upgrade even if they
+      don't use update-manager for the upgrade itself.
+    - Continue exporting compiler flags in dpkg-buildpackage until after
+      Ubuntu 12.04 LTS.
+    - Add Pre-Depends on tar >= 1.23 (satisfied in stable) to dpkg due to it
+      using the ‘--warning=no-timestamp’ option.
+  * Strip -Werror=format-security from the flags exported to the environment
+    from dpkg-buildpackage.  This causes too many failures (including silent
+    failures in configure tests), and removing it is not a regression from
+    any released version of Ubuntu.  It is still included in the normal
+    output of dpkg-buildflags.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 26 Oct 2011 09:49:56 +0100
+
 dpkg (1.16.1.1) unstable; urgency=low
 
   [ Raphaël Hertzog ]
@@ -6834,6 +8810,37 @@ dpkg (1.16.1.1) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Fri, 14 Oct 2011 07:08:31 +0200
 
+dpkg (1.16.1ubuntu2) precise; urgency=low
+
+  * Cherry-pick from trunk:
+    - Add Pre-Depends on tar >= 1.23 (satisfied in stable) to dpkg due to it
+      using the ‘--warning=no-timestamp’ option. Closes: 642802, LP: #878960
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 20 Oct 2011 18:56:21 +0100
+
+dpkg (1.16.1ubuntu1) precise; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Merge from git://git.debian.org/users/hertzog/dpkg.git
+      pu/multiarch/full for multiarch support.
+    - On upgrade from 1.16.0~ubuntu[1-3], if /var/lib/dpkg/info/$arch is a
+      directory, migrate the contents to var/lib/dpkg/info; and handle the
+      reverse on downgrade.  This does not handle metadata for packages of
+      foreign architectures.
+    - Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
+      tools can get untranslated dpkg terminal log messages while at the
+      same time having translated debconf prompts.  This is useful for tools
+      that hide the dpkg terminal by default and use apport for bug
+      reporting with the untranslated error message.
+    - Add /etc/dpkg/dpkg.cfg.d/multiarch as a conffile on amd64, so that
+      users are guaranteed to always have it after upgrade even if they
+      don't use update-manager for the upgrade itself.
+  * Continue exporting compiler flags in dpkg-buildpackage, since we do not
+    want to regress hardening support in Ubuntu 12.04 LTS.  We will revisit
+    this for Ubuntu 12.10.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 14 Oct 2011 15:01:55 +0100
+
 dpkg (1.16.1) unstable; urgency=low
 
   [ Raphaël Hertzog ]
@@ -7077,6 +9084,57 @@ dpkg (1.16.1) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Fri, 23 Sep 2011 06:00:11 +0200
 
+dpkg (1.16.0.3ubuntu5) oneiric; urgency=low
+
+  * Cherry pick b8d4668 and 967a45f from pu/multiarch so that cross-grading a
+    package doesn't result in dpkg believing the package has been disappeared
+    on the next call.  Thanks to Raphaël Hertzog <hertzog@debian.org> for
+    the quick fix!  (LP: #863675)
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 06 Oct 2011 07:29:02 +0000
+
+dpkg (1.16.0.3ubuntu4) oneiric; urgency=low
+
+  * Add /etc/dpkg/dpkg.cfg.d/multiarch as a conffile on amd64, so that users
+    are guaranteed to always have it after upgrade even if they don't use
+    update-manager for the upgrade itself.  Also fixes up the problem of
+    systems installed at 11.10 beta 1 missing the file due to an installer
+    bug.  LP: #846451.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 27 Sep 2011 16:40:04 -0700
+
+dpkg (1.16.0.3ubuntu3) oneiric; urgency=low
+
+  * add DPKG_UNTRANSLATED_MESSAGES environment check so that the 
+    higher level tools can get untranslated dpkg terminal log
+    messages while at the same time have translated debconf 
+    prompts. This is useful for tools that hide the dpkg terminal
+    by default and use apport for bugreport with the untranslated
+    error message.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 28 Jun 2011 09:20:11 +0100
+
+dpkg (1.16.0.3ubuntu2) oneiric; urgency=low
+
+  * Properly update trigdeferred.c from trigdeferred.l, fixing a slew of
+    triggers/Unincorp parsing failures.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 17 Jun 2011 15:27:35 +0100
+
+dpkg (1.16.0.3ubuntu1) oneiric; urgency=low
+
+  * Merge from Debian unstable; remaining changes:
+    - Merge from git://git.debian.org/users/hertzog/dpkg.git
+      pu/multiarch/snapshot/20110314 for multiarch support.
+    - On upgrade from 1.16.0~ubuntu[1-3], if /var/lib/dpkg/info/$arch is a
+      directory, migrate the contents to var/lib/dpkg/info; and handle the
+      reverse on downgrade.  This does not handle metadata for packages of
+      foreign architectures.
+  * Restores support for parsing priority fields with unknown values.
+    LP: #773022.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 17 Jun 2011 00:04:19 -0700
+
 dpkg (1.16.0.3) unstable; urgency=medium
 
   * Allow again Priority field values not known to dpkg. Regression
@@ -7248,6 +9306,110 @@ dpkg (1.16.0) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Fri, 01 Apr 2011 23:56:54 +0200
 
+dpkg (1.16.0~ubuntu8) oneiric; urgency=low
+
+  * src/packages.c: fix use of --force-depends so that it works again for
+    foreign arch packages.  Thanks to Raphaël Hertzog for the fix.
+    LP: #767634.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 29 Apr 2011 19:07:24 -0700
+
+dpkg (1.16.0~ubuntu7) natty; urgency=low
+
+  * src/packages.c: fix the check for whether our dependencies are
+    installed, so that it works correctly for multi-arch: foreign packages
+    configured during the current dpkg run.  Thanks to Raphaël Hertzog
+    <hertzog@debian.org> for the fix.  LP: #756381.
+
+  [ Raphaël Hertzog ]
+  * fddba30d74856e2d5c3f287343569fc259729bc0: Fix regression in dpkg 1.16.0
+    affecting dpkg R.  Closes: #620636.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 14 Apr 2011 11:28:51 -0700
+
+dpkg (1.16.0~ubuntu6) natty; urgency=low
+
+  * Dpkg/Shlibs.pm: we should explicitly prepend the appropriate multiarch
+    paths to our library search path.  These would be picked up later on
+    anyway in the case of a native build, but for, e.g., bootstrapping a
+    cross-toolchain the needed multiarch paths aren't going to be found in
+    ld.so.conf.
+  * Cherry-pick fixes from upstream:
+
+  [ Raphaël Hertzog ]
+  * 7ea2064c46b77398a63d7f7a543ebcf08f7c74d2: Fix dpkg-source's regression
+    with empty patches (introduced while fixing 613023).  Closes: #619541,
+    LP: #742124.
+  * 6a7a20c72325a57762e34f5dbb9f79ba73b5d496: Use the correct mtime when
+    installing a file with statoverrides.  LP: #739179.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 24 Mar 2011 17:04:47 -0700
+
+dpkg (1.16.0~ubuntu5) natty; urgency=low
+
+  * Cherry-pick 88b0c3043a651a422cd0c43c38ab6d553e2214ea from dpkg.git; adds
+    armhf support.
+    [ Guillem Jover ]
+    * Add armhf support to ostable and triplettable. Closes: #594179
+
+ -- Loïc Minier <loic.minier@linaro.org>  Tue, 15 Mar 2011 14:57:15 +0100
+
+dpkg (1.16.0~ubuntu4) natty; urgency=low
+
+  * Merge from git://git.debian.org/users/hertzog/dpkg.git
+    pu/multiarch/snapshot/20110314 for updated multiarch support.  This
+    reverts the dpkg database changes from the earlier merge in favor of a
+    single-directory dpkg db again.
+    - Fix typo in «dpkg-name --overwrite» argument parsing so that it 
+      actually works at all. Thanks to Ivan Gagis <igagis@gmail.com>. 
+      LP: #728708
+  * Update the version checks for the multiarch db format to point to
+    1.16.0~ubuntu4 instead of the (not-yet-released) 1.16.0.
+  * On upgrade from 1.16.0~ubuntu[1-3], if /var/lib/dpkg/info/$arch is a
+    directory, migrate the contents to var/lib/dpkg/info; and handle the
+    reverse on downgrade.  This does not handle metadata for packages of
+    foreign architectures; if this affects you, come talk to me. :-)
+    LP: #727603.
+  * add new variables, DEB_HOST_MULTIARCH and DEB_BUILD_MULTIARCH, that
+    return the "ideal" GNU triplet for each architecture which should be
+    used as the path component for library installation.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 14 Mar 2011 18:12:06 -0700
+
+dpkg (1.16.0~ubuntu3) natty; urgency=low
+
+  * Fix up the DPKG_ADMINDIR env var being passed to maintainer scripts when
+    running with --root.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 01 Mar 2011 14:26:12 -0800
+
+dpkg (1.16.0~ubuntu2) natty; urgency=low
+
+  * Install multiarch symlink in /var/lib/dpkg/info on fresh installs as
+    well as upgrades (LP: #727106).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 01 Mar 2011 11:35:07 +0000
+
+dpkg (1.16.0~ubuntu1) natty; urgency=low
+
+  * Merge from git://git.debian.org/users/hertzog/dpkg.git
+    pu/multiarch/snapshot/20110225 for multiarch support.  This brings us
+    up-to-date with dpkg 1.16.0-pre staged changes as well as pulling in
+    the current version of the multiarch branch from Raphael Hertzog.
+  * FFe: LP: #724637.
+  * Remaining changes:
+    - Set Ubuntu ppc64 optimisation to -O3.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 28 Feb 2011 15:00:42 -0800
+
+dpkg (1.15.8.10ubuntu1) natty; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - cputable: Set cpu to i686 for arch i386.
+  * Set Ubuntu ppc64 optimisation to -O3.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 08 Feb 2011 17:17:45 +0000
+
 dpkg (1.15.8.10) unstable; urgency=low
 
   * Do not segfault on “update-alternatives --auto” when the link group only
@@ -7293,6 +9455,24 @@ dpkg (1.15.8.8) unstable; urgency=low
 
  -- Raphaël Hertzog <hertzog@debian.org>  Thu, 06 Jan 2011 21:04:33 +0100
 
+dpkg (1.15.8.7ubuntu2) natty; urgency=low
+
+  * SECURITY UPDATE: relative directory and symlink following in source pkgs.
+    - scripts/Dpkg/Source/Archive.pm, scripts/Dpkg/Source/Patch.pm,
+      scripts/Dpkg/Source/Package/V2.pm: applied fixes from Raphael Hertzog,
+      thanks to Raphael Geissert.
+    - CVE-2010-1679
+
+ -- Kees Cook <kees@ubuntu.com>  Thu, 06 Jan 2011 12:48:51 -0800
+
+dpkg (1.15.8.7ubuntu1) natty; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Adjust versioned emacs22 conflicts to cope with versions in Ubuntu.
+    - cputable: Set cpu to i686 for arch i386.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 20 Dec 2010 17:41:44 +0000
+
 dpkg (1.15.8.7) unstable; urgency=low
 
   [ Guillem Jover ]
@@ -7340,6 +9520,16 @@ dpkg (1.15.8.7) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Mon, 20 Dec 2010 02:26:26 +0100
 
+dpkg (1.15.8.6ubuntu1) natty; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Adjust versioned emacs22 conflicts to cope with versions in Ubuntu.
+    - cputable: Set cpu to i686 for arch i386.
+  * Restore optimisations on armel, now that the compiler is believed to be
+    fixed (LP: #674146).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 03 Dec 2010 16:47:01 +0000
+
 dpkg (1.15.8.6) unstable; urgency=low
 
   [ Raphaël Hertzog ]
@@ -7385,6 +9575,22 @@ dpkg (1.15.8.6) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Thu, 25 Nov 2010 07:10:48 +0100
 
+dpkg (1.15.8.5ubuntu2) natty; urgency=low
+
+  * debian/rules: Disabled compiler optimizations on arch "armel" (LP: #674146)
+    This is a temporary work-around until we can identify the cause of the
+    stack corruption and subsequent SIGSEGV.
+
+ -- James Hunt <james.hunt@ubuntu.com>  Tue, 16 Nov 2010 13:54:56 +0000
+
+dpkg (1.15.8.5ubuntu1) natty; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Adjust versioned emacs22 conflicts to cope with versions in Ubuntu.
+    - cputable: Set cpu to i686 for arch i386.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 11 Oct 2010 16:04:53 +0100
+
 dpkg (1.15.8.5) unstable; urgency=low
 
   [ Guillem Jover ]
@@ -7447,6 +9653,33 @@ dpkg (1.15.8.5) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Tue, 14 Sep 2010 01:26:21 +0200
 
+dpkg (1.15.8.4ubuntu3) maverick; urgency=low
+
+  * scripts/Dpkg/Source/Archive.pm: Drop -k parameter from the tar call used 
+    by dpkg-source to extract tarballs. Upstream binary files modified by the 
+    packager were not properly installed due to this.  Patch courtesy of 
+    Raphaël Hertzog (upstream, debian git). (LP: #633015)
+
+ -- Dave Walker (Daviey) <DaveWalker@ubuntu.com>  Wed, 08 Sep 2010 10:17:20 +0100
+
+dpkg (1.15.8.4ubuntu2) maverick; urgency=low
+
+  * Backport from sid branch (Guillem Jover):
+    - Do not print a warning when parsing status or status log files on
+      half-installed packages w/o a Description or Maintainer field, as this
+      happens normally when the package was never installed before
+      (LP: #619135).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 23 Aug 2010 12:07:24 +0100
+
+dpkg (1.15.8.4ubuntu1) maverick; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Adjust versioned emacs22 conflicts to cope with versions in Ubuntu.
+    - cputable: Set cpu to i686 for arch i386.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 16 Aug 2010 14:57:09 +0100
+
 dpkg (1.15.8.4) unstable; urgency=low
 
   [ Guillem Jover ]
@@ -7490,6 +9723,41 @@ dpkg (1.15.8.3) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Mon, 02 Aug 2010 10:38:07 +0200
 
+dpkg (1.15.8.2ubuntu4) maverick; urgency=low
+
+  * Cherry-pick d9af569 from dpkg.git sid branch to fix dpkg-shlibdeps in
+    cross-builds:
+
+  [ Raphaël Hertzog]
+  * When analyzing the ELF format of a binary in dpkg-shlibdeps, fallback on
+    usual objdump when the cross objdump failed. Closes: #591522
+
+ -- Loïc Minier <loic.minier@ubuntu.com>  Thu, 12 Aug 2010 07:03:19 +0200
+
+dpkg (1.15.8.2ubuntu3) maverick; urgency=low
+
+  * debian/rules: Globally set $PATH instead of just for dh_builddeb, so that
+    it also applies to pkg-create-dbgsym.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 02 Aug 2010 11:26:48 +0200
+
+dpkg (1.15.8.2ubuntu2) maverick; urgency=low
+
+  * Fix buffer overflow in dpkg_ar_member_put_header. Cherrypicked from trunk.
+    (LP: #612457, Debian #591312)
+  * debian/rules: Add build-tree/dpkg-deb to $PATH when calling dh_builddeb,
+    to pull ourselves out of above swamp.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 02 Aug 2010 11:03:18 +0200
+
+dpkg (1.15.8.2ubuntu1) maverick; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Adjust versioned emacs22 conflicts to cope with versions in Ubuntu.
+    - cputable: Set cpu to i686 for arch i386.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sun, 01 Aug 2010 16:53:42 -0500
+
 dpkg (1.15.8.2) unstable; urgency=low
 
   * Bump libdpkg-perl Depends on dpkg to 1.15.8, as it will break dpkg
@@ -7639,6 +9907,31 @@ dpkg (1.15.8) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Thu, 29 Jul 2010 09:37:35 +0200
 
+dpkg (1.15.7.2ubuntu2) maverick; urgency=low
+
+  * Backport support for the file filtering feature as per the mobile team's
+    request. Add two new dpkg options --path-exclude and --path-include
+    (Upstream commit 4694cd64) and two followup bug fixes (commits 58b91fbb
+    and f008d677).
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 28 Jun 2010 10:23:45 +0200
+
+dpkg (1.15.7.2ubuntu1) maverick; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Adjust versioned emacs22 conflicts to cope with versions in Ubuntu.
+    - Implement handling of hardening-wrapper options via DEB_BUILD_OPTIONS.
+    - cputable: Set cpu to i686 for arch i386.
+  * Drop change to output a newline after a postinst is run; this is
+    probably not going to be merged in Debian and it's not worth carrying a
+    delta for this.
+  * Drop remnants of fixes for duplicate close/closedir calls; what's left
+    no longer appears to make any practical difference, since the duplicate
+    calls will at worst simply return EBADF/EINVAL.
+  * libdpkg: Fix buffer overflow in ar test.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 20 May 2010 15:41:52 +0100
+
 dpkg (1.15.7.2) unstable; urgency=low
 
   [ Raphaël Hertzog ]
@@ -8057,6 +10350,88 @@ dpkg (1.15.6) experimental; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Fri, 12 Mar 2010 00:15:31 +0100
 
+dpkg (1.15.5.6ubuntu5) maverick; urgency=low
+
+  * cputable: Set cpu to i686 for arch i386.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 18 May 2010 12:48:26 +0200
+
+dpkg (1.15.5.6ubuntu4) lucid; urgency=low
+
+  * Backport from upstream:
+    - Restore fsync during package unpack (LP: #559915).  This is now done
+      by deferring the fsync and rename for normal files in tar extraction
+      so that it's done in one pass afterwards, to avoid massive I/O
+      degradation due to the serialization from each write + fsync.  When
+      creating hard links to normal files on extraction use the .dpkg-new
+      filename for source as the file is not yet in place due to the rename
+      deferral.
+    - Fix dpkg to not lose package metadata on filesystems where readdir()
+      returns new files added after the opendir() call, btrfs in particular
+      triggered the problematic behaviour. Closes: #575891
+    - Report deferred trigger errors on status-fd. Closes: #574599,
+      LP: #540252
+      Thanks to Michael Vogt <michael.vogt@ubuntu.com>.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 15 Apr 2010 12:38:50 +0100
+
+dpkg (1.15.5.6ubuntu3) lucid; urgency=low
+
+  * Revert fsync during package unpack for now; it's unacceptably slow for
+    packages with lots of small files, and we can't ship beta-1 this way.
+    We'll do something better once it's decided upstream (LP: #537241).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 16 Mar 2010 10:04:38 +0000
+
+dpkg (1.15.5.6ubuntu2) lucid; urgency=high
+
+  * Backport from upstream:
+    - Use FIEMAP when available (on Linux based systems) to sort the .list
+      files loading order. With a cold cache it improves up to a 70%.
+      Thanks to Morten Hustveit <morten@debian.org>. LP: #442114
+    - Call fsync(2) after writing files on disk, to get the atomicity
+      guarantees when doing rename(2). Based on a patch by Jean-Baptiste
+      Lallement <jeanbaptiste.lallement@gmail.com>.
+      Closes: #430958, LP: #512096
+  * Security fixes by Raphaël Hertzog, also backported from upstream
+    (CVE-2010-0396):
+    - Modify dpkg-source to error out when it would apply patches containing
+      insecure paths (with "/../") and also error out when it would apply a
+      patch through a symlink. Those checks are required as patch will
+      happily modify files outside of the target directory and unpacking a
+      source package should not be able to have any side-effect outside of
+      the target directory. LP: #532445
+    - Also error out when the quilt series contains a path with "/../" as
+      this can cause patch to create files outside of the source package due
+      to the -B .pc/$path option that it gets.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 11 Mar 2010 00:34:28 +0000
+
+dpkg (1.15.5.6ubuntu1) lucid; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    Ubuntu-specific adjustments (probably):
+    - Adjust versioned emacs22 conflicts to cope with versions in Ubuntu.
+
+    Miscellaneous bug fixes:
+    - Avoid duplicate attempts to [f]close in obscure error situations which
+      might conceivably close wrong fds.
+    - Revert change to stop outputting a newline after a postinst is run
+      (Debian #392317).
+
+    Build options:
+    - Point to https://wiki.ubuntu.com/DistCompilerFlags from
+      dpkg-buildpackage(1).
+    - Set default LDFLAGS to -Wl,-Bsymbolic-functions. (We've already taken
+      this hit in Ubuntu.)
+    - Implement handling of hardening-wrapper options via DEB_BUILD_OPTIONS.
+
+  * Drop lpia hacks; lpia is no longer supported.
+  * Drop moves of various Conflicts to Breaks, which are moot since hardy
+    has newer versions of all the affected packages.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sun, 14 Feb 2010 01:32:19 +0000
+
 dpkg (1.15.5.6) unstable; urgency=low
 
   * dpkg-source: with format "3.0 (quilt)" ensure quilt's .pc directory is
@@ -8273,6 +10648,36 @@ dpkg (1.15.5) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Tue, 17 Nov 2009 10:17:57 +0100
 
+dpkg (1.15.4.1ubuntu1) lucid; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    Ubuntu-specific adjustments (probably):
+    - Use i686 for lpia in cputable and triplettable.
+    - Hack Dpkg::Arch to return i686 for lpia.
+    - Move various Conflicts to Breaks, since upgrades from stable Ubuntu
+      releases support Breaks.
+    - Adjust versioned emacs22 conflicts to cope with versions in Ubuntu.
+
+    Miscellaneous bug fixes:
+    - Avoid duplicate attempts to [f]close in obscure error situations which
+      might conceivably close wrong fds.
+    - Revert change to stop outputting a newline after a postinst is run
+      (Debian #392317).
+    - Use the two-arg form of open in Dpkg::Control so that "-" can be
+      passed to parse stdin as a control file (Debian #465340).
+
+    Launchpad integration:
+    - Add Launchpad-Bugs-Fixed handling in a few more places.
+
+    Build options:
+    - Point to https://wiki.ubuntu.com/DistCompilerFlags from
+      dpkg-buildpackage(1).
+    - Set default LDFLAGS to -Wl,-Bsymbolic-functions. (We've already taken
+      this hit in Ubuntu.)
+    - Implement handling of hardening-wrapper options via DEB_BUILD_OPTIONS.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 11 Nov 2009 11:34:56 +0000
+
 dpkg (1.15.4.1) unstable; urgency=medium
 
   * Do not mark any package as unseen in dselect. This is a workaround
@@ -8280,6 +10685,41 @@ dpkg (1.15.4.1) unstable; urgency=medium
 
  -- Guillem Jover <guillem@debian.org>  Mon, 19 Oct 2009 15:15:17 +0200
 
+dpkg (1.15.4ubuntu2) karmic; urgency=low
+
+  * dpkg: Adjust versioned emacs22 conflicts. LP: #432584.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 20 Sep 2009 10:08:33 +0200
+
+dpkg (1.15.4ubuntu1) karmic; urgency=low
+
+  * Resynchronise with Debian (LP: #427854). Remaining changes:
+    Ubuntu-specific adjustments (probably):
+    - Use i686 for lpia in cputable and triplettable.
+    - Hack Dpkg::Arch to return i686 for lpia.
+    - Move various Conflicts to Breaks, since upgrades from stable Ubuntu
+      releases support Breaks.
+
+    Miscellaneous bug fixes:
+    - Avoid duplicate attempts to [f]close in obscure error situations which
+      might conceiveably close wrong fds.
+    - Revert change to stop outputting a newline after a postinst is run
+      (Debian #392317).
+    - Use the two-arg form of open in Dpkg::Control so that "-" can be
+      passed to parse stdin as a control file (Debian #465340).
+
+    Launchpad integration:
+    - Add Launchpad-Bugs-Fixed handling in a few more places.
+
+    Build options:
+    - Point to https://wiki.ubuntu.com/DistCompilerFlags from
+      dpkg-buildpackage(1).
+    - Set default LDFLAGS to -Wl,-Bsymbolic-functions. (We've already taken
+      this hit in Ubuntu.)
+    - Implement handling of hardening-wrapper options via DEB_BUILD_OPTIONS.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 18 Sep 2009 13:39:36 +0100
+
 dpkg (1.15.4) unstable; urgency=low
 
   [ Guillem Jover ]
@@ -8412,6 +10852,35 @@ dpkg (1.15.4) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Sun, 06 Sep 2009 09:37:45 +0200
 
+dpkg (1.15.3.1ubuntu1) karmic; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    Ubuntu-specific adjustments (probably):
+    - Use i686 for lpia in cputable and triplettable.
+    - Hack Dpkg::Arch to return i686 for lpia.
+    - Move various Conflicts to Breaks, since upgrades from stable Ubuntu
+      releases support Breaks.
+
+    Miscellaneous bug fixes:
+    - Avoid duplicate attempts to [f]close in obscure error situations which
+      might conceiveably close wrong fds.
+    - Revert change to stop outputting a newline after a postinst is run
+      (Debian #392317).
+    - Use the two-arg form of open in Dpkg::Control so that "-" can be
+      passed to parse stdin as a control file (Debian #465340).
+
+    Launchpad integration:
+    - Add Launchpad-Bugs-Fixed handling in a few more places.
+
+    Build options:
+    - Point to https://wiki.ubuntu.com/DistCompilerFlags from
+      dpkg-buildpackage(1).
+    - Set default LDFLAGS to -Wl,-Bsymbolic-functions. (We've already taken
+      this hit in Ubuntu.)
+    - Implement handling of hardening-wrapper options via DEB_BUILD_OPTIONS.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 08 Jul 2009 17:45:09 +0100
+
 dpkg (1.15.3.1) unstable; urgency=low
 
   [ Modestas Vainius ]
@@ -8419,6 +10888,35 @@ dpkg (1.15.3.1) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Wed, 08 Jul 2009 11:26:36 +0200
 
+dpkg (1.15.3ubuntu1) karmic; urgency=low
+
+  * Resynchronise with Debian (LP: #393280). Remaining changes:
+    Ubuntu-specific adjustments (probably):
+    - Use i686 for lpia in cputable and triplettable.
+    - Hack Dpkg::Arch to return i686 for lpia.
+    - Move various Conflicts to Breaks, since upgrades from stable Ubuntu
+      releases support Breaks.
+
+    Miscellaneous bug fixes:
+    - Avoid duplicate attempts to [f]close in obscure error situations which
+      might conceiveably close wrong fds.
+    - Revert change to stop outputting a newline after a postinst is run
+      (Debian #392317).
+    - Use the two-arg form of open in Dpkg::Control so that "-" can be
+      passed to parse stdin as a control file (Debian #465340).
+
+    Launchpad integration:
+    - Add Launchpad-Bugs-Fixed handling in a few more places.
+
+    Build options:
+    - Point to https://wiki.ubuntu.com/DistCompilerFlags from
+      dpkg-buildpackage(1).
+    - Set default LDFLAGS to -Wl,-Bsymbolic-functions. (We've already taken
+      this hit in Ubuntu.)
+    - Implement handling of hardening-wrapper options via DEB_BUILD_OPTIONS.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 07 Jul 2009 13:26:01 +0100
+
 dpkg (1.15.3) unstable; urgency=low
 
   [ Guillem Jover ]
@@ -8495,6 +10993,38 @@ dpkg (1.15.3) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Sat, 27 Jun 2009 19:06:43 +0200
 
+dpkg (1.15.2ubuntu1) karmic; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    Ubuntu-specific adjustments (probably):
+    - Use i686 for lpia in cputable and triplettable.
+    - Hack Dpkg::Arch to return i686 for lpia.
+    - Move various Conflicts to Breaks, since upgrades from stable Ubuntu
+      releases support Breaks.
+
+    Miscellaneous bug fixes:
+    - Avoid closing fsys tarfile pipe twice even in normal operation -
+      normally EBADF but might sometimes close some other desired fd and
+      cause hideous doom.
+    - Avoid duplicate attempts to [f]close in obscure error situations which
+      might conceiveably close wrong fds.
+    - Revert change to stop outputting a newline after a postinst is run
+      (Debian #392317).
+    - Use the two-arg form of open in Dpkg::Control so that "-" can be
+      passed to parse stdin as a control file (Debian #465340).
+
+    Launchpad integration:
+    - Add Launchpad-Bugs-Fixed handling in a few more places.
+
+    Build options:
+    - Point to https://wiki.ubuntu.com/DistCompilerFlags from
+      dpkg-buildpackage(1).
+    - Set default LDFLAGS to -Wl,-Bsymbolic-functions. (We've already taken
+      this hit in Ubuntu.)
+    - Implement handling of hardening-wrapper options via DEB_BUILD_OPTIONS.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 07 Jul 2009 12:47:24 +0100
+
 dpkg (1.15.2) unstable; urgency=low
 
   [ Guillem Jover ]
@@ -8933,6 +11463,66 @@ dpkg (1.14.25) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Tue, 03 Feb 2009 00:00:41 +0200
 
+dpkg (1.14.24ubuntu2) karmic; urgency=low
+
+  * Backport from unstable (we'll merge soon enough, but I'm waiting for
+    1.15.1):
+    - Fix dpkg-source to not die when uncompressor processes are killed by
+      SIGPIPE due to tar closing the pipe without exhausting all the data
+      available. Closes: #523329
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 29 Apr 2009 00:26:36 +0100
+
+dpkg (1.14.24ubuntu1) jaunty; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    Ubuntu-specific adjustments (probably):
+    - Use i686 for lpia in cputable and triplettable.
+    - Hack Dpkg::Arch to return i686 for lpia.
+    - Move various Conflicts to Breaks, since upgrades from stable Ubuntu
+      releases support Breaks.
+    - Check source package signatures using
+      /usr/share/keyrings/ubuntu-archive-keyring.gpg if it exists.
+
+    Miscellaneous bug fixes:
+    - Avoid closing fsys tarfile pipe twice even in normal operation -
+      normally EBADF but might sometimes close some other desired fd and
+      cause hideous doom.
+    - Avoid duplicate attempts to [f]close in obscure error situations which
+      might conceiveably close wrong fds.
+    - Add a few more comments around obscure bits of trigger handling code
+      which confused both me and Ian during the merge.
+    - Revert change to stop outputting a newline after a postinst is run
+      (Debian #392317).
+    - Use the two-arg form of open in Dpkg::Control so that "-" can be
+      passed to parse stdin as a control file (Debian #465340).
+    - chdir("/") after chroot() when executing maintainer scripts under
+      --instdir (Debian #509578).
+
+    Launchpad integration:
+    - Implement changelog-closes-bugs for Ubuntu (see
+      https://wiki.ubuntu.com/ClosingBugsFromChangelog).
+    - Add Launchpad-Bugs-Fixed to dpkg-genchanges too, to make it not
+      complain about unknown fields.
+
+    DebianMaintainerField:
+    - scripts/dpkg-source.pl: Check that debian/control complies with
+      https://wiki.ubuntu.com/DebianMaintainerField: If $DEBEMAIL contains
+      '@ubuntu.com', refuse to build a source package if we have an Ubuntu
+      version number, but Maintainer: is not an Ubuntu address. Output a
+      warning if $DEBEMAIL contains 'ubuntu' but not '@ubuntu.com', or if
+      there is no XSBC-Original-Maintainer: field for packages with an
+      Ubuntu version number (Debian #426752).
+
+    Build options:
+    - Point to https://wiki.ubuntu.com/DistCompilerFlags from
+      dpkg-buildpackage(1).
+    - Set default LDFLAGS to -Wl,-Bsymbolic-functions. (We've already taken
+      this hit in Ubuntu.)
+    - Implement handling of hardening-wrapper options via DEB_BUILD_OPTIONS.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 07 Jan 2009 12:11:09 +0000
+
 dpkg (1.14.24) unstable; urgency=low
 
   [ Raphaël Hertzog ]
@@ -8962,6 +11552,56 @@ dpkg (1.14.24) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Mon, 29 Dec 2008 05:38:31 +0100
 
+dpkg (1.14.23ubuntu1) jaunty; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    Ubuntu-specific adjustments (probably):
+    - Use i686 for lpia in cputable and triplettable.
+    - Hack Dpkg::Arch to return i686 for lpia.
+    - Move various Conflicts to Breaks, since upgrades from stable Ubuntu
+      releases support Breaks.
+    - Check source package signatures using
+      /usr/share/keyrings/ubuntu-archive-keyring.gpg if it exists.
+
+    Miscellaneous bug fixes:
+    - Avoid closing fsys tarfile pipe twice even in normal operation -
+      normally EBADF but might sometimes close some other desired fd and
+      cause hideous doom.
+    - Avoid duplicate attempts to [f]close in obscure error situations which
+      might conceiveably close wrong fds.
+    - Add a few more comments around obscure bits of trigger handling code
+      which confused both me and Ian during the merge.
+    - Revert change to stop outputting a newline after a postinst is run
+      (Debian #392317).
+    - Use the two-arg form of open in Dpkg::Control so that "-" can be
+      passed to parse stdin as a control file (Debian #465340).
+    - chdir("/") after chroot() when executing maintainer scripts under
+      --instdir (Debian #509578).
+
+    Launchpad integration:
+    - Implement changelog-closes-bugs for Ubuntu (see
+      https://wiki.ubuntu.com/ClosingBugsFromChangelog).
+    - Add Launchpad-Bugs-Fixed to dpkg-genchanges too, to make it not
+      complain about unknown fields.
+
+    DebianMaintainerField:
+    - scripts/dpkg-source.pl: Check that debian/control complies with
+      https://wiki.ubuntu.com/DebianMaintainerField: If $DEBEMAIL contains
+      '@ubuntu.com', refuse to build a source package if we have an Ubuntu
+      version number, but Maintainer: is not an Ubuntu address. Output a
+      warning if $DEBEMAIL contains 'ubuntu' but not '@ubuntu.com', or if
+      there is no XSBC-Original-Maintainer: field for packages with an
+      Ubuntu version number (Debian #426752).
+
+    Build options:
+    - Point to https://wiki.ubuntu.com/DistCompilerFlags from
+      dpkg-buildpackage(1).
+    - Set default LDFLAGS to -Wl,-Bsymbolic-functions. (We've already taken
+      this hit in Ubuntu.)
+    - Implement handling of hardening-wrapper options via DEB_BUILD_OPTIONS.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 23 Dec 2008 12:57:32 +0000
+
 dpkg (1.14.23) unstable; urgency=low
 
   [ Raphaël Hertzog ]
@@ -9008,6 +11648,60 @@ dpkg (1.14.23) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Tue, 18 Nov 2008 11:50:56 +0200
 
+dpkg (1.14.22ubuntu1) jaunty; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    Ubuntu-specific adjustments (probably):
+    - Use i686 for lpia in cputable and triplettable.
+    - Hack Dpkg::Arch to return i686 for lpia.
+    - Move various Conflicts to Breaks, since upgrades from stable Ubuntu
+      releases support Breaks.
+    - Check source package signatures using
+      /usr/share/keyrings/ubuntu-archive-keyring.gpg if it exists.
+
+    Miscellaneous bug fixes:
+    - Avoid closing fsys tarfile pipe twice even in normal operation -
+      normally EBADF but might sometimes close some other desired fd and
+      cause hideous doom.
+    - Avoid duplicate attempts to [f]close in obscure error situations which
+      might conceiveably close wrong fds.
+    - Add a few more comments around obscure bits of trigger handling code
+      which confused both me and Ian during the merge.
+    - Revert change to stop outputting a newline after a postinst is run
+      (Debian bug #392317).
+    - Use the two-arg form of open in Dpkg::Control so that "-" can be
+      passed to parse stdin as a control file.
+    - chdir("/") after chroot() when executing maintainer scripts under
+      --instdir.
+
+    Launchpad integration:
+    - Implement changelog-closes-bugs for Ubuntu (see
+      https://wiki.ubuntu.com/ClosingBugsFromChangelog).
+    - Add Launchpad-Bugs-Fixed to dpkg-genchanges too, to make it not
+      complain about unknown fields.
+
+    DebianMaintainerField:
+    - scripts/dpkg-source.pl: Check that debian/control complies with
+      https://wiki.ubuntu.com/DebianMaintainerField: If $DEBEMAIL contains
+      '@ubuntu.com', refuse to build a source package if we have an Ubuntu
+      version number, but Maintainer: is not an Ubuntu address. Output a
+      warning if $DEBEMAIL contains 'ubuntu' but not '@ubuntu.com', or if
+      there is no XSBC-Original-Maintainer: field for packages with an
+      Ubuntu version number.
+
+    Build options:
+    - Point to https://wiki.ubuntu.com/DistCompilerFlags from
+      dpkg-buildpackage(1).
+    - Set default LDFLAGS to -Wl,-Bsymbolic-functions. (We've already taken
+      this hit in Ubuntu.)
+    - Implement handling of hardening-wrapper options via DEB_BUILD_OPTIONS.
+
+  * Drop changes only relevant to unsupported and unlikely upgrade paths:
+    - Rename triggers/Deferred to triggers/Unincorp to fix upgrades from
+      early versions of trigger support in Ubuntu.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sat, 01 Nov 2008 02:01:27 +0000
+
 dpkg (1.14.22) unstable; urgency=low
 
   [ Raphaël Hertzog ]
@@ -9097,6 +11791,91 @@ dpkg (1.14.21) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Tue, 26 Aug 2008 05:32:39 +0300
 
+dpkg (1.14.20ubuntu6) intrepid; urgency=low
+
+  * Be more liberal when checking for an Ubuntu Maintainer field; a
+    case-insensitive check is good enough, and copes e.g. with mplayer's
+    "Maintainer: Ubuntu MOTU Media Team <motumedia@tauware.de>".
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 03 Sep 2008 12:50:49 +0100
+
+dpkg (1.14.20ubuntu5) intrepid; urgency=low
+
+  * scripts/Dpkg/Source/Package.pm: Point gpg at
+    /usr/share/keyrings/ubuntu-archive-keyring.gpg if it exists.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 19 Aug 2008 17:29:27 +0100
+
+dpkg (1.14.20ubuntu4) intrepid; urgency=low
+
+  * scripts/dpkg-source.pl: Fix the regexp for the DEBEMAIL check to be more
+    specific to @ubuntu.com addresses. Addresses like "ubuntu@foo.com" should
+    not be considered as official ubuntu developer addresses. (LP: #252262)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 29 Jul 2008 22:12:53 +0200
+
+dpkg (1.14.20ubuntu3) intrepid; urgency=low
+
+  * src/help.c: chdir("/") after chroot().  Not only is this good practice,
+    but it works around bug #251223
+
+ -- Matt Zimmerman <mdz@ubuntu.com>  Thu, 24 Jul 2008 18:31:52 +0100
+
+dpkg (1.14.20ubuntu2) intrepid; urgency=low
+
+  * scripts/dpkg-buildpackage.pl, man/dpkg-buildpackage.1: implement
+    handling of hardening-wrapper options via DEB_BUILD_OPTIONS
+    (Debian bug #489771).
+
+ -- Kees Cook <kees@ubuntu.com>  Thu, 03 Jul 2008 13:18:50 -0700
+
+dpkg (1.14.20ubuntu1) intrepid; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    Ubuntu-specific adjustments (probably):
+    - Use i686 for lpia in cputable and triplettable.
+    - Hack Dpkg::Arch to return i686 for lpia.
+    - Pre-depend on lzma.
+    - Move various Conflicts to Breaks, since upgrades from stable Ubuntu
+      releases support Breaks.
+    - Rename triggers/Deferred to triggers/Unincorp to fix upgrades from
+      early versions of trigger support in Ubuntu.
+
+    Miscellaneous bug fixes:
+    - Avoid closing fsys tarfile pipe twice even in normal operation -
+      normally EBADF but might sometimes close some other desired fd and
+      cause hideous doom.
+    - Avoid duplicate attempts to [f]close in obscure error situations which
+      might conceiveably close wrong fds.
+    - Add a few more comments around obscure bits of trigger handling code
+      which confused both me and Ian during the merge.
+    - Revert change to stop outputting a newline after a postinst is run
+      (Debian bug #392317).
+    - Use the two-arg form of open in Dpkg::Control so that "-" can be
+      passed to parse stdin as a control file.
+
+    Launchpad integration:
+    - Implement changelog-closes-bugs for Ubuntu (see
+      https://wiki.ubuntu.com/ClosingBugsFromChangelog).
+    - Add Launchpad-Bugs-Fixed to dpkg-genchanges too, to make it not
+      complain about unknown fields.
+
+    DebianMaintainerField:
+    - scripts/dpkg-source.pl: Check that debian/control complies with
+      https://wiki.ubuntu.com/DebianMaintainerField: If $DEBEMAIL contains
+      'ubuntu', refuse to build a source package if we have an Ubuntu
+      version number, but Maintainer: is not an Ubuntu address. Output a
+      warning if there is no XSBC-Original-Maintainer: field for packages
+      with an Ubuntu version number.
+
+    DistCompilerFlags:
+    - Point to https://wiki.ubuntu.com/DistCompilerFlags from
+      dpkg-buildpackage(1).
+    - Set default LDFLAGS to -Wl,-Bsymbolic-functions. (We've already taken
+      this hit in Ubuntu.)
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 26 Jun 2008 13:07:53 +0100
+
 dpkg (1.14.20) unstable; urgency=low
 
   [ Guillem Jover ]
@@ -9161,6 +11940,61 @@ dpkg (1.14.20) unstable; urgency=low
 
  -- Raphaël Hertzog <hertzog@debian.org>  Wed, 18 Jun 2008 09:33:54 +0200
 
+dpkg (1.14.19ubuntu2) intrepid; urgency=low
+
+  * scripts/dpkg-source.pl: Check if $DEBEMAIL is defined before testing it
+    for @ubuntu, to avoid Perl warnings. Thanks to Fabien Tassin!
+    (LP: #133024)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 09 Jun 2008 09:51:08 +0000
+
+dpkg (1.14.19ubuntu1) intrepid; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    Ubuntu-specific adjustments (probably):
+    - Use i686 for lpia in cputable and triplettable.
+    - Hack Dpkg::Arch to return i686 for lpia.
+    - Pre-depend on lzma.
+    - Move various Conflicts to Breaks, since upgrades from stable Ubuntu
+      releases support Breaks.
+    - Rename triggers/Deferred to triggers/Unincorp to fix upgrades from
+      early versions of trigger support in Ubuntu.
+
+    Miscellaneous bug fixes:
+    - Avoid closing fsys tarfile pipe twice even in normal operation -
+      normally EBADF but might sometimes close some other desired fd and
+      cause hideous doom.
+    - Avoid duplicate attempts to [f]close in obscure error situations which
+      might conceiveably close wrong fds.
+    - Add a few more comments around obscure bits of trigger handling code
+      which confused both me and Ian during the merge.
+    - Revert change to stop outputting a newline after a postinst is run
+      (Debian bug #392317).
+    - Use the two-arg form of open in Dpkg::Control so that "-" can be
+      passed to parse stdin as a control file.
+
+    Launchpad integration:
+    - Implement changelog-closes-bugs for Ubuntu (see
+      https://wiki.ubuntu.com/ClosingBugsFromChangelog).
+    - Add Launchpad-Bugs-Fixed to dpkg-genchanges too, to make it not
+      complain about unknown fields.
+
+    DebianMaintainerField:
+    - scripts/dpkg-source.pl: Check that debian/control complies with
+      https://wiki.ubuntu.com/DebianMaintainerField: If $DEBEMAIL contains
+      'ubuntu', refuse to build a source package if we have an Ubuntu
+      version number, but Maintainer: is not an Ubuntu address. Output a
+      warning if there is no XSBC-Original-Maintainer: field for packages
+      with an Ubuntu version number.
+
+    DistCompilerFlags:
+    - Point to https://wiki.ubuntu.com/DistCompilerFlags from
+      dpkg-buildpackage(1).
+    - Set default LDFLAGS to -Wl,-Bsymbolic-functions. (We've already taken
+      this hit in Ubuntu.)
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 27 May 2008 13:15:16 +0100
+
 dpkg (1.14.19) unstable; urgency=low
 
   [ Guillem Jover ]
@@ -9243,6 +12077,53 @@ dpkg (1.14.19) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Mon, 12 May 2008 08:33:07 +0300
 
+dpkg (1.14.18ubuntu1) intrepid; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    Ubuntu-specific adjustments (probably):
+    - Use i686 for lpia in cputable and triplettable.
+    - Hack Dpkg::Arch to return i686 for lpia.
+    - Pre-depend on lzma.
+    - Move various Conflicts to Breaks, since upgrades from stable Ubuntu
+      releases support Breaks.
+    - Rename triggers/Deferred to triggers/Unincorp to fix upgrades from
+      early versions of trigger support in Ubuntu.
+
+    Miscellaneous bug fixes:
+    - Avoid closing fsys tarfile pipe twice even in normal operation -
+      normally EBADF but might sometimes close some other desired fd and
+      cause hideous doom.
+    - Avoid duplicate attempts to [f]close in obscure error situations which
+      might conceiveably close wrong fds.
+    - Add a few more comments around obscure bits of trigger handling code
+      which confused both me and Ian during the merge.
+    - Revert change to stop outputting a newline after a postinst is run
+      (Debian bug #392317).
+    - Use the two-arg form of open in Dpkg::Control so that "-" can be
+      passed to parse stdin as a control file.
+
+    Launchpad integration:
+    - Implement changelog-closes-bugs for Ubuntu (see
+      https://wiki.ubuntu.com/ClosingBugsFromChangelog).
+    - Add Launchpad-Bugs-Fixed to dpkg-genchanges too, to make it not
+      complain about unknown fields.
+
+    DebianMaintainerField:
+    - scripts/dpkg-source.pl: Check that debian/control complies with
+      https://wiki.ubuntu.com/DebianMaintainerField: If $DEBEMAIL contains
+      'ubuntu', refuse to build a source package if we have an Ubuntu
+      version number, but Maintainer: is not an Ubuntu address. Output a
+      warning if there is no XSBC-Original-Maintainer: field for packages
+      with an Ubuntu version number.
+
+    DistCompilerFlags:
+    - Point to https://wiki.ubuntu.com/DistCompilerFlags from
+      dpkg-buildpackage(1).
+    - Set default LDFLAGS to -Wl,-Bsymbolic-functions. (We've already taken
+      this hit in Ubuntu.)
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 27 May 2008 10:56:03 +0100
+
 dpkg (1.14.18) unstable; urgency=low
 
   [ Guillem Jover ]
@@ -9469,6 +12350,106 @@ dpkg (1.14.17) experimental; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Sun, 30 Mar 2008 12:48:22 +0300
 
+dpkg (1.14.16.6ubuntu3) hardy; urgency=low
+
+  [ Stephan Hermann ]
+  * Re-Introduced the "Description" field in *_source.changes files, according
+    to Debian Policy.
+    This was removed during 1.14.16.6 upload and will be reintroduced in
+    1.14.17
+    Changes were taken from debians dpkg git Thx to Raphael Herzog for
+    pointing this out
+
+  [ Soren Hansen ]
+  * Remove NO_PKG_MANGLE to re-enable building of dpkg ddeb's.
+
+ -- Soren Hansen <soren@ubuntu.com>  Wed, 13 Feb 2008 00:58:33 +0100
+
+dpkg (1.14.16.6ubuntu2) hardy; urgency=low
+
+  * Fix wrong call to open in Dpkg/Control.pm that makes using a different
+    control file than debian/control fail horribly.
+  * Pass NO_PKG_MANGLE environment variable to dh_strip to make this package
+    not ftbfs. When this is built, published and in the buildd's, we'll
+    reupload without this to regenerate dpkg-dbgsym and such.
+
+ -- Soren Hansen <soren@ubuntu.com>  Mon, 11 Feb 2008 23:41:04 +0100
+
+dpkg (1.14.16.6ubuntu1) hardy; urgency=low
+
+  [ Soren Hansen ]
+  * Merge from debian unstable, remaining changes:
+   - Add m_strdup to mlib.
+   - Use i686 for lpia in cputable and triplettable.
+   - Hack Dpkg::Arch to return i686 for lpia.
+   - tarfn.c:
+     + Avoid freeing uninitialised h.{Link,}Name (can cause crash if .deb
+       becomes unreadable while we start up).  (LP #138887)
+     + Use m_malloc instead of malloc (and ditch ad-hoc error handling).
+
+   Launchpad integration:
+   * Implement changelog-closes-bugs for Ubuntu (see
+     https://wiki.ubuntu.com/ClosingBugsFromChangelog).
+   * Add Launchpad-Bugs-Fixed to dpkg-genchanges too, to make it not
+     complain about unknown fields.
+
+   DebianMaintainerField:
+   * scripts/dpkg-source.pl: Check that debian/control complies to
+     https://wiki.ubuntu.com/DebianMaintainerField: Refuse to build a source
+     package if we have an Ubuntu version number, but Maintainer: is not an
+     Ubuntu address. Output a warning if there is no XSBC-Original-Maintainer:
+     field for packages with an Ubuntu version number.
+   * scripts/dpkg-source.pl: Only fail to build the source package if $DEBEMAIL
+     contains 'ubuntu'. If not, only print a warning.
+   * debian/control: Change Maintainer/XSBC-Original-Maintainer field.
+
+   Trigger support:
+   * Implement triggers as per
+     http://lists.debian.org/debian-dpkg/2007/04/msg00076.html (changes too
+     massive to enumerate here).
+   * Add "Breaks: apt (<< 0.7.6ubuntu6), aptitude (<< 0.4.6.1-1ubuntu2)", as
+     triggers add two extra states, which apt and aptitude before then do not
+     know about.
+   * An early version of trigger support caused LP #133172. To fix which
+     systems have had the broken version work we have to rename
+     triggers/Deferred to triggers/Unincorp.  The error messages, comments,
+     etc. will be improved later.
+
+   Status-fd changes:
+   * Changes to --status-fd and logging, motivated by the need to
+     fix apt's progress reporting in the presence of triggers (not introduced
+     in this version, but accidentally left out of previous merge's changelog
+     entry):
+    - Call log_action for trigger processing and configuration.
+    - Produce "processing:" output on --status-fd for start of
+      processing operations (from log_action).
+    - Consolidate clone-and-hack --status-fd output writing into
+      routine statusfd_send[v].
+    - Improve documentation of --status-fd output.
+    - Add log message at start of archivefiles() and packages()
+      (which will assist debugging).
+    - For upgrade, call log_message after printing to stderr,
+      as is done elsewhere.
+    - avoid closing fsys tarfile pipe twice even in normal
+      operation - normally EBADF but might sometimes close some other
+      desired fd and cause hideous doom.  (LP #137191)
+    - avoid duplicate attempts to [f]close in obscure error
+      situations which might conceiveably close wrong fds
+    - cast &fd to void* when passing to push_cleanup cu_closefd
+    - fix parse.c:parsedb to use ehflag_normaltidy in a sane way
+    - when passing &fd to push_cleanup cu_closefd, make fd always static
+      In the longer term --status-fd output ought probably to be made
+      identical to the log output which is richer and more sanely
+      formatted.
+  * New with this merge: Added test case for Launchpad-Bugs-Fixed.
+
+  [ Matthias Klose ]
+  * dpkg-buildpackage: Set a set of environment variables for setting
+    compiler and linker options, unless already set in the environment.
+    See https://wiki.ubuntu.com/DistCompilerFlags for the details.
+
+ -- Soren Hansen <soren@ubuntu.com>  Mon, 11 Feb 2008 16:42:49 +0100
+
 dpkg (1.14.16.6) unstable; urgency=medium
 
   * Let dpkg-gensymbols skip directories which are just symlinks when scanning
@@ -9618,6 +12599,74 @@ dpkg (1.14.16) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Mon, 21 Jan 2008 10:00:45 +0200
 
+dpkg (1.14.15ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+   - Add m_strdup to mlib.
+   - Use i686 for lpia in cputable and triplettable.
+   - Hack Dpkg::Arch to return i686 for lpia.
+   - tarfn.c:
+     + Avoid freeing uninitialised h.{Link,}Name (can cause crash if .deb
+       becomes unreadable while we start up).  (LP #138887)
+     + Use m_malloc instead of malloc (and ditch ad-hoc error handling).
+
+   Launchpad integration:
+   * Implement changelog-closes-bugs for Ubuntu (see
+     https://wiki.ubuntu.com/ClosingBugsFromChangelog).
+   * Add Launchpad-Bugs-Fixed to dpkg-genchanges too, to make it not
+     complain about unknown fields.
+
+   DebianMaintainerField:
+   * scripts/dpkg-source.pl: Check that debian/control complies to
+     https://wiki.ubuntu.com/DebianMaintainerField: Refuse to build a source
+     package if we have an Ubuntu version number, but Maintainer: is not an
+     Ubuntu address. Output a warning if there is no XSBC-Original-Maintainer:
+     field for packages with an Ubuntu version number.
+   * scripts/dpkg-source.pl: Only fail to build the source package if $DEBEMAIL
+     contains 'ubuntu'. If not, only print a warning.
+   * debian/control: Change Maintainer/XSBC-Original-Maintainer field.
+
+   Trigger support:
+   * Implement triggers as per
+     http://lists.debian.org/debian-dpkg/2007/04/msg00076.html (changes too
+     massive to enumerate here).
+   * Add "Breaks: apt (<< 0.7.6ubuntu6), aptitude (<< 0.4.6.1-1ubuntu2)", as
+     triggers add two extra states, which apt and aptitude before then do not
+     know about.
+   * An early version of trigger support caused LP #133172. To fix which
+     systems have had the broken version work we have to rename
+     triggers/Deferred to triggers/Unincorp.  The error messages, comments,
+     etc. will be improved later.
+   
+   Status-fd changes:
+   * Changes to --status-fd and logging, motivated by the need to
+     fix apt's progress reporting in the presence of triggers (not introduced
+     in this version, but accidentally left out of previous merge's changelog
+     entry):
+    - Call log_action for trigger processing and configuration.
+    - Produce "processing:" output on --status-fd for start of
+      processing operations (from log_action).
+    - Consolidate clone-and-hack --status-fd output writing into
+      routine statusfd_send[v].
+    - Improve documentation of --status-fd output.
+    - Add log message at start of archivefiles() and packages()
+      (which will assist debugging).
+    - For upgrade, call log_message after printing to stderr,
+      as is done elsewhere.
+    - avoid closing fsys tarfile pipe twice even in normal
+      operation - normally EBADF but might sometimes close some other
+      desired fd and cause hideous doom.  (LP #137191)
+    - avoid duplicate attempts to [f]close in obscure error
+      situations which might conceiveably close wrong fds
+    - cast &fd to void* when passing to push_cleanup cu_closefd
+    - fix parse.c:parsedb to use ehflag_normaltidy in a sane way
+    - when passing &fd to push_cleanup cu_closefd, make fd always static
+    In the longer term --status-fd output ought probably to be made
+    identical to the log output which is richer and more sanely
+    formatted.
+
+ -- Soren Hansen <soren@ubuntu.com>  Mon, 14 Jan 2008 16:22:52 +0100
+
 dpkg (1.14.15) unstable; urgency=low
 
   [ Raphaël Hertzog ]
@@ -9765,6 +12814,67 @@ dpkg (1.14.13) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Thu, 27 Dec 2007 09:16:45 +0200
 
+dpkg (1.14.12ubuntu4) hardy; urgency=low
+
+  * Cherry pick from current trunk:
+    - Fix dpkg-shlibdeps choosing bad symbols files when there are several
+      providing the same soname. LP: #177917.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 04 Jan 2008 08:33:24 +0000
+
+dpkg (1.14.12ubuntu3) hardy; urgency=low
+
+  * Move lzma from Suggests to Pre-Depends for dpkg.
+
+ -- Chris Cheney <ccheney@ubuntu.com>  Thu, 13 Dec 2007 17:10:09 -0600
+
+dpkg (1.14.12ubuntu2) hardy; urgency=low
+
+  * Cherry pick from current trunk:
+    - Included files in symbols files (via #include) do no more need to repeat
+      the header line. Closes: #455260
+    - scripts/Dpkg/Shlibs/SymbolFile.pm (merge_symbols): Do not update
+      the deprecated version of a a symbol if it is already marked deprecated.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 12 Dec 2007 08:37:22 +0000
+
+dpkg (1.14.12ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+   - Add m_strdup to mlib (part of the fix for Debian #379028).
+   - Use i686 for lpia in cputable and triplettable.
+   - Hack Dpkg::Arch to return i686 for lpia
+
+   Launchpad integration:
+   * Implement changelog-closes-bugs for Ubuntu (see
+     https://wiki.ubuntu.com/ClosingBugsFromChangelog).
+   * Add Launchpad-Bugs-Fixed to dpkg-genchanges too, to make it not
+     complain about unknown fields.
+
+   DebianMaintainerField:
+   * scripts/dpkg-source.pl: Check that debian/control complies to
+     https://wiki.ubuntu.com/DebianMaintainerField: Refuse to build a source
+     package if we have an Ubuntu version number, but Maintainer: is not an
+     Ubuntu address. Output a warning if there is no XSBC-Original-Maintainer:
+     field for packages with an Ubuntu version number.
+   * scripts/dpkg-source.pl: Only fail to build the source package if $DEBEMAIL
+     contains 'ubuntu'. If not, only print a warning.
+   * debian/control: Change Maintainer/XSBC-Original-Maintainer field.
+
+   Trigger support:
+   * Implement triggers as per
+     http://lists.debian.org/debian-dpkg/2007/04/msg00076.html (changes too
+     massive to enumerate here).
+   * Add "Breaks: apt (<< 0.7.6ubuntu6), aptitude (<< 0.4.6.1-1ubuntu2)", as
+     triggers add two extra states, which apt and aptitude before then do not
+     know about.
+   * An early version of trigger support caused LP #133172. To fix which
+     systems have had the broken version work we have to rename
+     triggers/Deferred to triggers/Unincorp.  The error messages, comments,
+     etc. will be improved later.
+
+ -- Soren Hansen <soren@ubuntu.com>  Fri, 07 Dec 2007 10:45:12 +0100
+
 dpkg (1.14.12) unstable; urgency=low
 
   [ Raphaël Hertzog ]
@@ -10074,6 +13184,250 @@ dpkg (1.14.6) unstable; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Wed, 05 Sep 2007 07:36:02 +0300
 
+dpkg (1.14.5ubuntu16) gutsy; urgency=low
+
+  * Fix some portability problems revealed by compiler warnings:
+    - missing <dpkg.h> in tarfn.c, implicit declaration of m_malloc
+    - missing cast for %ld ohshite at info.c:98
+    - unused yyunput (missing %option nounput) in trigdeferred.l
+
+ -- Ian Jackson <iwj@ubuntu.com>  Fri, 21 Sep 2007 19:03:36 +0100
+
+dpkg (1.14.5ubuntu15) gutsy; urgency=low
+
+  * Bugfixes to fd cleanup handling:
+    - avoid closing fsys tarfile pipe twice even in normal
+      operation - normally EBADF but might sometimes close some other
+      desired fd and cause hideous doom.  (LP: #137191.)
+    - avoid duplicate attempts to [f]close in obscure error
+      situations which might conceiveably close wrong fds
+    - cast &fd to void* when passing to push_cleanup cu_closefd
+    - fix parse.c:parsedb to use ehflag_normaltidy in a sane way
+    - when passing &fd to push_cleanup cu_closefd, make fd always static
+  * Bugfix in trigger deferred file processing: reset lexer start state
+    when calling yyrestart (has no effect except after parsing/reading
+    errors in the deferred file).
+  * Fix some error handling bugs in tarfn.c:
+    - Avoid freeing uninitialised h.[Link]Name (can cause crash if .deb
+      becomes unreadable while we start up).  (LP: #138887.)
+    - Use m_malloc instead of malloc (and ditch ad-hoc error handling).
+
+ -- Ian Jackson <iwj@ubuntu.com>  Thu, 20 Sep 2007 18:12:20 +0100
+
+dpkg (1.14.5ubuntu14) gutsy; urgency=low
+
+  * Change syntax of `processing:...' status fd outputs so
+    as to avoid crashing apt's lame parser.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Tue, 18 Sep 2007 17:14:31 +0100
+
+dpkg (1.14.5ubuntu13) gutsy; urgency=low
+
+  * Changes to --status-fd and logging, motivated by the need to
+    fix apt's progress reporting in the presence of triggers:
+    - Call log_action for trigger processing and configuration.
+    - Produce "processing:" output on --status-fd for start of
+      processing operations (from log_action).
+    - Consolidate clone-and-hack --status-fd output writing into
+      routine statusfd_send[v].
+    - Improve documentation of --status-fd output.
+    - Add log message at start of archivefiles() and packages()
+      (which will assist debugging).
+    - For upgrade, call log_message after printing to stderr,
+      as is done elsewhere.
+    In the longer term --status-fd output ought probably to be made
+    identical to the log output which is richer and more sanely
+    formatted.
+  
+ -- Ian Jackson <iwj@ubuntu.com>  Tue, 18 Sep 2007 14:13:07 +0100
+
+dpkg (1.14.5ubuntu12) gutsy; urgency=low
+
+  * Rerun autoconf so that version (as in DPKG_RUNNING_VERSION)
+    is 1.14.5ubuntu12.  This is needed for proper detection
+    of trigger capability by eg the ldconfig wrapper.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Thu, 06 Sep 2007 16:54:44 +0100
+
+dpkg (1.14.5ubuntu11) gutsy; urgency=low
+
+  * Breaks: enable Breaks processing in depisok
+    (Patch from Debian, buried in git 864201).
+
+ -- Ian Jackson <iwj@ubuntu.com>  Wed, 29 Aug 2007 15:10:50 +0100
+
+dpkg (1.14.5ubuntu10) gutsy; urgency=low
+  
+  Triggers improvements:
+  * Fix bug where diversions and triggers incorporated only on normal
+    error unwind from do_script (rather than on abnormal unwind).  The
+    effect of the bug was to temporarily disregard diversion changes made
+    by failing maintscripts and to erroneously suppress reflexive trigger
+    activations.
+  * Trigger cycle detection works properly: does not record details of
+    irrelevant packages, and prints error messages correctly and without
+    referencing uninitialised tcn->next.
+  * Provide DPKG_RUNNING_VERSION environment variable so that maintscripts
+    can know what features are going to work - in this case, whether
+    reflexive trigger activation will be honoured.
+  * New debugging flags and corresponding debug statements.
+  
+ -- Ian Jackson <iwj@ubuntu.com>  Fri, 24 Aug 2007 16:38:01 +0100
+
+dpkg (1.14.5ubuntu9) gutsy; urgency=low
+
+  * Triggers: Transitional interest recording works properly regardless
+    of the status of the interested package.  (LP: #133172.)
+    To fix systems which have had the broken version work we have to
+    rename triggers/Deferred to triggers/Unincorp.  The error
+    messages, comments, etc. will be improved later.
+  * Triggers: Make it possible for postinst of a package to trigger
+    itself.  (Thanks to Colin Watson for relevant discussions.)
+
+ -- Ian Jackson <iwj@ubuntu.com>  Tue, 21 Aug 2007 14:12:54 +0100
+
+dpkg (1.14.5ubuntu8) gutsy; urgency=low
+
+  * Really rerun automake and autoconf this time!
+
+ -- Ian Jackson <iwj@ubuntu.com>  Thu, 16 Aug 2007 17:59:19 +0100
+
+dpkg (1.14.5ubuntu7) gutsy; urgency=low
+
+  * Permit non-awaiting trigger activation.  (Helpful when T and U
+    both trigger I in their postinst and T depends on U but I's trigger
+    processing need not run as a result of U's postinst for T's benefit.)
+  * Correct sense of trigger processing deferral test.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Thu, 16 Aug 2007 16:56:40 +0100
+
+dpkg (1.14.5ubuntu6) gutsy; urgency=low
+
+  * Include dpkg-trigger in debian/dpkg.install.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Thu, 16 Aug 2007 15:53:32 +0100
+
+dpkg (1.14.5ubuntu5) gutsy; urgency=low
+
+  * Rerun automake and autoconf so that it can be built if
+    those are not installed.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Thu, 16 Aug 2007 15:41:58 +0100
+
+dpkg (1.14.5ubuntu4) gutsy; urgency=low
+
+  * Implementation of `triggers' feature.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Wed, 15 Aug 2007 20:23:10 +0100
+
+dpkg (1.14.5ubuntu3) gutsy; urgency=low
+
+  * The previous triplettable mangling still left us with a GNU_TYPE
+    of i486-linux-gnulp, which was suboptimal.  After mucking about
+    and coming to the conclusion that the current lookup tables just
+    weren't designed to handle two targets for the same CPU family,
+    implemented a hack in controllib.pl to DTRT for us for now.
+  * Add lpia to archtable for reference purposes and completeness.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Wed,  1 Aug 2007 12:11:40 +1000
+
+dpkg (1.14.5ubuntu2) gutsy; urgency=low
+
+  * Include mapping from gnulp-linux-i386 to lpia in triplettable
+    to ensure that dpkg-architecture.pl prints lpia during dpkg's
+    build so that dpkg --print-architecture prints lpia too.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Tue, 31 Jul 2007 15:47:04 +0100
+
+dpkg (1.14.5ubuntu1) gutsy; urgency=low
+
+  Merge from debian unstable, remaining changes follow:
+
+  Miscellaneous fixes:
+  * Don't consider it a file conflict if the package contains
+    a symlink to a directory where another package already contains the
+    same symlink/directory and the existing and new symlinks point to the
+    same place.  (Launchpad 22340, Debian #377682.)
+  * mlib contains m_strdup (part of the fix for Debian #379028).
+  * Fix formatting of these files:
+       lib/showpkg.c
+       lib/tarfn.c
+       src/configure.c
+       src/archives.c (function quote_filename only)
+    to conform to the rest of dpkg by running them through
+    expand -t2 (and in the last case using M-x indent-rigidly once).
+    As discussed on debian-dpkg.  Submitted upstream as Debian #375711.
+  * scripts/update-alternatives.pl: in the case where the slave is
+    inapplicable do not attempt to create the slave link before removing
+    it again.  This will help alleviate LP #84906 (vim upgrade problems)
+    and will generally make things slightly less fragile.  Debian #411699.
+  * mlib contains m_strdup (part of the fix for Debian #379028).
+  * Fix the uninitialized value in string ne at /usr/sbin/update-alternatives
+    line 602.  Thanks to Ubulette for this patch.  (LP: #118246)
+    Patch modified by iwj not to ignore lstat failures.
+  * Use i686 for lpia in cputable and triplettable.
+
+  Launchpad integration:
+  * Implement changelog-closes-bugs for Ubuntu (see
+    https://wiki.ubuntu.com/ClosingBugsFromChangelog).
+  * Add Launchpad-Bugs-Fixed to dpkg-genchanges too, to make it not
+    complain about unknown fields.
+
+  DebianMaintainerField:
+  * scripts/dpkg-source.pl: Check that debian/control complies to
+    https://wiki.ubuntu.com/DebianMaintainerField: Refuse to build a source
+    package if we have an Ubuntu version number, but Maintainer: is not an
+    Ubuntu address. Output a warning if there is no XSBC-Original-Maintainer:
+    field for packages with an Ubuntu version number.
+  * scripts/dpkg-source.pl: Only fail to build the source package if $DEBEMAIL
+    contains 'ubuntu'. If not, only print a warning.
+  * debian/control: Change Maintainer/XSBC-Original-Maintainer field.
+
+  Implementation of Breaks:
+  * References:
+     http://lists.debian.org/debian-devel/1997/10/msg00643.html
+     https://wiki.ubuntu.com/PackageDependencyFieldBreaks
+     Debian #379140.
+  * Manpages mention Breaks: deb-control.5, dpkg-query.1, dpkg.1.
+  * Support for Breaks in dpkg-source, dpkg-gencontrol et al.
+  * Support for Breaks in the code in dpkg.
+  * Breaks is ignored by dselect.
+  * Fix for Debian #378003 (multiple deconfigurations) is
+    mixed in with Breaks implementation.
+  * Declare Breaks against older dpkg-dev rather than Conflicts.
+  * Decisions made:
+    * Specifying Breaks: <virtual package> is fairly meaningless
+      without versioned Provides but to make versioned Provides easier
+      in the future we support it fully.
+    * We do not transitively deconfigure things when we deconfigure
+      due to Breaks, just as we don't do so when we deconfigure due
+      to removal due to Conflicts (see also Debian #378009).
+    * Just as for deconfiguration due to Conflicts, we don't deconfigure
+      Essential packages without --force-remove-essential.
+    * We aren't willing to deconfigure more than one package as a result
+      of a single element of a Breaks, just as we aren't willing to
+      remove more than one package as a result of a single element of
+      a Conflicts.  (Note that this can only occur due to virtual
+      packages so it can be worked around by specifying the individual
+      real packages instead.)
+    * We're happy to deconfigure a package that's on hold even if
+      afterwards, due to Breaks, there might not be a way to reconfigure it.
+      (This is analogous to the situation where we install a package which
+      no longer satisfies the dependencies of an on-hold package; it's not
+      clear what the right answer is.)
+    * We invent a new --force-breaks which does much the
+      same as --force-conflicts.
+    * --ignore-depends works for Breaks even though it doesn't work
+      for Conflicts.
+    * <deconfigured's prerm> deconfigure in-favour <installing> <ver>
+        as well as
+      <deconfigured's prerm> deconfigure in-favour <installing> <ver> \
+                                       removing <conflictor> <ver>
+      and of course the corresponding
+    <deconfigured's postinst> abort-deconfigure in-favour <installing> <ver>
+
+ -- Ian Jackson <iwj@ubuntu.com>  Wed, 11 Jul 2007 16:26:17 +0100
+
 dpkg (1.14.5) unstable; urgency=low
 
   [ Guillem Jover ]
@@ -13304,7 +16658,6 @@ dpkg (1.4.0.28) unstable; urgency=low
 
  -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Mon, 21 Sep 1998 13:17:14 +0200
 
-
 dpkg (1.4.0.27) unstable; urgency=low
 
   * REALLY fixed dpkg-dev, and new attempt to placate installer on internals.
@@ -13990,7 +17343,6 @@ dpkg (1.3.0) experimental; urgency=LOW
 
  -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Tue, 6 Aug 1996 02:31:52 +0100
 
-
 dpkg (1.2.14) stable unstable; urgency=MEDIUM
 
   * dselect +/-/_/= on lines for all broken, new, local or whatever
@@ -14000,7 +17352,6 @@ dpkg (1.2.14) stable unstable; urgency=M
 
  -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Thu, 22 Aug 1996 00:39:52 +0100
 
-
 dpkg (1.2.13) unstable; urgency=LOW
 
   * dpkg --search produces correct output for diversions.
@@ -14026,75 +17377,997 @@ dpkg (1.2.13) unstable; urgency=LOW
  -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Thu, 1 Aug 1996 02:46:34 +0100
 
 dpkg (1.2.12); priority=LOW
-
   * dpkg --search and --list understand and comment on diversions.
   * dpkg-divert displays diversions more intelligibly.
-
   * Guidelines are somewhat clearer about descriptions.
   * deb(5) describes new format; old moved to deb-old(5).  (Bug#3435.)
   * deb-control(5) carries a warning about being out of date.
-
   * Added 1996 to dselect version/copyright.
-
  -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Thu, 4 Jul 1996 15:04:49 +0100
 
-dpkg (1.2.11); priority=MEDIUM
+dpkg (0.93.79) BETA; priority=LOW
+
+  * DPKG_NO_TSTP environment variable which stops dpkg sending the
+    process group a SIGTSTP (Bug#1496).
+  * End key should work in dselect lists (Bug#1501).
+  * various message typos (missing \n's) fixed (Bug#1504).
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Fri, 29 Sep 1995 03:27:01 +0100
+
+dpkg (0.93.78) BETA; priority=LOW
+
+  * dselect keystrokes help file typo fix.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Thu, 28 Sep 1995 20:31:02 +0100
+
+dpkg (0.93.77) BETA; priority=MEDIUM
+
+  * dpkg --remove --pending will purge things when appropriate.
+
+  * fixed failure to null-terminate dpkg conflict problem messages.
+  * fixed bug in formatting of dependency version problem messages.
+
+  * Conffiles resolution prompt for new conffile: typo fixed.
+  * Changed dpkg usage error to suggest `-Dhelp' instead of `--Dhelp'.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Wed, 20 Sep 1995 23:44:35 +0100
+
+dpkg (0.93.76) BETA; priority=MEDIUM
+
+  * dpkg --auto-deconfigure option (used automatically by dselect) allows
+    `important' packages which many others depend on to be split.
+  * dpkg should no longer fail an assertion during complicated
+    multiple configurations involving packages which are on hold.
+
+  * update-alternatives supports negative priorities.
+  * /etc/alternatives is included in the .deb archive.
+
+  * Package priorities changed: Required (Req), Important (Imp), Standard (Std),
+    Optional (Opt) and Extra (Xtr).  For backward compatibility Base is an
+    alias for Required, and Recommended is kept as a level just below Standard.
+
+  * dselect shows introductory help screen when entering package lists (both
+    main and recursive).
+  * dselect help messages made more friendly.
+  * dselect package list `quit, confirm, and check dependencies' key is
+    now Return rather than lowercase `q'; likewise method list `select this
+    one and configure it' key.
+  * dselect selects packages with priority `standard' or better by default.
+  * dselect `v=verbose' becomes `v=terse' when in verbose mode.
+
+  * hard disk method unmounts /var/lib/dpkg/methods/mnt on failure.
+  * disk methods' install message uses `stty' to find out what the
+    interrupt character is, and uses that in the prompt (rather than ^C).
+  * dpkg now tolerates ^Z characters in Packages files.
+  * harddisk method doesn't display extra slash when updating packages file.
+  * harddisk method burbles less if it doesn't have a good default.
+
+  * dpkg-deb now supports new flexible format, but old format still default.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Wed, 20 Sep 1995 02:49:41 +0100
+
+dpkg (0.93.75) BETA; priority=MEDIUM
+
+  * dselect no longer segfaults when you try to modify the last item.
+
+  * dselect Makefile compiles with -g, and links without -s, but installs
+    with -s, so that built source directory has debugabble binary.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Tue, 12 Sep 1995 02:59:29 +0100
 
+dpkg (0.93.74) BETA; priority=LOW
+
+  * dpkg-split implemented and installed in /usr/bin/dpkg-split.
+    (NB this is not compatible with Carl Streeter's old dpkg-split script.)
+  * dpkg uses dpkg-split.
+  * floppy disk method available - NB this is a first attempt only.
+
+  * hard disk method uses --merge-avail rather than --update-avail.
+  * installation by default of `standard' packages removed again.
+    (I don't think this is the right place to do this.)
+  * update-alternatives --remove correctly deletes all slave links;
+    minor cosmetic improvements.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Mon, 11 Sep 1995 02:06:05 +0100
+
+dpkg (0.93.73) BETA; priority=LOW
+
+  * dselect multi-package selection now done by `divider' lines
+    actually in the package list, rather than horizontal highlight
+    movement.
+  * dselect help available, and keybindings rationalised.
+
+  * postinst removes /usr/lib/dpkg/methods/hd if upgrading from
+    0.93.42.3 or earlier.
+  * `hold' flag changed to be settable by the user only, and
+    made orthogonal to the `reinstallation required' flag.
+  * dpkg will install by default any packages with priority of
+    `standard' or better unless they're explicitly deselected.
+
+  * dselect dependency/conflict resolution will suggest marking absent
+    packages for `purge' rather than `deinstall'.
+  * disk method script produces message about invoking dpkg.
+  * dpkg produces warning, not error, when it gets EPERM trying to
+    remove a directory belonging to a package being removed.
+  * dpkg, dpkg-deb usage error reporting improved.
+  * dselect detects too-dumb terminals and stops.
+  * dpkg-deb(8) updated a little (thanks to Bill Mitchell).
+
+  * dselect debugmake script uses -O0.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Sun, 10 Sep 1995 12:23:05 +0100
+
+dpkg (0.93.72) BETA; priority=MEDIUM
+
+  * /usr/sbin/update-alternatives added.
+
+  * New names for certain control file fields (old names work
+    as aliases): Optional -> Suggests, Recommended -> Recommends,
+    Class -> Priority.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Sun, 3 Sep 1995 16:37:41 +0100
+
+dpkg (0.93.71) BETA; priority=LOW
+
+  * dpkg doesn't silently overwrite `new' conffiles (Bug#1283).
+  * case now not significant in Essential, Status and Class (Bug#1280).
+  * dselect checks method scripts for execute, not for write.
+
+  * spelling fixes in lib/dbmodify.c and dselect/helpmsgs.src.
+
+  * dselect `clean' target deletes helpmsgs.cc and helpmsgs.cc.new.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Thu, 31 Aug 1995 13:56:08 +0100
+
+dpkg (0.93.70) BETA; priority=MEDIUM
+
+  * dselect unmounted harddisk method has many silly bugs fixed.
+
+  * dpkg --root option restored (was removed by mistake in 0.93.68).
+  * minor cosmetic change to dselect subprocess failure message.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Wed, 9 Aug 1995 22:18:55 +0100
+
+dpkg (0.93.69) BETA; priority=MEDIUM
+
+  * dpkg --configure and --remove should work properly when
+    they have to defer processing (this tends to happen when many
+    packages are processed at once).  (Bug#1209.)
+
+  * dpkg --configure and --remove work better when `processing'
+    several related packages with --no-act.
+
+  * dpkg --auto is now two options, --pending or -a (for configure,
+    remove, &c) and --recursive or -R (for install, unpack, &c).
+
+  * dpkg debug options in usage message, and values available (-Dh).
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Wed, 9 Aug 1995 22:18:55 +0100
+
+dpkg (0.93.68) BETA; priority=MEDIUM
+
+  * dpkg won't get an internal error if you try to use the default
+    conffiles response (ie, if you just hit return).  (Bug#1208.)
+
+  * dselect hard disk and CD-ROM methods - the real thing, but ALPHA.
+
+  * dselect allows you to go straight to `update' or `install' if
+    you have already set up an access method.
+  * new dpkg options --yet-to-unpack, --merge-avail and --update-avail.
+  * dpkg -G is an abbreviation for dpkg --refuse-downgrade.
+  * dpkg -R alias for --root withdrawn, pending reuse with different meaning.
+  * dpkg --help message rationalised somewhat.
+
+  * Obsolete `examples' and `dpkg-split' directories removed from
+    source tree.  The `hello' package is a better example.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Mon, 7 Aug 1995 02:16:25 +0100
+
+dpkg (0.93.67) BETA; priority=LOW for C dpkg alpha testers, HIGH for others
+
+  * dpkg no longer statically linked and -g.
+  * calls to abort() changed to print string, file and line number first.
+  * removed unused variable from dpkg source.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Fri, 4 Aug 1995 01:39:52 +0100
+
+dpkg (0.93.66) ALPHA; priority=MEDIUM
+
+  * dpkg will correctly remove overwritten files from the lists of
+    the package(s) that used to contain them.
+
+  * dpkg --purge is now an action, rather than a modifier for --remove,
+    and the -P alias for it is withdrawn.
+
+  * dpkg --unpack/--install filenames in messages are now more sensible
+    about when to use .../ (show as many trailing components as possible
+    in 40 characters, or the whole path if that the last component is
+    longer than that).
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Thu, 3 Aug 1995 02:11:03 +0100
+
+dpkg (0.93.65) ALPHA; priority=MEDIUM
+
+  * dpkg --remove should, when a package being removed is depended-on
+    by another that is also queued for removal, defer the depended-on
+    package rather than aborting it.  (Bug#1188.)
+
+  * dpkg will not attempt to configure or remove a package more than
+    once in the same run.  (Bug#1169.)
+
+  * dpkg cosmetic fix to dependency problems message (this bug
+    hasn't been triggered to my knowledge).
+
+  * perl-dpkg no longer installed in /usr/bin.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Wed, 2 Aug 1995 13:02:58 +0100
+
+dpkg (0.93.64) ALPHA; priority=MEDIUM
+
+  * dpkg marks a package as no longer `to be configured in this run'
+    when an error occurs, so that other packages which depend on it
+    will fail (rather than causing a loop and an assertion failure,
+     packages.c:166: failed assertion `dependtry <= 4').
+
+  * dselect initial selection granularity is single-package.
+  * dpkg --no-also-select option renamed to --selected-only (old option
+    still accepted, but no longer in --help).  Changed -N to -O.
+
+  * dselect `update' option changed to `install' (and other options
+    renamed too).  NB: old access methods will not work, because
+    the `update' script should now be an `install' script.
+
+  * dselect `installation methods' renamed to `access methods'.
+  * dpkg --skip-same-version and --refuse-downgrade produce friendlier
+    messages when they skip packages.
+  * --licence option now properly mentioned in all programs' --version
+    messages.
+
+  * bad fix for ELF compile problem involving myopt.h removed (compile
+    problem turned out to be a GCC bug.)
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Tue, 1 Aug 1995 03:03:58 +0100
+
+dpkg (0.93.63) ALPHA; priority=LOW
+
+  * preinst works around shell bug/misfeature involving `trap'.
+
+  * dpkg --skip-same-version doesn't skip packages which have
+    an error flag set or which aren't in a standard `installed' state.
+
+  * dpkg --search now does a substring search if the string doesn't
+    start with a wildcard character (*, [ or ?) or slash.
+
+  * problem with C/C++ linkage of stuff in "myopt.h" fixed, to help
+    with compiling with GCC 2.7.0.
+
+  * dselect Makefile.in `clean' deletes curkeys.inc &c, so that they are
+    not shipped in the distribution source and will be rebuilt on the
+    target system.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Thu, 27 Jul 1995 13:38:47 +0100
+
+dpkg (0.93.62) ALPHA; priority=HIGH
+
+  * dpkg purges leftover control scripts from /var/lib/dpkg/tmp.ci,
+    rather than associating them with the wrong package.  (Bug#1101.)
+
+  * dpkg won't `disappear' packages containing no files or directories,
+    nor a package required for depends/recommended.  (Bug#1128.)
+
+  * dpkg follows directory symlinks.  (Bug#1125.)
+
+  * dselect fixups for ELF/GCC2.7.0 compilation.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Fri, 21 Jul 1995 21:43:41 +0100
+
+dpkg (0.93.61) ALPHA; priority=LOW
+
+  * dselect keybindings and status characters and descriptions changed
+    (in pursuance of Bug#1037, user interface problems, still open.)
+
+  * Some cleanups to fix mistakes discovered by ELF-GCC 2.7.0, and fixup
+    for newer C++ draft standard (`for' variable declaration scope change).
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Tue, 18 Jul 1995 01:42:51 +0100
+
+dpkg (0.93.60) ALPHA; priority=HIGH
+
+  * dpkg doesn't think packages have `disappeared' if you install
+    several packages at once.  (later reported as Bug#1132.)
+
+  * usage error messages tidied up.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Sun, 16 Jul 1995 17:56:56 +0100
+
+dpkg (0.93.59) ALPHA; priority=HIGH
+
+  * dpkg doesn't break maintainer scripts &c if package `foo' exists
+    when processing package `foobar'.  (Related to Bug#1101.)
+
+  * dpkg implements `disappear' functionality.
+  * dpkg/dselect remove dead entries from /var/lib/dpkg/status.
+
+  * dpkg --list now sorted correctly and output somewhat improved.
+  * some debugging messages moved from dbg_stupidlyverbose to dbg_scripts.
+  * dpkg prints `Removing foo' message even if foo is not configured.
+  * dpkg only prints `serious warning: files list file ... missing'
+    once for each package.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Sun, 16 Jul 1995 02:32:11 +0100
+
+dpkg (0.93.58) ALPHA; priority=HIGH
+
+  * dpkg should write out status even for packages which it has only
+    encountered in the `available' file so far.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Fri, 14 Jul 1995 20:19:21 +0100
+
+dpkg (0.93.57) ALPHA; priority=LOW
+
+  * dpkg does chroot when running maintainer scripts (--instdir
+    should work right now, though I haven't been able to test it).
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Fri, 14 Jul 1995 01:32:30 +0100
+
+dpkg (0.93.56) ALPHA; priority=HIGH
+
+  * dpkg can now overwrite symlinks to directories, and will
+    do correct handling of symlinks to plain files.
+  * dpkg should not replace any directory with a symlink.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Thu, 13 Jul 1995 02:43:36 +0100
+
+dpkg (0.93.55) ALPHA; priority=MEDIUM
+
+  * dpkg can now extract hardlinks.
+  * dpkg configuration/removal works in the presence of dependency cycles.
+  * dpkg should no longer fail an assertion at processarc.c:193.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Wed, 12 Jul 1995 01:34:44 +0100
+
+dpkg (0.93.54) ALPHA; priority=MEDIUM
+
+  * dpkg and dselect no longer throw away all Class and Section
+    information in /var/lib/dpkg/available.  (Oops.)
+  * dpkg --refuse-<something> now works (this broke some dselect
+    method scripts' attempts to use --refuse-downgrade).
+  * dpkg --audit and --list implemented.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Mon, 10 Jul 1995 00:35:13 +0100
+
+dpkg (0.93.53) ALPHA; priority=LOW
+
+  * dpkg --install/--unpack only skips on-hold packages with --auto.
+  * dpkg doesn't fclose() the --fsys-tarfile pipe twice.
+  * dpkg error handling and reporting cleaned up.
+  * dpkg now lists any failed packages/files just before exiting.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Sun, 9 Jul 1995 16:31:36 +0100
+
+dpkg (0.93.52) ALPHA; priority=MEDIUM
+
+  * dpkg won't segfault due to missing (Package_)Revision fields.
+  * dpkg --search works.
+  * dpkg will set execute permissions on scripts if necessary.
+  * dpkg prints filenames in --unpack and --install.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Sat, 8 Jul 1995 12:41:39 +0100
+
+dpkg (0.93.51) ALPHA; priority=HIGH
+
+  * dpkg --status and --listfiles now work.
+
+  * dpkg --remove --auto won't try to remove everything (!)
+  * dpkg --unpack doesn't coredump after unpacking the first package.
+  * dpkg won't fail an assertion if it bombs out of --configure
+    or --remove because of too many errors.
+
+  * Support for `Essential' in dpkg (not yet in dselect).
+  * `available' (Packages) file class and section override those
+    from package control files.
+  * `Essential: yes' added to control file.
+
+  * Locking strategy changed, now uses flock (no more stale locks).
+  * preinst now more helpful about conffiles upgrade problem.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Sat, 8 Jul 1995 01:15:26 +0100
+
+dpkg (1.2.11); priority=MEDIUM
   * dselect had dependency bug if installed package newer than avail.
   * Added `replaces' to dselect's list of package relationship strings.
-
  -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Mon, 1 Jul 1996 02:51:11 +0100
 
-dpkg (1.2.10); priority=MEDIUM
+dpkg (0.93.42.3) BETA; priority=LOW
 
-  * Fixed bug in old-style version/revision number parsing.  (Bug#3440.)
+  * Rebuilt using ncurses 1.9.2c-0.
+  * Silenced `subcritical error' message if errno == ENOENT.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Mon, 12 Jun 1995 13:09:24 +0100
+
+dpkg (0.93.42.2) BETA; priority=HIGH
+
+  * install-info --remove properly removes multi-line entries.
+  * Slightly changed ^L redraw code in dselect package list.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Sat, 10 Jun 1995 14:06:01 +0100
+
+dpkg (0.93.42.1) BETA; priority=HIGH esp. for new installations
+
+  * update-rc.d default no longer adds K entries in runlevels 2345.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Tue, 6 Jun 1995 18:56:23 +0100
+
+dpkg (0.93.42) BETA; priority=LOW; HIGH for dselect users
+
+  * Fix uninitialized variable reference bug in dselect (#890).
+  * Fix problem with wordwrapping package and method descriptions.
+  * Create /var/lib/dpkg/methods/mnt.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Fri, 19 May 1995 21:03:08 +0100
+
+dpkg (0.93.41) BETA; priority=LOW
+
+  * Create /var/lib/dpkg/methods.
+  * dpkg.pl noisily ignores --skip-same-version rather than barfing.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Tue, 16 May 1995 13:28:27 +0100
+
+dpkg (0.93.40) BETA; priority=LOW
+
+  * dselect's subprogram failure message made to stand out more.
+
+  * When switching out of curses, always move the cursor to the
+    bottom right corner of the screen.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Tue, 16 May 1995 01:03:38 +0100
+
+dpkg (0.93.39) BETA; priority=LOW
+
+  * dselect can now:
+    - allow you to select and configure an installation method;
+    - invoke installation method scripts to update the available file
+      and unpack packages;
+    - invoke dpkg to configure and remove packages.
+    There are no installation methods available yet.
+
+  * Search feature in dselect works (it was purely an ncurses bug).
+
+  * dpkg-*.nondebbin.tar.gz now available (built by debian.rules).
+
+  * The target directory for dpkg-deb --extract (also available as
+    dpkg --extract) is no longer optional.  dpkg-deb suggests the use
+    of dpkg --install if you omit it.
+
+  * Added <errno.h> to lib/lock.c and fixed ref. to `byte' in
+    md5sum/md5.c, for portability to Solaris 2.
+
+  * Rebuilt `configure' and `config.h.in' using autoconf 2.3.
+  * Revised function attribute support checking in configure script.
+  * Removed obsolete `dselect.pl' from scripts directory.
+  * New option --licence on all the C programs.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Sun, 14 May 1995 18:05:38 +0100
+
+dpkg (0.93.38) BETA; priority=MEDIUM
+
+  * Version number comparisons (in dpkg and dselect) now >= <=
+    as documented (Bug#831; thanks to Christian Linhart).
+
+  * dselect now has a non-superuser readonly mode.
+  * dselect doesn't pop up unsatisfied `Optional's when quitting.
+  * `unable to delete saved old file' message fixed dpkg_tmp to dpkg-tmp.
+
+  * Made dpkg convert `revision' to `package_revision' when reading
+    (eg) the `status' file.  libdpkg.a has `revision' as a synonym
+    for `package_revision' and writes the former.
+
+  * Major improvements and many changes to C option parsing, database
+    management, error handling, Makefiles &c to support dpkg.
+  * dpkg-deb should now work if sizeof(void*) < sizeof(void(*)()).
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Mon, 24 Apr 1995 12:34:39 +0100
+
+dpkg (0.93.37) BETA; priority=LOW (MEDIUM for dselect users)
+
+  * Fixed segfault if no description available (Bug#735);
+    thanks to Peter Tobias for the bug report.
+  * Fixed other assorted minor bugs in description displays.
+
+  * Changed dpkg-deb --info short option from -i to -I, to make
+    it unique across dpkg and dpkg-deb (-i still works with
+    dpkg-deb for backwards compatibility).
+
+  * Produce more sensible error when main package list is empty.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Fri, 7 Apr 1995 02:24:55 +0100
+
+dpkg (0.93.36) BETA; priority=LOW (MEDIUM for dselect users)
+
+  * All the C code (including dselect) updated to support `provides'
+    (virtual packages).
+  * Revamped dselect's related package selection/deselection
+    algorithms.
+  * Everything can now handle arbitrary `class' values (as well
+    as the predefined ones which we understand and can interpret).
+  * Fixed bug that prevented display update when moving down a small
+    recursive package list in dselect.
+  * Column heading characters corrected from `SHOC' to `HSOC'.
+
+ -- Ian Jackson <iwj10@cus.cam.ac.uk>  Thu, 6 Apr 1995 12:48:13 +0100
+
+dpkg (0.93.35) BETA; priority=MEDIUM
+
+ * Preserve ownerships and permissions on configuration files.
+ * Fix bug in conffile updating that could leave a hardlink
+   <foo>.dpkg-new to the conffile <foo>.
+
+ * Improved dselect's package list help messages.
+ * Highlight now moves on after (de)selecting just one package.
+ * Better algorithm for scrolling up/down when moving highlight.
+ * Fixed bug in display of `preformatted' extended Description lines.
+   (dselect is still ALPHA, but is fairly stable.)
+
+ * Improved dpkg's message when configuring a package that doesn't
+   exist, and when selecting or skipping a package that isn't
+   currently selected (during unpack processing).
+
+ * Description in control file expanded.
+
+ * Scroll back to top when changing what is in the `info' area.
+
+dpkg (0.93.34) BETA; priority=LOW (HIGH for dselect users)
+
+ * dselect: Fixed bug which caused a coredump if you exited the
+   package list if you'd made any changes.  Ouch !
+
+ * dselect: Improved selection algorithm to show fewer extraneous
+   packages; improved display for unavailable packages.
+
+ * dpkg: Improved progress messages during unpacking somewhat.
+
+dpkg (0.93.33) BETA; priority=LOW (HIGH for dselect users)
+
+ * dselect now has a main menu.
+
+ * Fixed nasty uninitialized data bug in dselect.
+
+ * dselect now locks and unlocks the packages database.
+
+Mon, 27 Mar 1995 03:30:51 BST  Ian Jackson <iwj10@cus.cam.ac.uk>
+
+	* dpkg (0.93.32): Alpha dselect released and installed in
+	                  /usr/sbin/dselect.
+	* dpkg (0.93.32): Many portability enhancements: should now
+	                  compile using GCC 2.6.3, and dpkg-deb should
+	                  compile better on non-Linux systems.
+	* dpkg (0.93.32): dpkg will not loop if its stdin disappears
+	                  and it needs to prompt.
+	* dpkg (0.93.32): Fixed removal dependency error to show
+	                  correct package (Bug #648).
+	* dpkg (0.93.32): Tidied up copyright notices.
+	* dpkg (0.93.32): First draft of update-rc.d manpage, not yet
+	                  installed in /usr/man.
+	* dpkg (0.93.32): Changes to top-level Makefile.in to improve
+	                  error trapping.
+	* dpkg (0.93.32): Improved Makefile `clean' and `distclean'
+	                  targets.
+	* dpkg (0.93.32): Deleted irrelevant `t.c' from lib and
+	                  dselect directories.
+	* dpkg (0.93.32): Added vercmp.c with version comparison code.
+	* dpkg (0.93.32): varbufextend message changed - varbufs not
+	                  just for input buffers.
+	* dpkg (0.93.32): varbuf has C++ member functions in header
+	                  #ifdef __cplusplus.
+
+Changes in dpkg 0.93.31:
+
+* start-stop-daemon --pidfile now works (Bug#571).
+* Fixed dependency processing bugs which could require a rerun of
+  dpkg --configure (Bug#566).
+* Fixed garbage output for `language' of control file in dpkg-deb --info.
+
+Changes in dpkg 0.93.30:
+
+* Added /usr/sbin/start-stop-daemon.
+
+Changes in dpkg 0.93.09:
+
+* Made postinst scripts really be run when dpkg --purge used.
+* Added new --force-extractfail option - VERY DANGEROUS.
+
+Changes in dpkg 0.93.28:
+
+* Removed undef of 0x_p21 in read_database_file, which caused the
+  the whole status database to become trashed when any update files
+  were read.
+* Make infinite-loop prevention and cycle detection work.
+* Made findbreakcycle work (ie, break properly when cycle detected).
+* New script, update-rc.d, to update links /etc/rc?.d/[KS]??*.
+* dpkg.pl now sets the umask to 022.
+* Cosmetic error message fix to dpkg-deb.
+* Deleted OLD directory altogether.
+* Improved error-trapping in top-level Makefile loops.
+
+Changes in dpkg 0.93.27:
+
+* Make version number specifications in Depends &c work.
+* Added AC_PROG_CXX to autoconf.in for dselect.
+* Changed myopt.h not to have cipaction field in cmdinfo (this was
+  specially for dpkg-deb) - now we have a generic void*.
+* Renamed `class' member of `pkginfoperfile' to `clas' [sic].
+* Much work in `dselect' subdirectory.
+* Deleted executables, objects and libraries from OLD tree !
+* Minor changes to various copyright notices and top-of-file comments.
+* Don't install nasty Perl dselectish thing as /usr/bin/dselect.
+
+Changes in dpkg 0.93.26:
+
+* Added --no-also-select instead of not auto-selecting on --unpack
+  but doing so on --install; removed --force-unpack-any.
+
+Changes in dpkg 0.93.25:
+
+* Fixed duplicate output (failure to flush before fork) bug.
+* More clarification of md5sum.c copyright.
+* Corrected typo in ChangeLog in 0.93.24 source package.
+
+Changes in dpkg 0.93.24:
+
+* dpkg could copy conffiles info from one package to another.  Aargh.
+  Bug #426.
+* dpkg failed to initialise status if you tried to remove or
+  configure a nonexistent package.  Bug #419.
+* install-info now handles START-INFO-DIR-ENTRY entries like:
+   * Gdb::                         The GNU debugger.
+  Previously it would only accept (Bug #407):
+   * Gdb: (gdb).                   The GNU debugger.
+* When installing a new foo.info[.gz], install-info now replaces
+   * Foo: (foo.info).              The Gnoo Foo.
+  as well as just * Foo: (foo). ...
+* Moved option parsing out of dpkg-deb into libdpkg.
+* Assorted minor source code rearrangements.
+* Fixed assorted copyright notices, clarified md5sum copyright.
+* Corrected typo in 0.93.23 source package's ChangeLog.
+
+Changes in dpkg 0.93.23:
+
+* `dpkg-deb' --build now does a syntax check on the control file.
+* `dselect' is now no longer called `debian', spurious copy removed
+  from package top-level source directory.
+* C control information parsing complete and somewhat tested.
+* Moved `global' include files into $(srcdir)/include from ../lib,
+  added some files to the lib Makefile, and arranged for pop_cleanup().
+
+Changes in dpkg 0.93.22:
+
+* Fixed bug which caused dpkg to see failures of md5sum where there
+  were none (would also have caused dpkg to miss a real failure).
+* Fixed failure to update some `status' database fields.
+
+Changes in dpkg 0.93.21:
+
+* Fixed error-handling bug which could corrupt database.
+
+Changes in dpkg 0.93.20:
+
+* Fixed bug which ran old (/var/adm/dpkg) postinst scripts.
+* Fixed dpkg usage message which claimed -i => both --install & --info.
+* Use Colin Plumb's MD5 code - faster, and better copyright.
+* Manpages: dpkg-deb(8), deb-control(5), deb(5) - thanks to Raul
+  Deluth Miller.  Also, an xfig picture of some C program innards.
+
+Changes in dpkg 0.93.19:
+
+* Don't delete the `list' file from the dpkg database.
+* Fixed various bugs in the conffile handling.
+* Conffiles that are symlinks will now be treated as if the
+  `dereferenced' name of the file was listed in conffiles.  This means
+  that /etc/foo -> /usr/etc/foo will cause all conffile updates of
+  /etc/foo to create /usr/etc/foo.dpkg-tmp &c instead.  However, the
+  link will be removed if --purge is used to delete all the conffiles.
+* When doing a new installation, or when updating a conffile that
+  wasn't listed as a conffile in the old version of the package, don't
+  do any prompting but just install the version from the archive.
+* Corrected error message if exec of dpkg --vextract failed
+  and --instroot or --root specified.
+* Added new --force-unpack-any option.
+* Extra newline after --status output.
+* Added -W options to CFLAGS.
+* Fixed mistake in previous ChangeLog entry.
+
+Changes in dpkg 0.93.18:
+
+* Fixed invocation of dpkg-deb --vextract if --root or --instdir
+  not specified.
+* Create /var/lib/dpkg/updates.
+
+Changes in dpkg 0.93.17:
+
+* install-info --remove exits with status 0 if it doesn't find the
+  thing to remove, instead of status 1.
+* Error handling functions have __attribute__((format...)) if GCC.
+* push_cleanup its arg takes void **argv instead of char **argv.
+* Top-level Makefile.in has set -e before `for' loops.
+* dpkg-deb --info not-an-existing-file produces fewer error messages.
+
+Changes in dpkg 0.93.16:
+
+* Made --root= option really extract to $instroot instead of `/'.
+* install-info clears the 0444 bits in its umask.
+* Fixed a few database handling bugs which cause dpkg always to fail,
+  and usually to corrupt the status database in various ways.
+* dpkg-deb completely rewritten, now doesn't tinker with
+  /var/{adm,lib}/dpkg.  Should be faster.
+* Directory structure and Makefiles in source package reorganised.
+
+Changes in dpkg 0.93.15:
+
+* Added `debian' (dselect), still very primitive.
+* Database format changed, and moved from /var/adm to /var/lib.
+* Added dpkg --avail mode, --list, --status and --search.
+* Set of dpkg => dpkg-deb pass-through operations changed (but
+  dpkg-deb not yet updated).
+* Added --root, --admindir and --instdir, as well as --isok &c.
+* Moved much stuff into /usr/lib/dpkg-lib.pl, rewritten status
+  database handling.
+* Put packages in `purge' state even if `deinstall' requested if
+  they have no postrm and no conffiles.
+* Version number comparisons fixed.
+* insert-version.pl now installs lib.pl filename too.
+* Strip trailing slashes when reading files from file lists.
+
+Changes in dpkg 0.93.14:
+
+* Fixed parsing of DEPENDS &c fields with trailing whitespace.
+* postinst now fixes up broken ispell.control file.
+* Cyclic dependency/multiple package removal processing: don't consider
+  packages we've just removed when looking for a reason not to go ahead.
+* Added call to postinst with `purge' argument for expunging old
+  configuration etc. that aren't listed in conffiles.
+
+Changes in dpkg 0.93.13:
+
+* sub S_ISREG defined in dpkg.pl.
+* Checking of DEPENDS &c fields was too lax, causing an internal error
+  if you fed it certain kinds of broken control file.
+* Fixed misleading message from bogus installationstatus call.
+* New -u and -U options to dpkg-deb which don't unpack the /DEBIAN
+  directory, and use these in dpkg.pl; clean up /DEBIAN in postinst.
+
+Changes in dpkg 0.93.12:
+
+* No longer needs *.ph files, since these appear to be broken.
+* Postinst fixes up *.control files with curly brackets.
+* embryo of dselect.
+
+Changes in dpkg 0.93.11:
+
+* New --ignore-depends option.
+* This ChangeLog changed format here.
+
+Wed Nov 30 15:38:21 GMT 1994  Ian Jackson  <iwj10@cus.cam.ac.uk>
+
+	* dpkg 0.93.11 released.
+
+	* conffile updating fixed.
+
+	* Message `upgrade' in dpkg changed to `replace'.
+
+	* install-info now copes with multi-line entries.
+
+	* version numbers now done automatically in dpkg and install-info.
+
+	* more debugging around conffiles updates.
+
+	* *.hash files not deleted so soon.
+
+	* adds brand new packages to status array so we can install them.
+
+	* postinst does h2ph for {sys,linux}/{stat,types}.ph if required.
+
+Mon Nov 28 02:00:13 GMT 1994  Ian Jackson  <iwj10@cus.cam.ac.uk>
+
+        * dpkg 0.93.10 released.
+
+        * dpkg.pl completely rewritten.
+
+        * dpkg-deb: removed dabase-processing and --install option.
+
+        * Makefiles reworked, debian.rules added.
+
+        * Don't install anything in /usr/doc/examples.
+
+        * dpkg-*.deb contains /usr/bin/dpkg-deb.dist, fixed up by postinst.
+
+Thu Oct 20 13:22:20 1994  Ian Murdock  (imurdock@debra.debian.org)
+
+        * dpkg 0.93.9 released.
+
+        * dpkg.pl: Use $argument, not $package, with `--build'.
+        Make sure that saved postinst scripts are executable.
+
+Tue Oct 18 09:40:57 1994  Ian Murdock  (imurdock@debra.debian.org)
+
+        * dpkg 0.93.8 released.
+
+        * deb/remove.c (pkg_remove): Do not report an error from rmdir ()
+        when `errno' is ENOTEMPTY (Directory not empty), because in this
+        case we have found the highest-level directory in the package and
+        are ready to exit the loop (i.e., it is a normal occurrence).
+
+Mon Oct 17 10:44:32 1994  Ian Murdock  (imurdock@debra.debian.org)
+
+        * Makefile.in: Adapted all Makefiles to the GNU Coding Standards.
+
+        * deb/remove.c (pkg_remove): Make sure that parent directories are
+        removed LAST!  This will result in complete removal of packages
+        when --remove is called.  dpkg 0.93.7 (and earlier) had problems
+        with this because it tried to remove directories in order, which
+        will work most of the time, but not necessarily all of the time.
+
+        * deb/list.c (pkg_list): Output is sorted by package name.
+
+Tue Oct  4 12:27:10 1994  Ian Murdock  (imurdock@debra.debian.org)
+
+        * deb/contents.c (pkg_contents): When a list file cannot be
+        opened, silently fail and let the front-end explain the problem.
+
+        * deb/util.c (return_info): When a control file cannot be opened,
+        silently fail and let the front-end explain the problem.
+
+        * deb/search.c (pkg_search): Exit 0 if the regular expression is
+        matched and 1 if it is not.
+
+Mon Oct  3 18:38:53 1994  Ian Murdock  (imurdock@debra.debian.org)
+
+        * dpkg.pl: New file.  Replaces dpkg.sh.
+
+        * deb/Makefile.in: Renamed `dpkg-util.deb' to `dpkg-deb'.
+
+        * deb/build.c (pkg_build): `--build' is less verbose, instead
+        letting the front-end add verbosity where appropriate.
+
+        * deb/install.c (pkg_install): Ditto.
+
+        * deb/remove.c (pkg_remove): Ditto.
+
+        * deb/search.c (pkg_search): Ditto.
+
+        * deb/describe.c (pkg_describe): `--describe' is less verbose,
+        instead letting the front-end add verbosity where appropriate.
+        The ``Description:'' label has been removed.
+
+        * deb/version.c (pkg_version): `--version' is less verbose,
+        instead letting the front-end add verbosity where appropriate.
+        The ``Version:'' label has been removed, as has the maintainer
+        information.
+
+Mon Sep 12 14:22:04 1994  Ian Murdock  (imurdock@debra.debian.org)
+
+        * deb/version.c (pkg_version): `--version' now reports the
+        version number of dpkg if no argument is specified.
+
+Thu Sep  1 13:31:37 1994  Ian Murdock  (imurdock@debra.debian.org)
+
+        * dpkg 0.93.7 released.
+
+        * deb/build.c (pkg_build): check status and exit if non-zero.
+
+        * deb/contents.c (pkg_contents): ditto.
+
+        * deb/install.c (archive_extract): ditto.
+
+Thu Sep  1 13:20:08 1994  Ian Murdock  (imurdock@debra.debian.org)
+
+        * deb/version.c (pkg_version): indent to the same point as
+        pkg_describe.
+
+Thu Sep  1 12:21:11 1994  Ian Murdock  (imurdock@debra.debian.org)
 
+        * Makefile.in (dist): added debian.rules binary, source and
+        dist targets to make final distribution easier to make.
+        (install): install programs to /usr/bin.
+
+        * deb/Makefile.in (install): install programs to /usr/bin.
+
+        * deb/list.c (pkg_list): enforce a maximum limit of ten characters
+        for the package name in the output.
+        (pkg_list): left-justify the version number to make it easier for
+        the front-end to parse the output.
+        (pkg_list): replace first '\n' character in packages[n].description
+        with '\0'.
+
+        * deb/install.c (archive_extract): use the `p' option to `tar' to
+        ensure that permissions are preserved.
+
+Sat Aug 27 09:53:37 1994  Ian Murdock  (imurdock@debra.debian.org)
+
+        * dpkg 0.93.6 released.
+
+        * deb/util.c (return_info): only unlink CONTROL if ARCHIVE_FLAG is
+        true!
+
+Fri Aug 26 15:38:22 1994  Ian Murdock  (imurdock@debra.debian.org)
+
+        * dpkg 0.93.5 released.
+
+        * deb/contents.c (pkg_contents): merged function archive_contents
+        into function pkg_contents.
+
+        * deb/contents.c (pkg_contents): use lstat (rather than stat) so
+        that symbolic links are recognized.
+        (pkg_contents): print the usual `<path> -> <link_to>' now that we
+        recognize symbolic links.
+
+        * deb/util.c (return_info): create a FIFO to pipe the needed
+        information to the ``formatter'' rather than creating a directory
+        in /tmp for the package information, which is what we used to do.
+
+Thu Aug 25 11:46:27 1994  Ian Murdock  (imurdock@debra.debian.org)
+
+        * lib/fake-ls.c (mk_date_string): return a pointer to malloc'ed
+        area.
+        (mk_mode_string): ditto.
+
+        * dpkg.sh: make sure the control information is extracted to a
+        uniquely-named temporary directory during package installation.
+
+        * dpkg.sh: execute the pre- and post-removal scripts during
+        package removal.
+
+        * dpkg.sh: exit immediately if dpkg-util.deb reports failure.
+
+        * deb/install.c (pkg_control): make sure that `package' exists and
+        is a Debian archive before doing anything.
+
+        * deb/install.c (pkg_extract): make sure that `package' exists and
+        is a Debian archive before doing anything.
+
+        * deb/install.c (pkg_install): unlink `extract_output' when done.
+
+        * deb/remove.c (pkg_remove): use lstat (rather than stat) so that
+        --remove does not get confused and think that a symbolic link to a
+        directory is actually a directory, which results in the symbolic
+        link never being removed at all.
+
+ChangeLog begins Thu Aug 25 11:46:27 1994 for dpkg 0.93.5.
+
+dpkg (1.2.10); priority=MEDIUM
+  * Fixed bug in old-style version/revision number parsing.  (Bug#3440.)
  -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Sat, 29 Jun 1996 03:32:45 +0100
 
 dpkg (1.2.9); priority=MEDIUM
-
   * Fixed status database updates reading bug.
   * `Setting up' message includes version number.
   * `existence check' message changed to say `cannot access archive'.
-
  -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Thu, 27 Jun 1996 13:39:36 +0100
 
 dpkg (1.2.8); priority=LOW
-
   * dpkg --record-avail puts data in Size field.
   * strip / for rmdir(2) in cleanup to work around kernel bug.  (Bug#3275.)
   * dpkg-split --msdos no longer allows `-' and other chars in filenames.
-
   * manual dpkg-split(8) written.
   * dpkg-split minor typo in --auto usage error message fixed.
   * dpkg-deb(8) very minor cosmetic fix to --build option.
-
  -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Tue, 25 Jun 1996 03:00:14 +0100
 
 dpkg (1.2.7); priority=LOW
-
   * dpkg-scanpackages syntax errors fixed.
-
  -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Fri, 21 Jun 1996 04:10:38 +0100
 
 dpkg (1.2.6); priority=MEDIUM
-
   * NFS, CDROM and partition dselect methods include mountpoint
     in paths given to dpkg in [I]install, so they should now work.
-
   * Removed some leftover files from source tree.
-
  -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Wed, 12 Jun 1996 14:35:19 +0100
 
 dpkg (1.2.5); priority=MEDIUM
-
   * Allow, but do not create, packages in half-installed state
     with no version number.  (Aargh.)
-
  -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Mon, 10 Jun 1996 04:55:43 +0100
 
 dpkg (1.2.4); priority=MEDIUM
-
   * New dpkg-name from Erick (<pkg>_<version>_<arch>.deb convention).
   * Disappeared packages can't own conffiles any more !  (Bug#3214.)
   * install-info creates Miscellaneous sections with a newline
@@ -14104,49 +18377,38 @@ dpkg (1.2.4); priority=MEDIUM
   * Allow superseded Essential packages to be purged after they've
     been removed (clear the Essential flag on removal, and ignore it
     on packages that are in stat_configfiles).
-
   * dselect disk methods understand `y' as well as `yes' for using
     development tree.
   * dselect doesn't make packages appear as `new' again if update
     of available packages fails.
   * dselect places method selection cursor over option last selected.
-
   * dpkg-scanpackages doesn't die when repeated packages are found.
   * dpkg-scanpackages allows many old maintainers (`//'-separated).
-
   * `Version' field is now mandatory (some operations already
     wouldn't work right anyway if it wasn't there).
-
   * update-rc.d(8) now says you must remove the script.  (Bug#3215.)
   * dpkg --force-help says that --force-overwrite is on by default.
   * dpkg-deb manpage rewritten.
   * debian.README (= /usr/doc/copyright/dpkg) edited slightly.
-
   * Some database parsing grunge removed (pdb_preferversion, &c).
   * Source tree doc/sgml contains some embryonic manuals.
   * Leftover files in lib directory in source tree deleted.
-
  -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Mon, 10 Jun 1996 03:52:01 +0100
 
 dpkg (1.2.3); priority=HIGH
-
   * install-info doesn't replicate section headings (Bug#3125, #2973).
   * New dpkg-name manpage broken off from script (oops!).
   * dselect help screens made consistent with new strings, flags, &c.
   * dselect error flag column labelled E (Error), not H (Hold).
   * `Escape' no longer bound to `exit list without saving' in dselect.
-
  -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Tue, 28 May 1996 02:14:57 +0100
 
 dpkg (1.2.2); priority=MEDIUM
-
   * Fixed dselect coredump found by Erick Branderhorst (thanks).
   * Sort obsolete removed packages separately, not under Available.
-
  -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Thu, 23 May 1996 21:31:05 +0100
 
 dpkg (1.2.1); priority=MEDIUM
-
   * `=' key in dselect really does `hold' rather than `unhold'.
   * dselect dependency processing now interacts better with `hold'.
   * dselect `I' key (not `i') modifies display of the info window.
@@ -14154,34 +18416,27 @@ dpkg (1.2.1); priority=MEDIUM
   * dselect main menu headings and many other strings changed to try to
     discourage people from deselecting every package and using [R]emove.
     Notably, `select' changed to `mark' throughout.
-
   * dselect disk methods now print a few fewer double slashes.
   * dselect disk access methods will offer to use dpkg --record-avail
     to scan the available packages, if no Packages file is found.
-
   * New dpkg --compare-versions option, for the benefit of scripts &c.
   * New dpkg --clear-avail option forgets all available packages info.
   * New dpkg --print-avail option, prints `available' data (from Packages, &c).
   * dpkg usage message is more informative, but no longer fits on screen.
   * dpkg --avail option renamed --record-avail.
-
   * Latest dpkg-name from Erick Branderhorst.
   * dpkg-scanpackages has more sensible problem reporting.
   * postinst configure now gets null argument (not <unknown> or <none>)
     when there is no previously configured version.
-
   * Guidelines say that postinst configure is given previous version.
   * Guidelines don't refer to maintainer-script-args.txt in main text.
   * Guidelines (Texinfo source) uploaded separately.
-
   * Own version of strcpy (used for debugging) removed.
   * Interface to access methods document in source (doc/dselect-methods.txt).
   * debian.buildscript moves changes file into parent directory.
-
  -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Wed, 22 May 1996 01:26:31 +0100
 
 dpkg (1.2.0); priority=MEDIUM
-
   * dselect can sort packages by available and installed states, and
     display their version numbers.  (Use O, o and V.)
   * Hold is properly integrated as a real `wanted state', rather than
@@ -14190,7 +18445,6 @@ dpkg (1.2.0); priority=MEDIUM
     <epoch>:<version>-<revision>.  (Epoch not usually displayed.)
   * dselect disk method is architecture-independent (uses dpkg's
     installation architecture, and looks in the right part of the tree).
-
   * dselect disk method doesn't try to satisfy the predependencies of
     packages which are on hold.
   * Fixed conflict-related assertion failure.  (Bug#2784.)
@@ -14198,7 +18452,6 @@ dpkg (1.2.0); priority=MEDIUM
     is in the `configuration only' state.  (Bug#2720.)
   * Fixed messages where available version number was reported as installed
     version in conflict and dependency messages.  (Bug#2654, Bug#2974.)
-
   * New format .deb files are default even for a.out compiles (but
     a.out version of dpkg is in old format).
   * Characters @:= (at colon equals) in package names now strictly
@@ -14206,22 +18459,17 @@ dpkg (1.2.0); priority=MEDIUM
   * New dpkg --print-installation-architecture option prints installation
     architecture (compiled in), rather than build architecture (determined
     from gcc -print-libgcc-file-name).
-
   * Version messages show whether compiled a.out or ELF (i386 only).
   * Fixed missing space in version syntax error messages.
   * Manpage dpkg.8 installed with warning about inaccuracy.
-
   * Guidelines don't say to stop and restart daemons in runlevels 2345;
     instead they say to start in 2345 and stop in 016.
   * Guidelines and version messages say just Debian Linux.
   * Guidelines typo fix for '"stop"'.  (Bug#2867.)
-
   * doc/Makefile.in clean properly deletes various guidelines.info* files.
-
  -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Thu, 16 May 1996 00:01:21 +0100
 
 dpkg (1.1.6); priority=MEDIUM
-
   * Check virtual dependencies when removing (ouch! - thanks SDE.)
   * Fixed bug in internal database validity management that could
     make dselect and dpkg dump core.  (Bug#2613.)
@@ -14229,7 +18477,6 @@ dpkg (1.1.6); priority=MEDIUM
   * Fixed disappearance of overwritten packages.  (Bug#2696.)
   * install-info won't modify dir file before start of menu.
   * install-info will create Miscellaneous heading if no sections yet.
-
   * Only alphanums and +-. allowed in package names - enforced by
     dpkg-deb --build and documented in Guidelines.
   * dselect doesn't display packages unless they are installed, selected
@@ -14237,69 +18484,51 @@ dpkg (1.1.6); priority=MEDIUM
   * dselect doesn't show spurious section and priority headings.
   * dselect has a few extra keybindings (from Lee Olds).
   * --force message changed to `--force enabled' so that default is OK.
-
   * dpkg-name now includes architecture component in .deb filename,
     and translates - in package name to _.
   * .deb file has architecture component in filename.
-
   * Guidelines changed to say Pre-Depends is for experts only.
   * Guidelines say to provide a unidiff (-u) rather than an old context diff.
   * Guidelines say 755 root.root for shared libraries.
-
  -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Wed, 1 May 1996 00:47:22 +0100
 
 dpkg (1.1.5); priority=MEDIUM (HIGH for diversions users)
-
   * Fixed coredump when using diversions.  (Bug#2603.)
   * Fixed typo in dpkg-divert which could lose diversions.  (Bug#2662.)
-
   * --force-overwrite is the default.
   * diversions.text provides better examples.
-
  -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Wed, 10 Apr 1996 13:59:30 +0100
 
 dpkg (1.1.4); priority=MEDIUM
-
   * Allow overwriting of conflicting packages being removed.  (Bug#2614.)
-
   * a.out control file says Pre-Depends: libc4 | libc.  (Bug#2640.)
   * ELF control file and libc dependencies changed to use finalised scheme.
   * ELF control file and libc dependencies for i386 only.  (Bug#2617.)
-
   * Guidelines say use only released libraries and compilers.
   * Install wishlist as /usr/doc/dpkg/WISHLIST.
   * Remove spurious entries for Guidelines in info dir file.
-
   * dpkg-deb --build checks permissions on control (DEBIAN) directory.
-
   * Spaces in control file fields not copied by dpkg-split.  (Bug#2633.)
   * Spaces in split file part control data ignore.  (Bug#2633.)
-
   * Portability fixes, including patch from Richard Kettlewell.
   * Fixed minor configure.in bug causing mangled GCC -W options.
-
  -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Thu, 4 Apr 1996 01:58:40 +0100
 
 dpkg (1.1.3); priority=LOW
-
   * dselect disk methods support Pre-Depends installation ordering.
   * When dpkg fails and --auto-deconfigure would help it says so.
   * dpkg --search output lists several packages with same file on one line.
   * Improved dpkg usage message somewhat.
-
   * dpkg-deb --build checks permissions and types of maintainer scripts.
   * dpkg-deb --build treats misspecified conffiles as error, not warning.
   * dpkg --print-architecture prints compiler's architecture while
     dpkg --version (&c) print system's arch (this to help cross-compiling).
   * More minor guidelines changes, including dir entry fixup.
-
   * configure script caches more values.
   * Changed maintainer email address to ian@chiark.chu.cam.ac.uk.
-
  -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Sat, 16 Mar 1996 19:18:08 +0000
 
 dpkg (1.1.2); priority=LOW
-
   * Packaging guidelines installed properly (and as guidelines
     rather than debian-guidelines).
   * ELF version has more checks to stop you wrecking your dpkg installation.
@@ -14307,252 +18536,181 @@ dpkg (1.1.2); priority=LOW
     people who want locally-available software of various kinds.
   * dpkg-divert has debugging message removed.
   * Minor guidelines changes.
-
   * Various makefile cleanups, mainly to do with ELF vs. a.out support.
   * debian.rules cleans out ~ files itself, as well as calling make clean.
   * debian.rules names .nondebbin.tar.gz file ELF too, if appropriate.
-
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Thu, 14 Mar 1996 03:38:29 +0000
 
 dpkg (1.1.1elf); priority=LOW
-
   * Added /usr/lib/dpkg/elf-executables-ok and elf-in-kernel.
   * Replaces field now allows automatic removal of conflicting packages.
   * Replaces field now required to overwrite other packages' files.
   * Architecture field, and dpkg --print-architecture, supported.
   * build new format archives by default when compiled with ELF compiler.
-
   * symlinks are now installed atomically (good for shared libraries).
   * create /var/lib/dpkg/diversions in postinst if necessary (Bug#2465.)
   * Pre-Depends now correctly fails if package never configured.
   * dselect disk methods mount with -o nosuid,nodev.
   * update-rc.d defaults doesn't add both K and S in any one runlevel;
     dpkg postinst fixes up this situation if it sees it.
-
   * Assorted fixups to the Guidelines, which are now in one piece.
   * dpkg --list prints version string in one piece.
   * dpkg-scanpackages doesn't produce notice on output with list of
     packages with Section and/or Priority control file fields.
-
   * control file and debian.rules work both for ELF and non-ELF compiles.
   * most files compiled with -O2 (-O3 only for some critical files) -
     this fixes ELF build.
-
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Mon, 11 Mar 1996 04:25:28 +0000
 
 dpkg (1.1.0); priority=LOW
-
   * dpkg supports Pre-Depends.
   * postinst script gets most-recently-configured version as $2.
-
   * lib/tarfn.c #includes <errno.h> (portability fix).
-
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Sun, 11 Feb 1996 21:07:03 +0000
 
 dpkg (1.0.17); priority=LOW
-
   * dpkg --recursive follows symlinks (useful for devel tree).
-
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Sat, 10 Feb 1996 15:58:46 +0000
 
 dpkg (1.0.16); priority=LOW
-
   * dpkg-deb much faster reading new format archives.  (Bug#2256.)
   * Developers' documentation in /usr/doc/dpkg/, /usr/info/.
-
   * Fixed typo in control file Description.
-
   * configure script tries to improve matters wrt sysinfo.
   * any debian-tmp.deb is deleted by `./debian.rules clean'.
-
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Sun, 4 Feb 1996 15:51:59 +0000
 
 dpkg (1.0.15); priority=LOW
-
   * dselect disk methods should never unmount things they didn't mount.
   * debian.README aka /usr/doc/copyright updated.
-
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Tue, 30 Jan 1996 15:05:39 +0000
 
 dpkg (1.0.14); priority=MEDIUM
-
   * fixed file descriptor leak in dpkg introduced in 1.0.11.
   * included dpkg-name in this package (conflicts with dpkg-name).
-
   * redraw in dselect main menu changed to use clearok (like in lists).
   * sa_restorer in struct sigaction no longer used (portability fix).
   * removed Guidelines from source package.
-
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Tue, 30 Jan 1996 02:52:29 +0000
 
 dpkg (1.0.13); priority=MEDIUM
-
   * dselect partition and mounted methods work again.
   * dpkg-deb --no-act in usage message.
-
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Fri, 26 Jan 1996 18:37:03 +0000
 
 dpkg (1.0.12); priority=MEDIUM (HIGH for users of 1.0.11)
-
   * Fixed frequent dpkg coredump introduced in 1.0.11.  (Bug#2219.)
   * dpkg-deb ensures version numbers start with alphanumerics.
-
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Wed, 24 Jan 1996 00:42:31 +0000
 
 dpkg (1.0.11); priority=MEDIUM
-
   * corrected potentially serious problem with dpkg low-memory in-core
     files database.
   * dpkg-split --msdos puts output files in right directory.  (Bug#2165.)
-
   * diversions implemented - see `dpkg-divert --help'.
-
   * dselect shows and uses (for dependencies) currently installed
     version of a package if that is more recent.
   * dpkg --force-... options are in separate help screen.
   * better error messages for corrupted .deb archives.  (Bug#2178.)
   * dselect NFS method will unmount correct copy of NFS area if mounted
     twice.
-
   * removes some ELF compilation warnings.
-
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Fri, 19 Jan 1996 02:41:46 +0000
 
 dpkg (1.0.10); priority=MEDIUM
-
   * dpkg-deb option parsing unmuddled (-I option was removed
     in 1.0.9 and broke dpkg-deb).  (Bug#2124.)
-
   * dpkg-split will work when ELF `ar' is installed, and is faster.
-
   * nfs dselect method now available.
   * disk methods don't prompt spuriously for Packages files.
   * cdrom+harddisk methods can find Packages files.
-
   * dpkg-scanpackages (creates Packages files) now in /usr/sbin.
-
   * various changes to help compilation of dpkg-deb, dpkg-split
     and md5sum on non-Debian systems.
   * <sys/fcntl.h> replaced by <fcntl.h> throughout.
-
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Sun, 14 Jan 1996 02:55:19 +0000
 
 dpkg (1.0.9); priority=MEDIUM
-
   * dselect uninitialized variable coredump fixed (thanks Carl).
-
   * version numbers printed by --version fixed.  (Bug#2115.)
   * disk method problem with missing Packages files fixed.  (Bug#2114.)
   * dependency version relationships now <= >= << >> =.  (Bug#2060.)
-
   * install-info is in /usr/sbin, not /usr/bin.  (Bug#1924.)
   * dpkg regards Revision field as obsolete.
-
   * <asm/unistd.h> changed to <linux/unistd.h> (for m68k port).
   * scripts/Makefile.in `clean' target deletes scripts.
-
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Thu, 11 Jan 1996 20:51:20 +0000
 
 dpkg (1.0.8); priority=LOW
-
   * update-alternatives slightly more helpful message.  (Bug#1975.)
   * cosmetic improvements to disk installation method.  (Bug#1970,1956.)
   * mounted filesystem and unmounted partition separate methods.  (Bug#1957.)
-
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Tue, 12 Dec 1995 04:07:47 +0000
 
 dpkg (1.0.7); priority=MEDIUM (HIGH to upgrade syslogd)
-
   * dselect harddisk/CDROM method script handles multiple package
     areas.
   * Everything has a manpage, though many are very unhelpful indeed.
-
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Thu, 30 Nov 1995 03:59:14 +0000
 
 dpkg (1.0.6); priority=MEDIUM (HIGH to upgrade syslogd)
-
   * conffiles can now be taken over properly from one package by
     another which replaces it.  (Bug#1482.)
   * dpkg will not deconfigure essential packages when --auto-deconfigure
     is set (this bug was fairly unlikely ever to be exercised).
-
   * dpkg checks for the presence of certain important programs on the PATH.
   * dselect is now more informative when a dependency is missing, saying
     "<package> does not appear to be available".  (Bug#1642, 1705).
-
   * `make distclean' fixed; config.* &c removed from source archive.
   * lib/lock.c now uses fcntl rather than flock, for better portability.
-
   * `Package_Revision: 0' removed from control file.
   * Some inaccuracies and bad formatting in various messages corrected.
-
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Tue, 21 Nov 1995 20:15:18 +0000
 
 dpkg (1.0.5); priority=LOW
-
   * dpkg-split allows some space for the header.  (Bug#1649.)
   * dpkg-split now has --msdos option for 8.3 filenames.
   * dpkg-split --join &c will not complain about trailing garbage.
-
   * dselect & dpkg will no longer ignore SIGHUP will running subprocesses.
-
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Fri, 13 Oct 1995 13:59:51 +0100
 
 dpkg (1.0.4); priority=MEDIUM (HIGH for dselect users with 1.0.3)
-
   * fixed bug which prevented dselect from displaying the bottom line of
     any listing screen.  This was introduced in 1.0.3, sorry !
-
   * a conffile will never cause a prompt if the package maintainer
     distributes a file identical to the user's, even if the file has
     been edited by both the user and the maintainer or is a
     newly-registered conffile.  (Bug#1639.)
-
   * dselect disk/cdrom method script says where to get Packages file.
   * dselect help has better descriptions of the functions of Return and Q.
-
   * postinst now warns about some problems with /usr/lib/dpkg/methods/hd.
-
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Thu, 12 Oct 1995 01:45:38 +0100
 
 dpkg (1.0.3); priority=MEDIUM
-
   * dselect: fixed segfault when doing some multiple (de)selections.
-
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Tue, 10 Oct 1995 03:21:12 +0100
 
 dpkg (1.0.2); priority=MEDIUM
-
   * problem with screen refresh after `o' (change order) corrected.
-
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Mon, 9 Oct 1995 13:11:04 +0100
 
 dpkg (1.0.1); priority=LOW
-
   * much better dpkg performance on low-memory systems.
   * start-stop-daemon --name should now work. (oops!)
   * fixed typo which could turn into memory overwriting bug sometime.
-
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Sun, 8 Oct 1995 20:12:29 +0100
 
 dpkg (1.0.0); priority=LOW
-
   * Version 1.0.0: dpkg is no longer beta.
-
   * tar extractor no longer looks up an empty string using getgrnam
     (this causes the libc to coredump when using NIS).
-
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Sun, 1 Oct 1995 13:07:36 +0100
 
 dpkg (0.93.80); priority=LOW
-
   * dselect help screen intro changed to remove `much' before `help'.
-
   * update-alternatives.pl contains hardcoded ENOENT value, instead
     of requiring POSIX.pm to be present.
-
   * Makefiles changed to strip when installing instead of when building.
-
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Sat, 30 Sep 1995 01:44:12 +0100
 
 dpkg (0.93.79) BETA; priority=LOW
@@ -14944,17 +19102,13 @@ dpkg (0.93.51) ALPHA; priority=HIGH
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Sat, 8 Jul 1995 01:15:26 +0100
 
 dpkg (0.93.50) ALPHA
-
   * C dpkg now in service.
-
   * dselect now installs in /usr/bin instead of /usr/sbin.
   * Improved `explanation of display' help and changed HSOC to EIOW.
   * dselect goes back to top of info display when you move the
     highlight.
-
   * Added <sys/types.h> to md5sum/md5.c, for the benefit of FreeBSD.
   * --admindir doesn't append `var/lib/dpkg' to its argument.
-
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Fri, 19 May 1995 21:03:08 +0100
 
 dpkg (0.93.42.3) BETA; priority=LOW
diff -pruN 1.21.22/debian/control 1.21.22ubuntu1/debian/control
--- 1.21.22/debian/control	2023-05-10 19:19:02.000000000 +0000
+++ 1.21.22ubuntu1/debian/control	2023-05-17 05:14:10.000000000 +0000
@@ -118,6 +118,7 @@ Depends:
  patch (>= 2.7),
  make,
  binutils,
+ lto-disabled-list,
 Recommends:
  build-essential,
  gcc | c-compiler,
diff -pruN 1.21.22/debian/dpkg.install 1.21.22ubuntu1/debian/dpkg.install
--- 1.21.22/debian/dpkg.install	2023-05-11 01:54:31.000000000 +0000
+++ 1.21.22ubuntu1/debian/dpkg.install	2023-05-17 05:14:10.000000000 +0000
@@ -2,7 +2,6 @@ debian/dpkg.cfg etc/dpkg
 
 etc/dpkg/dpkg.cfg.d
 etc/alternatives
-sbin/dpkg-fsys-usrunmess usr/sbin/
 sbin/start-stop-daemon
 usr/bin/dpkg
 usr/bin/dpkg-deb
diff -pruN 1.21.22/debian/dpkg.manpages 1.21.22ubuntu1/debian/dpkg.manpages
--- 1.21.22/debian/dpkg.manpages	2023-03-27 00:41:09.000000000 +0000
+++ 1.21.22ubuntu1/debian/dpkg.manpages	2023-05-17 05:14:10.000000000 +0000
@@ -1,6 +1,5 @@
 usr/share/man/{*,*/*}/dpkg-deb.1
 usr/share/man/{*,*/*}/dpkg-divert.1
-usr/share/man/{*,*/*}/dpkg-fsys-usrunmess.8
 usr/share/man/{*,*/*}/dpkg-maintscript-helper.1
 usr/share/man/{*,*/*}/dpkg-query.1
 usr/share/man/{*,*/*}/dpkg-realpath.1
diff -pruN 1.21.22/debian/not-installed 1.21.22ubuntu1/debian/not-installed
--- 1.21.22/debian/not-installed	2023-03-27 00:41:09.000000000 +0000
+++ 1.21.22ubuntu1/debian/not-installed	2023-05-17 05:14:10.000000000 +0000
@@ -1 +1,8 @@
 usr/lib/*/*.la
+sbin/dpkg-fsys-usrunmess
+usr/share/man/de/man8/dpkg-fsys-usrunmess.8
+usr/share/man/fr/man8/dpkg-fsys-usrunmess.8
+usr/share/man/man8/dpkg-fsys-usrunmess.8
+usr/share/man/nl/man8/dpkg-fsys-usrunmess.8
+usr/share/man/pt/man8/dpkg-fsys-usrunmess.8
+usr/share/man/sv/man8/dpkg-fsys-usrunmess.8
diff -pruN 1.21.22/debian/rules 1.21.22ubuntu1/debian/rules
--- 1.21.22/debian/rules	2023-05-10 19:19:02.000000000 +0000
+++ 1.21.22ubuntu1/debian/rules	2023-05-17 05:14:10.000000000 +0000
@@ -83,3 +83,10 @@ override_dh_bugfiles:
 
 override_dh_compress:
 	dh_compress -Xspec/
+
+override_dh_builddeb:
+	# Make debootstrap life easier on non-Debian based systems by
+	# compressing dpkg.deb with xz instead of zstd.
+	dh_builddeb -pdpkg -- -Zxz
+	dh_builddeb -a -Ndpkg
+	dh_builddeb
diff -pruN 1.21.22/lib/dpkg/compress.c 1.21.22ubuntu1/lib/dpkg/compress.c
--- 1.21.22/lib/dpkg/compress.c	2023-05-11 01:54:31.000000000 +0000
+++ 1.21.22ubuntu1/lib/dpkg/compress.c	2023-05-17 05:14:10.000000000 +0000
@@ -1287,7 +1287,7 @@ compress_zstd(struct compress_params *pa
 static const struct compressor compressor_zstd = {
 	.name = "zstd",
 	.extension = ".zst",
-	.default_level = ZSTD_CLEVEL_DEFAULT,
+	.default_level = 19,
 	.fixup_params = fixup_none_params,
 	.compress = compress_zstd,
 	.decompress = decompress_zstd,
diff -pruN 1.21.22/lib/dpkg/parse.c 1.21.22ubuntu1/lib/dpkg/parse.c
--- 1.21.22/lib/dpkg/parse.c	2023-05-11 01:54:31.000000000 +0000
+++ 1.21.22ubuntu1/lib/dpkg/parse.c	2023-05-17 05:14:10.000000000 +0000
@@ -319,7 +319,8 @@ parse_count_pkg_instance(struct pkgcount
   if (pkg->status == PKG_STAT_NOTINSTALLED)
      return;
 
-  if (pkgbin->multiarch == PKG_MULTIARCH_SAME)
+  // mvo: consider stat_configfiles multiarch to prevent LP: #1015567
+  if (pkgbin->multiarch == PKG_MULTIARCH_SAME || pkg->status == PKG_STAT_CONFIGFILES)
     count->multi++;
   else
     count->single++;
diff -pruN 1.21.22/lib/dpkg/pkg-spec.c 1.21.22ubuntu1/lib/dpkg/pkg-spec.c
--- 1.21.22/lib/dpkg/pkg-spec.c	2023-03-25 22:41:07.000000000 +0000
+++ 1.21.22ubuntu1/lib/dpkg/pkg-spec.c	2023-05-17 05:14:10.000000000 +0000
@@ -102,10 +102,7 @@ pkg_spec_is_illegal(struct pkg_spec *ps)
 		/* Single instancing only applies with no architecture. */
 		if (ps->arch->type == DPKG_ARCH_NONE &&
 		    pkgset_installed_instances(set) > 1) {
-			snprintf(msg, sizeof(msg),
-			         _("ambiguous package name '%s' with more "
-			           "than one installed instance"), ps->name);
-			return msg;
+			ps->arch = dpkg_arch_get(DPKG_ARCH_NATIVE);
 		}
 	}
 
diff -pruN 1.21.22/m4/dpkg-build.m4 1.21.22ubuntu1/m4/dpkg-build.m4
--- 1.21.22/m4/dpkg-build.m4	2023-05-10 19:19:02.000000000 +0000
+++ 1.21.22ubuntu1/m4/dpkg-build.m4	2023-05-17 05:14:10.000000000 +0000
@@ -77,7 +77,7 @@ AC_DEFUN([DPKG_DEB_COMPRESSOR], [
       [change default dpkg-deb build compressor])],
     [with_dpkg_deb_compressor=$withval], [with_dpkg_deb_compressor=$1])
   AS_CASE([$with_dpkg_deb_compressor],
-    [gzip|xz], [:],
+    [gzip|xz|zstd], [:],
     [AC_MSG_ERROR([unsupported default compressor $with_dpkg_deb_compressor])])
   AC_DEFINE_UNQUOTED([DPKG_DEB_DEFAULT_COMPRESSOR],
     [COMPRESSOR_TYPE_]AS_TR_CPP(${with_dpkg_deb_compressor}),
diff -pruN 1.21.22/man/dpkg-buildflags.pod 1.21.22ubuntu1/man/dpkg-buildflags.pod
--- 1.21.22/man/dpkg-buildflags.pod	2023-05-11 01:54:31.000000000 +0000
+++ 1.21.22ubuntu1/man/dpkg-buildflags.pod	2023-05-17 05:14:10.000000000 +0000
@@ -625,12 +625,13 @@ takes precedence, because it is a supers
 =item B<fixdebugpath>
 
 This setting (enabled by default) adds
-B<-fdebug-prefix-map=>I<BUILDPATH>B<=.>
-to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>,
-B<GCJFLAGS>, B<FFLAGS> and B<FCFLAGS> where B<BUILDPATH> is
-set to the top-level directory of the package being built.
-This has the effect of removing the build path from any generated debug
-symbols.
+B<-fdebug-prefix-map=>I<BUILDPATH>B<=/usr/src/>I<PKGNAME-PKGVER> to
+B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>,
+B<FFLAGS> and B<FCFLAGS> where B<BUILDPATH> is set to the top-level
+directory of the package being built.  This has the effect of removing
+the build path from any generated debug symbols and replacing it with
+I</usr/src/PKGNAME-PKGVER>, where I<PKGNAME> is the source package
+name and I<PKGVER> is the source package version.
 
 =back
 
@@ -693,9 +694,15 @@ B<%PKGCONFDIR%/origins/default>.
 =item B<DEB_BUILD_PATH>
 
 This variable sets the build path (since dpkg 1.18.8) to use in features
-such as B<fixdebugpath> so that they can be controlled by the caller.
+such as B<fixfilepath> so that they can be controlled by the caller.
 This variable is currently Debian and derivatives-specific.
 
+=item B<DEB_BUILD_DEBUGPATH>
+
+This variable sets the debug build path (since dpkg 1.21.9ubuntu2) to
+use in features such as B<fixdebugpath> so that they can be controlled
+by the caller.  This variable is currently Ubuntu-specific.
+
 =item B<DPKG_COLORS>
 
 Sets the color mode (since dpkg 1.18.5).
diff -pruN 1.21.22/man/dpkg-deb.pod 1.21.22ubuntu1/man/dpkg-deb.pod
--- 1.21.22/man/dpkg-deb.pod	2023-05-11 01:54:31.000000000 +0000
+++ 1.21.22ubuntu1/man/dpkg-deb.pod	2023-05-17 05:14:10.000000000 +0000
@@ -254,7 +254,7 @@ The default for this field is “${Packa
 =item B<-z>I<compress-level>
 
 Specify which compression level to use on the compressor backend, when
-building a package (default is 9 for gzip, 6 for xz, 3 for zstd).
+building a package (default is 9 for gzip, 6 for xz, 19 for zstd).
 The accepted values are compressor specific.
 For gzip, from 0-9 with 0 being mapped to compressor none.
 For xz from 0-9.
@@ -274,7 +274,7 @@ gzip (since dpkg 1.17.0) and B<extreme>
 Specify which compression type to use when building a package.
 Allowed values are B<gzip>, B<xz> (since dpkg 1.15.6),
 B<zstd> (since dpkg 1.21.18)
-and B<none> (default is B<xz>).
+and B<none> (default is B<zstd>).
 
 =item B<--[no-]uniform-compression>
 
diff -pruN 1.21.22/scripts/Dpkg/BuildProfiles.pm 1.21.22ubuntu1/scripts/Dpkg/BuildProfiles.pm
--- 1.21.22/scripts/Dpkg/BuildProfiles.pm	2023-05-11 01:54:31.000000000 +0000
+++ 1.21.22ubuntu1/scripts/Dpkg/BuildProfiles.pm	2023-05-17 05:14:10.000000000 +0000
@@ -30,6 +30,7 @@ use Exporter qw(import);
 use List::Util qw(any);
 
 use Dpkg::BuildEnv;
+use Dpkg::Vendor qw(run_vendor_hook);
 
 my $cache_profiles;
 my @build_profiles;
@@ -63,6 +64,7 @@ sub get_build_profiles {
         @build_profiles = split ' ', Dpkg::BuildEnv::get('DEB_BUILD_PROFILES');
     }
     $cache_profiles = 1;
+    run_vendor_hook('update-buildprofiles', \@build_profiles);
 
     return @build_profiles;
 }
@@ -79,7 +81,8 @@ sub set_build_profiles {
 
     $cache_profiles = 1;
     @build_profiles = @profiles;
-    Dpkg::BuildEnv::set('DEB_BUILD_PROFILES', join ' ', @profiles);
+    run_vendor_hook('update-buildprofiles', \@build_profiles);
+    Dpkg::BuildEnv::set('DEB_BUILD_PROFILES', join ' ', @build_profiles);
 }
 
 =item @profiles = parse_build_profiles($string)
diff -pruN 1.21.22/scripts/Dpkg/Shlibs/Objdump.pm 1.21.22ubuntu1/scripts/Dpkg/Shlibs/Objdump.pm
--- 1.21.22/scripts/Dpkg/Shlibs/Objdump.pm	2023-05-11 01:54:31.000000000 +0000
+++ 1.21.22ubuntu1/scripts/Dpkg/Shlibs/Objdump.pm	2023-05-17 05:14:10.000000000 +0000
@@ -24,6 +24,7 @@ our $VERSION = '0.01';
 
 use Dpkg::Gettext;
 use Dpkg::ErrorHandling;
+use Dpkg::IPC;
 
 sub new {
     my $this = shift;
@@ -73,6 +74,53 @@ sub has_object {
     return exists $self->{objects}{$objid};
 }
 
+sub is_armhf {
+    my ($file) = @_;
+    my ($output, %opts, $pid, $res);
+    my $hf = 0;
+    my $sf = 0;
+    $pid = spawn(exec => [ "readelf", "-h", "--", $file ],
+		 env => { "LC_ALL" => "C" },
+		 to_pipe => \$output, %opts);
+    while (<$output>) {
+	chomp;
+	if (/0x500040./) {
+	    $hf = 1;
+	    last;
+	}
+	if (/0x500020./) {
+	    $sf = 1;
+	    last;
+	}
+    }
+    close($output);
+    wait_child($pid, nocheck => 1);
+    if ($?) {
+	subprocerr("readelf");
+    }
+    if(($hf) || ($sf)) {
+	return $hf;
+    }
+    $hf = 0;
+    undef $output;
+    $pid = spawn(exec => [ "readelf", "-A", "--", $file ],
+		 env => { "LC_ALL" => "C" },
+		 to_pipe => \$output, %opts);
+    while (<$output>) {
+	chomp;
+	if (/Tag_ABI_VFP_args: VFP registers/) {
+	    $hf = 1;
+	    last;
+	}
+    }
+    close($output);
+    wait_child($pid, nocheck => 1);
+    if ($?) {
+	subprocerr("readelf");
+    }
+    return $hf;
+}
+
 use constant {
     # ELF Class.
     ELF_BITS_NONE           => 0,
@@ -223,6 +271,14 @@ sub get_format {
     # Mask any processor flags that might not change the architecture ABI.
     $elf{flags} &= $elf_flags_mask{$elf{mach}} // 0;
 
+    if (($elf{mach} == EM_ARM) && ($elf{endian} == ELF_ORDER_2LSB)) {
+        if (is_armhf($file)) {
+            $elf{flags} |= EF_ARM_HARD_FLOAT;
+        } else {
+            $elf{flags} |= EF_ARM_SOFT_FLOAT;
+        }
+    }
+
     # Repack for easy comparison, as a big-endian byte stream, so that
     # unpacking for output gives meaningful results.
     $format{$file} = pack 'C2(SL)>', @elf{qw(bits endian mach flags)};
@@ -384,6 +440,13 @@ sub parse_objdump_output {
 	} elsif ($section eq 'none') {
 	    if (/^\s*.+:\s*file\s+format\s+(\S+)$/) {
 		$self->{format} = $1;
+		if (($self->{format} eq "elf32-littlearm") && $self->{file}) {
+		    if (Dpkg::Shlibs::Objdump::is_armhf($self->{file})) {
+			$self->{format} = "elf32-littlearm-hfabi";
+		    } else {
+			$self->{format} = "elf32-littlearm-sfabi";
+		    }
+		}
 	    } elsif (/^architecture:\s*\S+,\s*flags\s*\S+:$/) {
 		# Parse 2 lines of "-f"
 		# architecture: i386, flags 0x00000112:
diff -pruN 1.21.22/scripts/Dpkg/Source/Package/V3/Native.pm 1.21.22ubuntu1/scripts/Dpkg/Source/Package/V3/Native.pm
--- 1.21.22/scripts/Dpkg/Source/Package/V3/Native.pm	2023-05-11 01:54:31.000000000 +0000
+++ 1.21.22ubuntu1/scripts/Dpkg/Source/Package/V3/Native.pm	2023-05-17 05:14:10.000000000 +0000
@@ -75,7 +75,7 @@ sub can_build {
     my ($self, $dir) = @_;
 
     my $v = Dpkg::Version->new($self->{fields}->{'Version'});
-    return (0, g_('native package version may not have a revision'))
+    warning (g_('native package version may not have a revision'))
         unless $v->is_native();
 
     return 1;
diff -pruN 1.21.22/scripts/Dpkg/Source/Package/V3/Quilt.pm 1.21.22ubuntu1/scripts/Dpkg/Source/Package/V3/Quilt.pm
--- 1.21.22/scripts/Dpkg/Source/Package/V3/Quilt.pm	2023-05-11 01:54:31.000000000 +0000
+++ 1.21.22ubuntu1/scripts/Dpkg/Source/Package/V3/Quilt.pm	2023-05-17 05:14:10.000000000 +0000
@@ -94,7 +94,7 @@ sub can_build {
     return ($code, $msg) if $code == 0;
 
     my $v = Dpkg::Version->new($self->{fields}->{'Version'});
-    return (0, g_('non-native package version does not contain a revision'))
+    warning (g_('non-native package version does not contain a revision'))
         if $v->is_native();
 
     my $quilt = $self->_build_quilt_object($dir);
diff -pruN 1.21.22/scripts/Dpkg/Vendor/Default.pm 1.21.22ubuntu1/scripts/Dpkg/Vendor/Default.pm
--- 1.21.22/scripts/Dpkg/Vendor/Default.pm	2023-05-11 01:54:31.000000000 +0000
+++ 1.21.22ubuntu1/scripts/Dpkg/Vendor/Default.pm	2023-05-17 05:14:10.000000000 +0000
@@ -130,6 +130,12 @@ The hook is called in Dpkg::BuildFlags t
 the default values set for the various build flags. $flags is a
 Dpkg::BuildFlags object.
 
+=item update-buildprofiles ($build_profiles_ref)
+
+The hook is called in Dpkg::BuildProfiles to allow the vendor to
+override the default values set. $build_profiles_ref is a array ref to
+Dpkg::BuildProfiles object.
+
 =item builtin-system-build-paths ()
 
 The hook is called by dpkg-genbuildinfo to determine if the current path
@@ -189,6 +195,8 @@ sub run_hook {
 	my ($textref, $ch_info) = @params;
     } elsif ($hook eq 'update-buildflags') {
 	my $flags = shift @params;
+    } elsif ($hook eq 'update-buildprofiles') {
+	my $build_profiles_ref = shift @params;
     } elsif ($hook eq 'builtin-system-build-paths') {
         return ();
     } elsif ($hook eq 'build-tainted-by') {
diff -pruN 1.21.22/scripts/Dpkg/Vendor/Ubuntu.pm 1.21.22ubuntu1/scripts/Dpkg/Vendor/Ubuntu.pm
--- 1.21.22/scripts/Dpkg/Vendor/Ubuntu.pm	2023-05-11 01:54:31.000000000 +0000
+++ 1.21.22ubuntu1/scripts/Dpkg/Vendor/Ubuntu.pm	2023-05-17 05:14:10.000000000 +0000
@@ -95,6 +95,13 @@ sub run_hook {
         if (scalar(@$bugs)) {
             $fields->{'Launchpad-Bugs-Fixed'} = join(' ', @$bugs);
         }
+    } elsif ($hook eq 'update-buildopts') {
+       my $build_opts = shift @params;
+       require Dpkg::Arch;
+       my $arch = Dpkg::Arch::get_host_arch();
+       if (Dpkg::Arch::debarch_eq($arch, 'riscv64')) {
+           $build_opts->set('nocheck', 1, 'riscv64');
+       }
     } elsif ($hook eq 'update-buildflags') {
 	my $flags = shift @params;
 
@@ -103,11 +110,58 @@ sub run_hook {
 
 	# Per https://wiki.ubuntu.com/DistCompilerFlags
         $flags->prepend('LDFLAGS', '-Wl,-Bsymbolic-functions');
+    } elsif ($hook eq 'update-buildprofiles') {
+        my $build_profiles_ref = shift @params;
+        unless(grep $_ =~ /^!?noudeb$/, @$build_profiles_ref) {
+            unshift(@$build_profiles_ref, 'noudeb');
+        } else {
+            # Strip otherwise invalid profile name
+            @$build_profiles_ref = grep { $_ ne "!noudeb" } @$build_profiles_ref;
+        }
     } else {
         return $self->SUPER::run_hook($hook, @params);
     }
 }
 
+sub _lto_disabled {
+    my $fn = "/usr/share/lto-disabled-list/lto-disabled-list";
+    open(LIST, "<", $fn) or return;
+
+    # get source name
+    -r "debian/control" or return;
+    require Dpkg::Control::Info;
+    my $ctrl = Dpkg::Control::Info->new();
+    my $src_fields = $ctrl->get_source();
+    return unless defined $src_fields;
+
+    my $src = "";
+    foreach (keys %{$src_fields}) {
+        my $v = $src_fields->{$_};
+        if (m/^Source$/i) {
+            $src = $v;
+            last;
+        }
+    }
+    return unless $src ne "";
+
+    my $arch = Dpkg::Arch::get_host_arch();
+
+    # read disabled-list
+    while (<LIST>) {
+        if (m/^$src\s/) {
+            if (m/^$src\s.*(any|$arch)\s/) {
+                close(LIST);
+                return 1;
+            } else {
+                close(LIST);
+                return;
+            }
+        }
+    }
+    close(LIST);
+    return;
+}
+
 # Override Debian default features.
 sub init_build_features {
     my ($self, $use_feature, $builtin_feature) = @_;
@@ -119,6 +173,9 @@ sub init_build_features {
 
     if (any { $_ eq $arch } qw(amd64 arm64 ppc64el s390x)) {
         $use_feature->{optimize}{lto} = 1;
+	if (_lto_disabled()) {
+        	$use_feature->{optimize}{lto} = 0;
+	}
     }
 }
 
@@ -135,6 +192,55 @@ sub set_build_features {
     }
 }
 
+sub _add_build_flags {
+    my ($self, $flags) = @_;
+
+    $self->SUPER::_add_build_flags($flags);
+
+    my @compile_flags = qw(
+        CFLAGS
+        CXXFLAGS
+        OBJCFLAGS
+        OBJCXXFLAGS
+        FFLAGS
+        FCFLAGS
+        GCJFLAGS
+    );
+
+    # We always enable fdebug-prefix-map and (ideally) set the new
+    # path as full (unless ${DEB_BUILD_DEBUGPATH} points to a relative
+    # path), because (a) the DWARF spec forbids relative paths (which
+    # gets mapped to DW_AT_comp_dir), and (b) it makes our debuginfod
+    # service happy when indexing source code.
+    if ($flags->use_feature('reproducible', 'fixfilepath')) {
+        my $build_path = $flags->get_option_value('build-path');
+        my $stripflag = '-fdebug-prefix-map=' . $build_path . '=.';
+
+        if (defined $ENV{DEB_BUILD_DEBUGPATH}) {
+            my $debugprefixmap = '-fdebug-prefix-map=' . $build_path . '=' . $ENV{DEB_BUILD_DEBUGPATH};
+
+            # Strip any existing -fdebug-prefix-map flag.
+            $flags->strip($_, $stripflag) foreach @compile_flags;
+            $flags->append($_, $debugprefixmap) foreach @compile_flags;
+        } elsif (-r 'debian/changelog') {
+            require Dpkg::Changelog::Debian;
+            my $pkgchangelog = Dpkg::Changelog::Debian->new(range => { "count" => 1 });
+            $pkgchangelog->load('debian/changelog');
+            my $chgentry = @{$pkgchangelog}[0];
+            my $pkgver = $chgentry->get_version();
+            my $pkgsrc = $chgentry->get_source();
+
+            if ($pkgver ne "" && $pkgsrc ne "") {
+                my $debugprefixmap = '-fdebug-prefix-map=' . $build_path . '=/usr/src/' . $pkgsrc . '-' . $pkgver;
+
+                # Strip any existing -fdebug-prefix-map flag.
+                $flags->strip($_, $stripflag) foreach @compile_flags;
+                $flags->append($_, $debugprefixmap) foreach @compile_flags;
+            }
+        }
+    }
+}
+
 =head1 PUBLIC FUNCTIONS
 
 =over
diff -pruN 1.21.22/scripts/dpkg-buildpackage.pl 1.21.22ubuntu1/scripts/dpkg-buildpackage.pl
--- 1.21.22/scripts/dpkg-buildpackage.pl	2023-05-11 01:54:31.000000000 +0000
+++ 1.21.22ubuntu1/scripts/dpkg-buildpackage.pl	2023-05-17 05:14:10.000000000 +0000
@@ -222,6 +222,8 @@ unshift @ARGV, @{$conf};
 
 my $build_opts = Dpkg::BuildOptions->new();
 
+run_vendor_hook('update-buildopts', $build_opts);
+
 if ($build_opts->has('nocheck')) {
     $check_command = undef;
 } elsif (not find_command($check_command)) {
@@ -465,6 +467,8 @@ if (defined $parallel) {
     }
     $build_opts->set('parallel', $parallel);
     $build_opts->export();
+} else {
+    $build_opts->export();
 }
 
 if ($build_opts->has('terse')) {
@@ -472,7 +476,7 @@ if ($build_opts->has('terse')) {
     $ENV{MAKEFLAGS} .= ' --no-print-directory';
 }
 
-set_build_profiles(@build_profiles) if @build_profiles;
+set_build_profiles(@build_profiles);
 
 my $changelog = changelog_parse();
 my $ctrl = Dpkg::Control::Info->new();
diff -pruN 1.21.22/scripts/dpkg-gencontrol.pl 1.21.22ubuntu1/scripts/dpkg-gencontrol.pl
--- 1.21.22/scripts/dpkg-gencontrol.pl	2023-05-11 01:54:31.000000000 +0000
+++ 1.21.22ubuntu1/scripts/dpkg-gencontrol.pl	2023-05-17 05:14:10.000000000 +0000
@@ -313,7 +313,8 @@ for my $f (qw(Maintainer Description)) {
         unless defined $fields->{$f};
 }
 
-my $pkg_type = $pkg->{'Package-Type'} ||
+my $pkg_type = $override{'Package-Type'} ||
+               $pkg->{'Package-Type'} ||
                $pkg->get_custom_field('Package-Type') || 'deb';
 
 if ($pkg_type eq 'udeb') {
diff -pruN 1.21.22/scripts/mk/buildflags.mk 1.21.22ubuntu1/scripts/mk/buildflags.mk
--- 1.21.22/scripts/mk/buildflags.mk	2023-03-27 00:41:09.000000000 +0000
+++ 1.21.22ubuntu1/scripts/mk/buildflags.mk	2023-05-17 05:14:10.000000000 +0000
@@ -32,6 +32,7 @@ endef
 $(eval $(call dpkg_buildflags_export_envvar,DEB_BUILD_OPTIONS))
 $(eval $(call dpkg_buildflags_export_envvar,DEB_BUILD_MAINT_OPTIONS))
 $(eval $(call dpkg_buildflags_export_envvar,DEB_BUILD_PATH))
+$(eval $(call dpkg_buildflags_export_envvar,DEB_BUILD_DEBUGPATH))
 $(foreach flag,$(DPKG_BUILDFLAGS_LIST),\
   $(foreach operation,SET STRIP APPEND PREPEND,\
     $(eval $(call dpkg_buildflags_export_envvar,DEB_$(flag)_MAINT_$(operation)))))
diff -pruN 1.21.22/scripts/t/Dpkg_BuildProfiles.t 1.21.22ubuntu1/scripts/t/Dpkg_BuildProfiles.t
--- 1.21.22/scripts/t/Dpkg_BuildProfiles.t	2023-05-11 01:54:31.000000000 +0000
+++ 1.21.22ubuntu1/scripts/t/Dpkg_BuildProfiles.t	2023-05-17 05:14:10.000000000 +0000
@@ -16,7 +16,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 8;
+use Test::More tests => 10;
 
 BEGIN {
     use_ok('Dpkg::BuildProfiles', qw(parse_build_profiles
@@ -26,6 +26,9 @@ BEGIN {
 
 # TODO: Add actual test cases.
 
+# Check stock things
+$ENV{DEB_VENDOR} = 'Debian';
+
 my $formula;
 
 $formula = [ ];
@@ -58,4 +61,16 @@ set_build_profiles(qw(nocheck stage1));
 is_deeply([ get_build_profiles() ], [ qw(nocheck stage1) ],
     'get active build profiles explicitly set');
 
+# Check Ubuntu vendor hook
+$ENV{DEB_VENDOR} = 'Ubuntu';
+
+set_build_profiles(qw(nocheck stage1));
+is_deeply([ get_build_profiles() ], [ qw(noudeb nocheck stage1) ],
+    'get active build profiles explicitly set');
+
+set_build_profiles(qw(!noudeb nocheck stage1));
+is_deeply([ get_build_profiles() ], [ qw(nocheck stage1) ],
+    'get active build profiles explicitly set');
+
+
 1;
diff -pruN 1.21.22/scripts/t/mk.t 1.21.22ubuntu1/scripts/t/mk.t
--- 1.21.22/scripts/t/mk.t	2023-05-11 01:54:31.000000000 +0000
+++ 1.21.22ubuntu1/scripts/t/mk.t	2023-05-17 05:14:10.000000000 +0000
@@ -90,6 +90,8 @@ test_makefile('buildopts.mk');
 delete $ENV{DEB_BUILD_OPTIONS};
 delete $ENV{TEST_DEB_BUILD_OPTION_PARALLEL};
 
+$ENV{DEB_BUILD_PATH} = '/example1';
+$ENV{DEB_BUILD_DEBUGPATH} = '/example1';
 my %buildflag = cmd_get_vars($ENV{PERL}, "$srcdir/dpkg-buildflags.pl");
 
 while (my ($var, $flags) = each %buildflag) {
@@ -97,6 +99,8 @@ while (my ($var, $flags) = each %buildfl
     $ENV{"TEST_$var"} = $flags;
 }
 test_makefile('buildflags.mk');
+delete $ENV{DEB_BUILD_PATH};
+delete $ENV{DEB_BUILD_DEBUGPATH};
 
 my %buildtools = (
     AS => 'as',
diff -pruN 1.21.22/src/main/archives.c 1.21.22ubuntu1/src/main/archives.c
--- 1.21.22/src/main/archives.c	2023-05-11 01:54:31.000000000 +0000
+++ 1.21.22ubuntu1/src/main/archives.c	2023-05-17 05:14:09.000000000 +0000
@@ -764,7 +764,7 @@ tarobject(struct tar_archive *tar, struc
      * However, it's possible that we were in the middle of some other
      * backup/restore operation and were rudely interrupted.
      * So, we see if we have .dpkg-tmp, and if so we restore it. */
-    if (rename(fnametmpvb.buf,fnamevb.buf)) {
+    if (access(fnametmpvb.buf, F_OK) || rename(fnametmpvb.buf,fnamevb.buf)) {
       if (errno != ENOENT && errno != ENOTDIR)
         ohshite(_("unable to clean up mess surrounding '%.255s' before "
                   "installing another version"), ti->name);
diff -pruN 1.21.22/utils/update-alternatives.c 1.21.22ubuntu1/utils/update-alternatives.c
--- 1.21.22/utils/update-alternatives.c	2023-05-11 01:54:31.000000000 +0000
+++ 1.21.22ubuntu1/utils/update-alternatives.c	2023-05-17 05:14:10.000000000 +0000
@@ -2925,7 +2925,8 @@ main(int argc, char **argv)
 	bool modifies_sys = false;
 	int i = 0;
 
-	setlocale(LC_ALL, "");
+	if (getenv("DPKG_UNTRANSLATED_MESSAGES") == NULL)
+		setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
