[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Ubuntu (new upstream) dpkg 1.15.8.4ubuntu2



This e-mail has been sent due to an upload to Ubuntu of a new upstream
version which still contains Ubuntu changes.  It contains the difference
between the Ubuntu version and the equivalent base version in Debian, note
that this difference may include the upstream changes.
Format: 1.8
Date: Mon, 23 Aug 2010 12:07:24 +0100
Source: dpkg
Binary: libdpkg-dev dpkg dpkg-dev libdpkg-perl dselect
Architecture: source
Version: 1.15.8.4ubuntu2
Distribution: maverick
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Changed-By: Colin Watson <cjwatson@ubuntu.com>
Description: 
 dpkg       - Debian package management system
 dpkg-dev   - Debian package development tools
 dselect    - Debian package management front-end
 libdpkg-dev - Debian package management static library
 libdpkg-perl - Dpkg perl modules
Closes: 590885 590896 591182 591312 591522 591588 591653 591654 591692 591885 591993
Launchpad-Bugs-Fixed: 619135
Changes: 
 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).
 .
 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.
 .
 dpkg (1.15.8.4) unstable; urgency=low
 .
   [ Guillem Jover ]
   * Fix use after free segfault on update-alternatives --remove-all.
     Closes: #591653, #591654
   * Always print a massage on warning when parsing control files.
   * On database parsing only warn on bogus versions previously accepted,
     the other instances will keep producing errors, to avoid newly
     introduced bogosity. Closes: #590885, #590896, #591692, #591885
   * Fix compilation on Solaris and Darwin:
     - Link update-alternatives against libintl if libc does not have i18n
       support.
     - Include <limits.h> for _POSIX_MAX_PATH in update-alternatives.
     Thanks to Fabian Groffen <grobian@gentoo.org>.
 .
   [ Raphaël Hertzog ]
   * Fix make -C man install so that it actually finds the manual pages
     to install. Closes: #591588
   * When analyzing the ELF format of a binary in dpkg-shlibdeps, fallback on
     usual objdump when the cross objdump failed. Closes: #591522
 .
   [ Sven Joachim ]
   * Ensure removal of leftover backup .dpkg-tmp files after unpacking
     failures, when the backup is still a hard link to the original file.
     Closes: #591993
 .
 dpkg (1.15.8.3) unstable; urgency=low
 .
   [ Raphaël Hertzog ]
   * Fix dpkg-divert test suite to cope with + and other special characters for
     regexps in the build directory name. Thanks to Jonathan Nieder for the
     patch and to Phil Kern for the report. Closes: #591182
 .
   [ Guillem Jover ]
   * Fix buffer overflow in dpkg_ar_member_put_header causing it to write the
     header to fd 0 (instead of ar_fd) depending on the stack layout, affecting
     armel. Thanks to Phil Kern for the analysis and Reinhard Tartler for the
     initial patch. Closes: #591312
 .
 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
Checksums-Sha1: 
 5e9b8753e2d9985b74ce29546f25ae3f786db084 2011 dpkg_1.15.8.4ubuntu2.dsc
 66a5f5e235cba64458c17003906f10654ae22c30 5058379 dpkg_1.15.8.4ubuntu2.tar.bz2
Checksums-Sha256: 
 b8cceba4d50393f062a4bee29c9f8154020e69036028a7dce7f66f3e56eab951 2011 dpkg_1.15.8.4ubuntu2.dsc
 aae828a06e1a4357f80308c9e3bd5e258b372d170123da88a3f8a13d164cd1ea 5058379 dpkg_1.15.8.4ubuntu2.tar.bz2
Files: 
 261dc14d573db436775e6d0fd5d1ccb6 2011 admin required dpkg_1.15.8.4ubuntu2.dsc
 bd08e1d5e713efd7d9afd0302f1dd1a8 5058379 admin required dpkg_1.15.8.4ubuntu2.tar.bz2
Original-Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>
diff -pruN 1.15.8.4/.dist-version 1.15.8.4ubuntu2/.dist-version
--- 1.15.8.4/.dist-version	2010-08-13 05:30:21.000000000 +0100
+++ 1.15.8.4ubuntu2/.dist-version	2010-08-23 12:08:21.000000000 +0100
@@ -1 +1 @@
-1.15.8.4
+1.15.8.4ubuntu1
diff -pruN 1.15.8.4/configure 1.15.8.4ubuntu2/configure
--- 1.15.8.4/configure	2010-08-13 05:28:37.000000000 +0100
+++ 1.15.8.4ubuntu2/configure	2010-08-23 12:08:21.000000000 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for dpkg 1.15.8.4.
+# Generated by GNU Autoconf 2.67 for dpkg 1.15.8.4ubuntu1.
 #
 # Report bugs to <debian-dpkg@lists.debian.org>.
 #
@@ -552,8 +552,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dpkg'
 PACKAGE_TARNAME='dpkg'
-PACKAGE_VERSION='1.15.8.4'
-PACKAGE_STRING='dpkg 1.15.8.4'
+PACKAGE_VERSION='1.15.8.4ubuntu1'
+PACKAGE_STRING='dpkg 1.15.8.4ubuntu1'
 PACKAGE_BUGREPORT='debian-dpkg@lists.debian.org'
 PACKAGE_URL=''
 
@@ -1364,7 +1364,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dpkg 1.15.8.4 to adapt to many kinds of systems.
+\`configure' configures dpkg 1.15.8.4ubuntu1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1434,7 +1434,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dpkg 1.15.8.4:";;
+     short | recursive ) echo "Configuration of dpkg 1.15.8.4ubuntu1:";;
    esac
   cat <<\_ACEOF
 
@@ -1570,7 +1570,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dpkg configure 1.15.8.4
+dpkg configure 1.15.8.4ubuntu1
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2255,7 +2255,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dpkg $as_me 1.15.8.4, which was
+It was created by dpkg $as_me 1.15.8.4ubuntu1, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -4515,7 +4515,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dpkg'
- VERSION='1.15.8.4'
+ VERSION='1.15.8.4ubuntu1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11173,7 +11173,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dpkg $as_me 1.15.8.4, which was
+This file was extended by dpkg $as_me 1.15.8.4ubuntu1, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11239,7 +11239,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dpkg config.status 1.15.8.4
+dpkg config.status 1.15.8.4ubuntu1
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
diff -pruN 1.15.8.4/cputable 1.15.8.4ubuntu2/cputable
--- 1.15.8.4/cputable	2010-08-11 14:54:09.000000000 +0100
+++ 1.15.8.4ubuntu2/cputable	2010-08-23 12:08:21.000000000 +0100
@@ -16,7 +16,7 @@
 # Column 5 is the endianness (byte ordering in numbers)
 #
 # <Debian name>	<GNU name>	<config.guess regex>	<Bits>	<Endianness>
-i386		i486		(i[3456]86|pentium)	32	little
+i386		i686		(i[3456]86|pentium)	32	little
 ia64		ia64		ia64			64	little
 alpha		alpha		alpha.*			64	little
 amd64		x86_64		x86_64			64	little
diff -pruN 1.15.8.4/debian/changelog 1.15.8.4ubuntu2/debian/changelog
--- 1.15.8.4/debian/changelog	2010-08-13 05:25:22.000000000 +0100
+++ 1.15.8.4ubuntu2/debian/changelog	2010-08-23 12:08:21.000000000 +0100
@@ -1,3 +1,21 @@
+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 ]
@@ -41,6 +59,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
@@ -190,6 +243,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 ]
@@ -608,6 +686,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
@@ -824,6 +984,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
@@ -831,6 +1021,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 ]
@@ -963,6 +1188,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 ]
@@ -970,6 +1224,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 ]
@@ -1046,6 +1329,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 ]
@@ -1484,6 +1799,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 ]
@@ -1513,6 +1888,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 ]
@@ -1559,6 +1984,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 ]
@@ -1648,6 +2127,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 ]
@@ -1712,6 +2276,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 ]
@@ -1794,6 +2413,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 ]
@@ -2020,6 +2686,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
@@ -2169,6 +2935,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 ]
@@ -2316,6 +3150,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 ]
@@ -2625,6 +3520,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 ]
diff -pruN 1.15.8.4/debian/control 1.15.8.4ubuntu2/debian/control
--- 1.15.8.4/debian/control	2010-08-11 15:01:18.000000000 +0100
+++ 1.15.8.4ubuntu2/debian/control	2010-08-23 12:08:21.000000000 +0100
@@ -1,7 +1,8 @@
 Source: dpkg
 Section: admin
 Priority: required
-Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>
 Uploaders: Guillem Jover <guillem@debian.org>, Raphaël Hertzog <hertzog@debian.org>
 Origin: debian
 Bugs: debbugs://bugs.debian.org
@@ -38,7 +39,7 @@ Breaks: dpkg-dev (<< 1.14.16), libdpkg-p
 # see http://wiki.debian.org/Transitions/DpkgToGnuInstallInfo
  jed (<< 1:0.99.18+dfsg.1-13), xjed (<< 1:0.99.18+dfsg.1-13),
  konqueror (<= 4:4.2.96-1), xemacs21-support (<< 21.4.22-2),
- emacs22 (<= 22.3+1-1), emacs22-gtk (<= 22.3+1-1), emacs22-nox (<= 22.3+1-1),
+ emacs22 (<= 22.2-0ubuntu2), emacs22-gtk (<= 22.2-0ubuntu2), emacs22-nox (<= 22.2-0ubuntu2),
  emacs21 (<< 21.4a+1-5.7), emacs21-nox (<< 21.4a+1-5.7),
  tkinfo (<< 2.8-3.1), pinfo (<< 0.6.9-3.1), jed-extra (<= 2.5.3-2)
 Suggests: apt
diff -pruN 1.15.8.4/lib/dpkg/parse.c 1.15.8.4ubuntu2/lib/dpkg/parse.c
--- 1.15.8.4/lib/dpkg/parse.c	2010-08-13 05:25:21.000000000 +0100
+++ 1.15.8.4ubuntu2/lib/dpkg/parse.c	2010-08-23 12:08:21.000000000 +0100
@@ -249,14 +249,19 @@ int parsedb(const char *filename, enum p
       parse_error(&ps, &newpig,
                   _("several package info entries found, only one allowed"));
     parse_must_have_field(&ps, &newpig, newpig.name, "package name");
-    if ((flags & pdb_recordavailable) || newpig.status != stat_notinstalled) {
+    /* XXX: We need to check for status != stat_halfinstalled as while
+     * unpacking a deselected package, it will not have yet all data in
+     * place. But we cannot check for > stat_halfinstalled as stat_configfiles
+     * always should have those fields. */
+    if ((flags & pdb_recordavailable) ||
+        (newpig.status != stat_notinstalled &&
+         newpig.status != stat_halfinstalled)) {
       parse_ensure_have_field(&ps, &newpig,
                               &newpifp->description, "description");
       parse_ensure_have_field(&ps, &newpig,
                               &newpifp->maintainer, "maintainer");
-      if (newpig.status != stat_halfinstalled)
-        parse_must_have_field(&ps, &newpig,
-                              newpifp->version.version, "version");
+      parse_must_have_field(&ps, &newpig,
+                            newpifp->version.version, "version");
     }
     if (flags & pdb_recordavailable)
       parse_ensure_have_field(&ps, &newpig,
diff -pruN 1.15.8.4/man/dpkg-buildflags.1 1.15.8.4ubuntu2/man/dpkg-buildflags.1
--- 1.15.8.4/man/dpkg-buildflags.1	2010-08-11 15:01:18.000000000 +0100
+++ 1.15.8.4ubuntu2/man/dpkg-buildflags.1	2010-08-23 12:08:21.000000000 +0100
@@ -116,6 +116,35 @@ This variable can be used to force the v
 .BI DEB_ flag _APPEND
 This variable can be used to append supplementary options to the value
 returned for the given \fIflag\fP.
+.TP
+.B DEB_BUILD_OPTIONS
+When used with the
+.B hardening\-wrapper
+package, the values
+.B hardening
+and
+.B nohardening
+will be converted into their respective DEB_BUILD_HARDENING values.
+The
+.BR hardening
+option can also include (optionally prefixed with
+.BR no
+) the following sub-options:
+.BR stackprotector
+.BR format
+.BR fortify
+.BR pie
+.BR relro
+For example,
+.BR DEB_BUILD_OPTIONS=hardening=nopie
+would cause
+.BR DEB_BUILD_HARDENING_PIE=0
+to be set, or
+.BR DEB_BUILD_OPTIONS=nohardening
+would cause
+.BR DEB_BUILD_HARDENING=0
+to be set.
+See http://wiki.debian.org/Hardening for further details.
 .
 .SH AUTHOR
 Copyright \(co 2010 Rapha\[:e]l Hertzog

Reply to: