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

Ubuntu (new upstream) dpkg 1.14.19ubuntu1



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.7
Date: Tue, 27 May 2008 13:15:16 +0100
Source: dpkg
Binary: dpkg dselect dpkg-dev
Architecture: source
Version: 1.14.19ubuntu1
Distribution: intrepid
Urgency: low
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Changed-By: Colin Watson <cjwatson@ubuntu.com>
Description: 
 dpkg       - package maintenance system for Debian
 dpkg-dev   - package building tools for Debian
 dselect    - user tool to manage Debian packages
Closes: 4588 4628 4655 12564 17243 68981 114774 142042 151540 203792 215374 217622 220758 246918 248693 255882 308285 311843 323909 355654 363018 366555 379028 435126 439979 443338 445552 448946 452273 453267 462225 462403 462413 463048 463398 465282 465420 465651 466135 466321 466957 467470 468916 469520 469838 471342 472332 473041 473449 473498 473523 473726 474079 474339 474417 475668 476113 477784 478802 478827 478897 478925 479007 479142 479205 479850 480579
Changes: 
 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.)
 .
 dpkg (1.14.19) unstable; urgency=low
 .
   [ Guillem Jover ]
   * Fix a double-free by setting scontext to NULL after calling freecon.
     Based on a patch by Russell Coker. Closes: #474339
   * Add missing import of internerr in Dpkg::Source::Patch.pm.
     Thanks to Marco d'Itri. Closes: #479205
   * Consider also custom Package-Type fields when printing warnings in
     dpkg-gencontrol. Closes: #452273
 .
   [ Raphael Hertzog ]
   * Add missing import of subprocerr in Dpkg::Source::Package. Thanks to Sven
     Joachim for the patch.
   * Handle symlinks better when deciding if dpkg-source has to copy the
     original tarball in the current extraction directory. Closes: #475668
   * Fix the dpkg-source error message about unrepresentable changes to
     source because the type of a file changed (new and old were inverted).
   * Fix dpkg-genchanges to detect udeb based on Package-Type control
     header instead of file extension analysis on uploaded files.
     Closes: #476113
   * Fix dpkg-source to grant correct permissions to tarballs of native
     source packages. Closes: #477784
   * Add Conflicts: devscripts (<< 2.10.26) to ensure that people are
     using versions of debsign/mergechanges that support the Checksums fields
     in *.dsc and *.changes.
   * Cleanup the various Conflicts/Replaces fields to remove references
     to package that have disappeared before sarge (this includes dpkg-doc-ja,
     dpkgname, and dpkg-static which has never officially been built).
     dpkg-iasearch has been kept as popcon still reports a few installations.
   * Collapsed multiple conflicts of dpkg with old versions of dpkg-dev
     in a single Conflicts: dpkg-dev (<< 1.14.16).
   * The "3.0 (quilt)" source package format now parses correctly series files
     with patch options and warn if something else than -p1 is used.
   * Change the way dpkg-source finds the perl object to use to unpack/build
     a source package to ignore the minor part of the Format: version.
     For example "1.0" and "1.1" would both map to Dpkg::Source::Package::V1
     instead of ::V1_0 and ::V1_1 before. Similarly "3.0 (quilt)" now maps to
     ::V3::quilt instead of ::V3_0::quilt.
   * Fix changelog parser to not fail when an unexpected changelog entry
     appears without the preceding heading line. Closes: #478925
   * Change the "2.0" and "3.0 (quilt)" source packages to refuse by default
     binary files in the debian sub-directory. They have to be whitelisted
     through debian/source/include-binaries. Closes: #473041
   * Make sure triggers are activated when a file is removed in a directory
     shared by multiple packages. Closes: #479850
 .
   [ Helge Kreutzmann ]
   * Minor fixes and clarifications to man pages.
 .
   [ Updated dpkg translations ]
   * Brazilian Portuguese (Felipe Augusto van de Wiel). Closes: #480579
   * Czech (Miroslav Kure).
   * French (Florent Ussel).
   * Galician (Jacobo Tarrio).
   * German (Sven Joachim).
   * Polish (Wiktor Wandachowicz).
   * Portuguese (Miguel Figueiredo).
   * Russian (Yuri Kozlov). Closes: #478827
   * Slovak (Ivan Masár). Closes: #478897
   * Swedish (Peter Karlsson).
 .
   [ Updated manpages translations ]
   * German (Helge Kreutzmann).
   * Polish (Wiktor Wandachowicz).
   * Swedish (Peter Karlsson).
 .
   [ Updated scripts translations ]
   * German (Helge Kreutzmann).
   * Polish (Wiktor Wandachowicz).
   * Russian (Yuri Kozlov). Closes: #479142
   * Swedish (Peter Karlsson).
 .
   [ Updated dselect translations ]
   * Brazilian Portuguese (Felipe Augusto van de Wiel).
   * Czech (Miroslav Kure).
   * French (Christian Perrier).
   * German (Sven Joachim).
   * Russian (Yuri Kozlov). Closes: #478802
   * Slovak (Ivan Masár). Closes: #479007
 .
 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.)
 .
 dpkg (1.14.18) unstable; urgency=low
 .
   [ Guillem Jover ]
   * Bump po4a version in Build-Depends to 0.33.1-1, as usage of UTF-8
     in original man pages was causing build failures. Closes: #473498
   * Add triggers documentation to dpkg-dev. Closes: #473449
   * Add deb-triggers.5 and dpkg-trigger.1 man pages, and document new
     statuses and options in dpkg.1.
 .
   [ Raphael Hertzog ]
   * When dpkg-source builds a source package of Format: 2.0 or 3.0 (quilt) it
     applies the patches before the build if
     debian/patches/.dpkg-source-applied doesn't exist. This file is created
     during extraction if patches are applied, and is auto-excluded from the
     debian tarball. This enables on-the-fly conversion of source packages from
     Format: 1.0 to Format: 3.0 (quilt) without manual intervention of the
     user. This feature can be disabled with the option --no-preparation.
   * The dpkg-source option --skip-patches disables application of patches
     during extraction of source packages using Format: 2.0 or Format: 3.0
     (quilt).
   * Ensure the Files field is last in *.dsc and *.changes. This is a
     work-around for some braindead dsc parsers (dupload and sbuild for
     instance, see #473518 and #470440).
   * Initialize dependencies for libraries having symbols files with the
     smallest minimal version listed in the symbols file instead of using
     an unversioned dependency. It's the only way to ensure the library
     presence if it wasn't available in all versions of the package that ever
     existed. Closes: #474079
   * Don't use the -p option of diff for Format: 1.0 source packages.
     dpkg-source of sarge doesn't accept data after @@. Closes: #474417
 .
   [ Updated dselect translations ]
   * German. (Sven Joachim).
   * Swedish (Peter Karlsson).
 .
   [ Updated dpkg translations ]
   * Portuguese (Miguel Figueiredo).
   * Simplified Chinese (Deng Xiyue). Closes: #473523
   * Swedish (Peter Karlsson).
   * Vietnamese (Clytie Siddall). Closes: #473726
 .
   [ Updated manpages translations ]
   * German (Helge Kreutzmann).
   * Swedish (Peter Karlsson).
 .
   [ Updated scripts translations ]
   * German (Helge Kreutzmann).
   * Swedish (Peter Karlsson).
 .
 dpkg (1.14.17) experimental; urgency=low
 .
   [ Guillem Jover ]
   * Replace strdup plus error checking usage with a new m_strdup function.
     Closes: #379028
   * Add new keybinding in dselect to restore all selections back to
     whatever's currently installed. Closes: #151540
     Thanks to Colin Watson.
   * Use system timersub and fix timeval normalization in multiplication in
     start-stop-daemon. Thanks to Andreas PÃ¥hlsson. Closes: #462225
   * Cosmetic fixes to start-stop-daemon output and man page. Document that
     --chuid will change the group even if it has not been specified. Add
     EXIT STATUS and EXAMPLE sections to man page. Thanks to Justin Pryzby.
   * Add Raphael Hertzog to Uploaders, and remove Brendan O'Dea and
     Christian Perrier with their permission.
   * Use functions from libcompat when those are not provided by the system.
     - Add strnlen to libcompat.
     - Link programs against libcompat which provides obstack. Closes: #142042
   * Change dpkg-gencontrol to not output the Homapage field on udeb.
   * Reintroduce 'no-debsig' back in dpkg.cfg to avoid failing to install any
     package when debsig-verify is installed. Closes: #311843
   * Fix some small memory leaks. Closes: #469520
     Thanks to Sean Finney.
   * Correct broken dselect logic for self-conflicting packages.
     Thanks to Ian Jackson.
   * Implement 'Breaks' properly in dselect. Closes: #448946
     Thanks to Ian Jackson.
   * Fix erroneous description of Breaks in dselect output.
     Thanks to Ian Jackson.
   * Allow compilation with --disable-nls on systems without libintl.h where
     a non glibc claims to be glibc. Closes: #465420
   * Fix crash when a .deb file becomes unreadable while dpkg is starting.
     Thanks to Ian Jackson. Closes: #255882
   * Few file descriptor cleanup and error handling fixes.
     Thanks to Ian Jackson. Closes: #443338
   * Move test suite invokation to a new check target in debian/rules.
   * Add support for nocheck DEB_BUILD_OPTIONS in debian/rules, so that the
     dpkg test suite can be skept if desired.
   * Improve log and status-fd output by printing more status change updates
     and actions. Thanks to Ian Jackson.
   * Implement triggers support. Thanks to Ian Jackson.
     Closes: #17243, #68981, #215374, #217622, #248693, #308285
 .
   [ Raphael Hertzog ]
   * Add a warning displayed by dpkg-genchanges if the current version is
     smaller than the previous one. Closes: #4655
   * Add -d and -c options in dpkg-checkbuilddeps to override
     build-depends/conflicts. Closes: #114774
   * Include list of libraries in dpkg-gensymbols' warning about new/lost
     libraries.
   * Add -R option to dpkg-buildpackage so that one can replace the usual
     "debian/rules" by something else. Closes: #355654
   * Always list all binary packages in the Description: field of .changes
     files. It's nice for reviewers and mentors.debian.net was using this field
     on source only uploads to display short description of what the package is
     about.
   * Handle the case when the library has a different SONAME than the one used
     to find it. Closes: #462413
   * Fix Dpkg::Version and Dpkg::Fields::Object to import _g() from
     Dpkg::Gettext. Thanks to Adam Heath and Olivier Berger for spotting
     this. Closes: #465651
   * Change PATH during make check to look into build directories containing
     dpkg and the related scripts. Thanks to Mike Frysinger. Closes: #466957
   * Some lintian cleanup:
     - add overrides for some useless I: tags
     - drop unused overrides
     - updated several manual pages to fix hyphen-used-as-minus-sign
     - fixed manpage-has-errors-from-man in several manual pages
     - removed empty debian/dpkg.prerm
   * Removed old upgrade code from dpkg's preinst and postinst which only
     concerns upgrading from dpkg version older than the one in oldstable
     already. And thus we get rid of old the last usage of read in those
     scripts (fixes lintian's warning read-in-maintainer-script).
   * Removed sorting of dependencies in dpkg-gencontrol and dpkg-source. But
     kept it for all other fields (Enhances, Conflicts, Replaces, Breaks,
     Build-Conflicts and Build-Conflicts-Indep).
   * Instead changed dpkg-shlibdeps to sort the dependencies generated in
     ${shlibs:*} variables.
   * Changed the logic of simplification of dependencies: if any dependency
     must be discarded due to another dependency appearing further
     in the field, the superseding dependency will take the place of the
     discarded one. Added a test case for this.
   * dpkg-shlibdeps properly accounts usage of symbols provided by private
     libraries without SONAME. Closes: #469838
   * Add a new warning to dpkg-shlibdeps when a library NEEDED is in fact
     not used by any of the binaries analyzed. Closes: #472332
   * Add a new --warnings=<value> option to select the set of warnings to
     activate. By default, do not activate the warning about useless
     libraries at the binary level (instead the new warning above is activated
     by default: it's less strict and more useful).
   * dpkg-source has been heavily refactored to make it easier to support
     multiple source package formats. Several new source package formats have
     been added:
     - the format "2.0" is the original wig&pen
     - the format "3.0 (quilt)" is based on 2.0. It uses a tarball for the
       debian directory and can thus include binary files. Binaries
       outside of the debian directory can be also included if they
       are listed in debian/source/include-binaries (and option
       --include-binaries will generate this file automatically).
       Closes: #4588, #4628
     - thus it will also preserve timestamps on Debian-provided
       documentation like README.Debian. Closes: #366555
     - it handles an explicit series of patches and the patch can thus be
       named without constraints. Patches can contain arbitrary
       headers/comments between file chunks. Closes: #363018
     - it ignores changes on a number of temporary and VCS-specific files
       by default. Closes: #203792, #323909
     - the patches in debian/patches can remove files. Closes: #12564
     - the patches are applied at unpack time. Closes: #463048
     - the formats "3.0 (quilt/native)" don't include VCS directories by
       default. Closes: #435126
     - the format "3.0 (custom)" can be used to create a source package
       containing arbitrary files. It's useful for helper tools that can
       generate the files by themselves in a more efficient way
       (like all the *-buildpackage tools). Closes: #246918
     - the formats "3.0 (git/bzr)" are experimental formats based
       on corresponding VCS repositories. Thanks to Joey Hess and Colin Watson
       respectively.
   * dpkg-source has a new --no-check option. It disables GPG check and
     checksums checks. Closes: #220758
   * dpkg-shlibdeps is now able to look into directories containing libraries
     used by cross-built binaries provided that the right environment variable
     are set. Closes: #453267
   * Change default value of LDFLAGS (set by dpkg-buildpackage) to ''
     instead of '-Wl,-Bsymbolic-functions'. It's safer at this point of the
     release cycle.
   * dpkg-buildpackage will set PKG_CONFIG_LIBDIR (but not override an existing
     value) in case of cross-compilation so that pkgconfig finds .pc files
     in the directory specific to the target architecture. Closes: #439979
 .
   [ Frank Lichtenheld ]
   * Add a warning in dpkg-buildpackage if the build-dependencies are not
     satisfied during -S. Closes: #445552
   * Add a missing space in the German scripts translation. Closes: #463398
   * Add improved deb-shlibs.5 manual page by Zack Weinberg. Closes: #466135
   * dpkg-buildpackage exports some build related environment variables
     now. Based on a patch by Matthias Klose. Closes: #465282
     (See dpkg-buildpackage(1) and https://wiki.ubuntu.com/DistCompilerFlags
      for details)
   * Add support for use of SHA1 and SHA256 checksums in .dsc and
     .changes files. Information will be available in Checksums-Sha{1,256}
     fields. .changes format version increased to 1.8.
   * Link dselect against libncursesw. Closes: #466321
   * Forward port a patch from the old changelog parser to the new
     one that got lost during the transition. '+' and '.' can now
     be used in distribution names yet again. Reported by dann frazier.
     Closes: #467470
 .
   [ Updated dpkg translations ]
   * Korean (Changwoo Ryu).
   * Polish (Robert Luberda).
   * Romanian (Eddy PetriÅ?or).
   * Slovak (Ivan Masár). Closes: #471342
   * Swedish (Peter Karlsson).
   * Thai (Theppitak Karoonboonyanan). Closes: #468916
 .
   [ Updated manpages translations ]
   * German (Helge Kreutzmann).
   * Polish (Robert Luberda).
   * Swedish (Peter Karlsson).
 .
   [ Updated dselect translations ]
   * Basque. (Piarres beobide). Closes: #462403
 .
   [ Updated scripts translations ]
   * German (Helge Kreutzmann).
   * Polish (Robert Luberda).
   * Swedish (Peter Karlsson).
 .
   [ Updated dselect translations ]
   * Polish (Robert Luberda).
   * Romanian (Eddy PetriÅ?or).
Files: 
 ad7351681c37db04c653df8e494e9db2 1169 admin required dpkg_1.14.19ubuntu1.dsc
 630c4c5b714c3e87ff86fa0de9e64a0c 6643999 admin required dpkg_1.14.19ubuntu1.tar.gz
Original-Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>
diff -pruN 1.14.19/configure 1.14.19ubuntu1/configure
--- 1.14.19/configure	2008-05-12 06:39:07.000000000 +0100
+++ 1.14.19ubuntu1/configure	2008-05-27 13:07:55.000000000 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for dpkg 1.14.19.
+# Generated by GNU Autoconf 2.61 for dpkg 1.14.19ubuntu1.
 #
 # Report bugs to <debian-dpkg@lists.debian.org>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='dpkg'
 PACKAGE_TARNAME='dpkg'
-PACKAGE_VERSION='1.14.19'
-PACKAGE_STRING='dpkg 1.14.19'
+PACKAGE_VERSION='1.14.19ubuntu1'
+PACKAGE_STRING='dpkg 1.14.19ubuntu1'
 PACKAGE_BUGREPORT='debian-dpkg@lists.debian.org'
 
 ac_unique_file="lib/dpkg.h"
@@ -1275,7 +1275,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.14.19 to adapt to many kinds of systems.
+\`configure' configures dpkg 1.14.19ubuntu1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1346,7 +1346,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dpkg 1.14.19:";;
+     short | recursive ) echo "Configuration of dpkg 1.14.19ubuntu1:";;
    esac
   cat <<\_ACEOF
 
@@ -1465,7 +1465,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dpkg configure 1.14.19
+dpkg configure 1.14.19ubuntu1
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1479,7 +1479,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.14.19, which was
+It was created by dpkg $as_me 1.14.19ubuntu1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2364,7 +2364,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dpkg'
- VERSION='1.14.19'
+ VERSION='1.14.19ubuntu1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12593,7 +12593,7 @@ exec 6>&1
 # 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.14.19, which was
+This file was extended by dpkg $as_me 1.14.19ubuntu1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12646,7 +12646,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-dpkg config.status 1.14.19
+dpkg config.status 1.14.19ubuntu1
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff -pruN 1.14.19/configure.ac 1.14.19ubuntu1/configure.ac
--- 1.14.19/configure.ac	2008-05-12 06:32:43.000000000 +0100
+++ 1.14.19ubuntu1/configure.ac	2008-05-27 13:07:55.000000000 +0100
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([dpkg], [1.14.19], [debian-dpkg@lists.debian.org])
+AC_INIT([dpkg], [1.14.19ubuntu1], [debian-dpkg@lists.debian.org])
 AC_CONFIG_SRCDIR([lib/dpkg.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([config])
diff -pruN 1.14.19/cputable 1.14.19ubuntu1/cputable
--- 1.14.19/cputable	2008-05-12 05:24:36.000000000 +0100
+++ 1.14.19ubuntu1/cputable	2008-05-27 13:07:55.000000000 +0100
@@ -15,6 +15,7 @@
 #
 # <Debian name>	<GNU name>	<config.guess regex>
 i386		i486		(i[3456]86|pentium)
+i686		i686		(i[3456]86|pentium)
 ia64		ia64		ia64
 alpha		alpha		alpha.*
 amd64		x86_64		x86_64
diff -pruN 1.14.19/debian/archtable 1.14.19ubuntu1/debian/archtable
--- 1.14.19/debian/archtable	2008-05-12 05:24:36.000000000 +0100
+++ 1.14.19ubuntu1/debian/archtable	2008-05-27 13:07:55.000000000 +0100
@@ -13,6 +13,7 @@
 # 
 # <ignore>			<Debian name>
 i486-linux-gnu			i386
+i686-linux-gnulp		lpia
 ia64-linux-gnu			ia64
 alpha-linux-gnu			alpha
 x86_64-linux-gnu		amd64
diff -pruN 1.14.19/debian/changelog 1.14.19ubuntu1/debian/changelog
--- 1.14.19/debian/changelog	2008-05-12 06:33:25.000000000 +0100
+++ 1.14.19ubuntu1/debian/changelog	2008-05-27 13:15:17.000000000 +0100
@@ -1,3 +1,50 @@
+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 ]
@@ -80,6 +127,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 ]
@@ -306,6 +400,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
@@ -455,6 +649,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
 
   [ Raphael Hertzog ]
@@ -602,6 +864,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
 
   [ Raphael Hertzog ]
@@ -911,6 +1234,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.14.19/debian/control 1.14.19ubuntu1/debian/control
--- 1.14.19/debian/control	2008-05-12 05:24:36.000000000 +0100
+++ 1.14.19ubuntu1/debian/control	2008-05-27 13:07:55.000000000 +0100
@@ -1,7 +1,8 @@
 Source: dpkg
 Section: admin
 Priority: required
-Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>
 Uploaders: Frank Lichtenheld <djpig@debian.org>,
  Guillem Jover <guillem@debian.org>, Raphael Hertzog <hertzog@debian.org>
 Origin: debian
@@ -18,11 +19,11 @@ Build-Depends: debhelper (>= 4.1.81), pk
 Package: dpkg
 Architecture: any
 Essential: yes
-Pre-Depends: ${shlibs:Depends}, coreutils (>= 5.93-1)
-Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch (<< 0.11),
- dpkg-dev (<< 1.14.16), apt (<< 0.7.7), aptitude (<< 0.4.7-1)
+Pre-Depends: ${shlibs:Depends}, coreutils (>= 5.93-1), lzma
+Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch (<< 0.11)
+Breaks: dpkg-dev (<< 1.14.16), apt (<< 0.7.7), aptitude (<< 0.4.7-1)
 Replaces: manpages-de (<= 0.4-3), manpages-pl (<= 20051117-1)
-Suggests: apt, lzma
+Suggests: apt
 Description: package maintenance system for Debian
  This package contains the low-level commands for handling the installation
  and removal of packages on your system.
diff -pruN 1.14.19/debian/dpkg.postinst 1.14.19ubuntu1/debian/dpkg.postinst
--- 1.14.19/debian/dpkg.postinst	2008-05-12 05:24:36.000000000 +0100
+++ 1.14.19ubuntu1/debian/dpkg.postinst	2008-05-27 13:07:55.000000000 +0100
@@ -72,6 +72,14 @@ case "$1" in
 
 	move_info_directory
 	remove_info_symlink
+
+	if test -f /var/lib/dpkg/triggers/Unincorp; then
+	    # Upgrade from broken trigger interest recorder
+	    #  (bugs.launchpad.net/133172).  We remove this
+	    #  old stale file:
+	    rm -f /var/lib/dpkg/triggers/Deferred
+	fi
+
 	;;
 
     abort-upgrade|abort-deconfigure|abort-remove)
diff -pruN 1.14.19/lib/cleanup.c 1.14.19ubuntu1/lib/cleanup.c
--- 1.14.19/lib/cleanup.c	2008-05-12 05:24:36.000000000 +0100
+++ 1.14.19ubuntu1/lib/cleanup.c	2008-05-27 13:07:55.000000000 +0100
@@ -29,8 +29,10 @@ cu_closepipe(int argc, void **argv)
 {
 	int *p1 = (int *)argv[0];
 
-	close(p1[0]);
-	close(p1[1]);
+	if (p1[0] >= 0)
+		close(p1[0]);
+	if (p1[1] >= 0)
+		close(p1[1]);
 }
 
 void
@@ -46,7 +48,8 @@ cu_closedir(int argc, void **argv)
 {
 	DIR *d = (DIR *)(argv[0]);
 
-	closedir(d);
+	if (d)
+		closedir(d);
 }
 
 void
@@ -54,6 +57,17 @@ cu_closefd(int argc, void **argv)
 {
 	int ip = *(int *)argv[0];
 
-	close(ip);
+	if (ip >= 0)
+		close(ip);
+}
+
+int
+ferror_fclose_pop_cleanup(FILE *f)
+{
+	int r1, r2;
+	r1 = ferror(f);
+	pop_cleanup(ehflag_normaltidy);
+	r2 = fclose(f);
+	return r1 ? r1 : r2;
 }
 
diff -pruN 1.14.19/lib/dbmodify.c 1.14.19ubuntu1/lib/dbmodify.c
--- 1.14.19/lib/dbmodify.c	2008-05-12 05:24:36.000000000 +0100
+++ 1.14.19ubuntu1/lib/dbmodify.c	2008-05-27 13:07:55.000000000 +0100
@@ -253,6 +253,9 @@ void modstatdb_note(struct pkginfo *pkg)
 
   onerr_abort++;
 
+  /* Clear pending triggers here so that only code that sets the status
+   * to interesting (for triggers) values has to care about triggers.
+   */
   if (pkg->status != stat_triggerspending &&
       pkg->status != stat_triggersawaited)
     pkg->trigpend_head = NULL;
diff -pruN 1.14.19/lib/dpkg.h 1.14.19ubuntu1/lib/dpkg.h
--- 1.14.19/lib/dpkg.h	2008-05-12 05:24:36.000000000 +0100
+++ 1.14.19ubuntu1/lib/dpkg.h	2008-05-27 13:07:55.000000000 +0100
@@ -237,6 +237,15 @@ void cu_closepipe(int argc, void **argv)
 void cu_closedir(int argc, void **argv);
 void cu_closefd(int argc, void **argv);
 
+int ferror_fclose_pop_cleanup(FILE *f);
+ /* calls ferror and fclose on f, and pop_cleanup
+  *   file= fopen
+  *   push_cleanup(cu_closefile,~ehflag_normaltidy, 0,0, 1,(void*)file
+  * return is 0 on success or EOF if fclose or ferror failed
+  * all three calls are always made regardless, and in the right order
+  * so you can just call ohshite if this returns EOF
+  */
+
 /*** lock.c ***/
 
 void lock_file(int *lockfd, const char *filename,
diff -pruN 1.14.19/lib/triglib.c 1.14.19ubuntu1/lib/triglib.c
--- 1.14.19/lib/triglib.c	2008-05-12 05:24:36.000000000 +0100
+++ 1.14.19ubuntu1/lib/triglib.c	2008-05-27 13:07:55.000000000 +0100
@@ -355,10 +355,9 @@ trk_explicit_interest_change(const char 
 	}
 	if (signum > 0)
 		fprintf(nf, "%s\n", pkg->name);
-	if (ferror(nf) || fclose(nf))
+	if (ferror_fclose_pop_cleanup(nf))
 		ohshite(_("unable to write new trigger interest file `%.250s'"),
 		        newfn.buf);
-	pop_cleanup(ehflag_normaltidy);
 
 	if (rename(newfn.buf, trk_explicit_fn.buf))
 		ohshite(_("unable to install new trigger interest file `%.250s'"),
@@ -449,10 +448,9 @@ trig_file_interests_save(void)
 		fprintf(nf, "%s %s\n", trigh.namenode_name(tfi->fnn),
 		        tfi->pkg->name);
 
-	if (ferror(nf) || fclose(nf))
+	if (ferror_fclose_pop_cleanup(nf))
 		ohshite(_("unable to write new file triggers file `%.250s'"),
 		        triggersnewfilefile);
-	pop_cleanup(ehflag_normaltidy);
 
 	if (rename(triggersnewfilefile, triggersfilefile))
 		ohshite(_("unable to install new file triggers file as `%.250s'"),
@@ -708,7 +706,7 @@ trig_incorporate(enum modstatdb_rw cstat
 		abort();
 	}
 
-	/* Right, that's it. New (empty) Unincopr can be installed. */
+	/* Right, that's it. New (empty) Unincorp can be installed. */
 	trigdef_process_done();
 }
 
diff -pruN 1.14.19/man/dpkg-buildpackage.1 1.14.19ubuntu1/man/dpkg-buildpackage.1
--- 1.14.19/man/dpkg-buildpackage.1	2008-05-12 05:24:36.000000000 +0100
+++ 1.14.19ubuntu1/man/dpkg-buildpackage.1	2008-05-27 13:07:55.000000000 +0100
@@ -221,6 +221,7 @@ set to default values unless already set
 this mechanism was only introduced in dpkg-dev, version 1.14.17 and
 not all \fIrules\fP files and build tools will honour these variables,
 yet.
+See https://wiki.ubuntu.com/DistCompilerFlags for the details.
 .TP
 .B CFLAGS
 Optimization options which are passed to the Debian build system and
diff -pruN 1.14.19/scripts/Dpkg/Arch.pm 1.14.19ubuntu1/scripts/Dpkg/Arch.pm
--- 1.14.19/scripts/Dpkg/Arch.pm	2008-05-12 05:24:38.000000000 +0100
+++ 1.14.19ubuntu1/scripts/Dpkg/Arch.pm	2008-05-27 13:07:55.000000000 +0100
@@ -215,6 +215,13 @@ sub gnutriplet_to_debtriplet($)
 	}
     }
 
+    # This is sick and wrong, but dpkg-architecture just doesn't seem capable
+    # of handling this case on its own, with the current lookup tables:
+
+    if ($cpu eq "i386" && $os eq "gnulp-linux") {
+        $cpu = "i686";
+    }
+
     return undef if !defined($cpu) || !defined($os);
     return (split(/-/, $os, 2), $cpu);
 }
diff -pruN 1.14.19/scripts/Dpkg/Changelog/Debian.pm 1.14.19ubuntu1/scripts/Dpkg/Changelog/Debian.pm
--- 1.14.19/scripts/Dpkg/Changelog/Debian.pm	2008-05-12 06:04:54.000000000 +0100
+++ 1.14.19ubuntu1/scripts/Dpkg/Changelog/Debian.pm	2008-05-27 13:07:55.000000000 +0100
@@ -145,6 +145,7 @@ sub parse {
 	    }
 	    unless ($entry->is_empty) {
 		$entry->{'Closes'} = find_closes( $entry->{Changes} );
+		$entry->{'Launchpad-Bugs-Fixed'} = find_launchpad_closes( $entry->{Changes} );
 #		    print STDERR, Dumper($entry);
 		push @{$self->{data}}, $entry;
 		$entry = new Dpkg::Changelog::Entry;
@@ -254,6 +255,7 @@ sub parse {
 			&& !$entry->is_empty) {
 			# lets assume we have missed the actual header line
 			$entry->{'Closes'} = find_closes( $entry->{Changes} );
+			$entry->{'Launchpad-Bugs-Fixed'} = find_launchpad_closes( $entry->{Changes} );
 #		    print STDERR, Dumper($entry);
 			push @{$self->{data}}, $entry;
 			$entry = new Dpkg::Changelog::Entry;
@@ -315,6 +317,7 @@ sub parse {
 	};
     unless ($entry->is_empty) {
 	$entry->{'Closes'} = find_closes( $entry->{Changes} );
+	$entry->{'Launchpad-Bugs-Fixed'} = find_launchpad_closes( $entry->{Changes} );
 	push @{$self->{data}}, $entry;
     }
 
diff -pruN 1.14.19/scripts/Dpkg/Changelog.pm 1.14.19ubuntu1/scripts/Dpkg/Changelog.pm
--- 1.14.19/scripts/Dpkg/Changelog.pm	2008-05-12 05:24:38.000000000 +0100
+++ 1.14.19ubuntu1/scripts/Dpkg/Changelog.pm	2008-05-27 13:07:55.000000000 +0100
@@ -47,6 +47,7 @@ use base qw(Exporter);
 
 our %EXPORT_TAGS = ( 'util' => [ qw(
                 find_closes
+                find_launchpad_closes
                 data2rfc822
                 data2rfc822_mult
                 get_dpkg_changes
@@ -418,6 +419,7 @@ our ( @URGENCIES, %URGENCIES );
 BEGIN {
     @CHANGELOG_FIELDS = qw(Source Version Distribution
                            Urgency Maintainer Date Closes Changes
+                           Launchpad-Bugs-Fixed
                            Timestamp Header Items Trailer
                            Urgency_comment Urgency_lc);
     tie %CHANGELOG_FIELDS, 'Dpkg::Fields::Object';
@@ -448,6 +450,7 @@ sub dpkg {
 
     $f->{Changes} = get_dpkg_changes( $data->[0] );
     $f->{Closes} = [ @{$data->[0]{Closes}} ];
+    $f->{'Launchpad-Bugs-Fixed'} = [ @{$data->[0]{'Launchpad-Bugs-Fixed'}} ];
 
     my $first = 1; my $urg_comment = '';
     foreach my $entry (@$data) {
@@ -462,6 +465,7 @@ sub dpkg {
 
 	$f->{Changes} .= "\n .".get_dpkg_changes( $entry );
 	push @{$f->{Closes}}, @{$entry->{Closes}};
+	push @{$f->{'Launchpad-Bugs-Fixed'}}, @{$entry->{'Launchpad-Bugs-Fixed'}};
 
 	# handle unknown fields
 	foreach my $field (keys %$entry) {
@@ -472,6 +476,7 @@ sub dpkg {
     }
 
     $f->{Closes} = join " ", sort { $a <=> $b } @{$f->{Closes}};
+    $f->{'Launchpad-Bugs-Fixed'} = join " ", sort { $a <=> $b } @{$f->{'Launchpad-Bugs-Fixed'}};
     $f->{Urgency} .= $urg_comment;
 
     return %$f if wantarray;
@@ -524,6 +529,7 @@ sub rfc822 {
 	$f->{Urgency} .= $entry->{Urgency_Comment};
 	$f->{Changes} = get_dpkg_changes( $entry );
 	$f->{Closes} = join " ", sort { $a <=> $b } @{$entry->{Closes}};
+	$f->{'Launchpad-Bugs-Fixed'} = join " ", sort { $a <=> $b } @{$entry->{'Launchpad-Bugs-Fixed'}};
 
 	# handle unknown fields
 	foreach my $field (keys %$entry) {
@@ -646,6 +652,29 @@ sub find_closes {
 
 =pod
 
+=head3 find_launchpad_closes
+
+Takes one string as argument and finds "LP: #123456, #654321" statements,
+which are references to bugs on Launchpad.  Returns all closed bug numbers
+in an array reference.
+
+=cut
+
+sub find_launchpad_closes {
+    my $changes = shift;
+    my @launchpad_closes = ();
+
+    while ($changes &&
+	   ($changes =~ /lp:\s+\#\d+(?:,\s*\#\d+)*/ig)) {
+	push(@launchpad_closes, $& =~ /\#?\s?(\d+)/g);
+    }
+
+    @launchpad_closes = sort { $a <=> $b } @launchpad_closes;
+    return \@launchpad_closes;
+}
+
+=pod
+
 =head3 data2rfc822
 
 Takes a single argument, either a Dpkg::Changelog::Entry object
diff -pruN 1.14.19/scripts/Dpkg/Control.pm 1.14.19ubuntu1/scripts/Dpkg/Control.pm
--- 1.14.19/scripts/Dpkg/Control.pm	2008-05-12 05:24:38.000000000 +0100
+++ 1.14.19ubuntu1/scripts/Dpkg/Control.pm	2008-05-27 13:07:55.000000000 +0100
@@ -78,7 +78,7 @@ sub parse {
     my ($self, $file) = @_;
     $self->reset();
     # Parse
-    open(CDATA, "<", $file) || syserr(_g("cannot read %s"), $file);
+    open(CDATA, "< $file") || syserr(_g("cannot read %s"), $file);
     my $cdata = parsecdata(\*CDATA, $file);
     return if not defined $cdata;
     $self->{source} = $cdata;
diff -pruN 1.14.19/scripts/dpkg-buildpackage.pl 1.14.19ubuntu1/scripts/dpkg-buildpackage.pl
--- 1.14.19/scripts/dpkg-buildpackage.pl	2008-05-12 05:24:38.000000000 +0100
+++ 1.14.19ubuntu1/scripts/dpkg-buildpackage.pl	2008-05-27 13:07:55.000000000 +0100
@@ -261,7 +261,7 @@ my %flags = ( CPPFLAGS => '',
 	      CFLAGS   => $default_flags,
 	      CXXFLAGS => $default_flags,
 	      FFLAGS   => $default_flags,
-	      LDFLAGS  => '',
+	      LDFLAGS  => '-Wl,-Bsymbolic-functions',
     );
 
 foreach my $flag (keys %flags) {
diff -pruN 1.14.19/scripts/dpkg-genchanges.pl 1.14.19ubuntu1/scripts/dpkg-genchanges.pl
--- 1.14.19/scripts/dpkg-genchanges.pl	2008-05-12 05:24:38.000000000 +0100
+++ 1.14.19ubuntu1/scripts/dpkg-genchanges.pl	2008-05-27 13:07:55.000000000 +0100
@@ -25,7 +25,7 @@ textdomain("dpkg-dev");
 
 my @changes_fields = qw(Format Date Source Binary Architecture Version
                         Distribution Urgency Maintainer Changed-By
-                        Description Closes Changes Checksums-Md5
+                        Description Closes Launchpad-Bugs-Fixed Changes Checksums-Md5
                         Checksums-Sha1 Checksums-Sha256 Files);
 
 my $controlfile = 'debian/control';
@@ -332,7 +332,7 @@ foreach $_ (keys %{$changelog}) {
 	set_source_package($v);
     } elsif (m/^Maintainer$/i) {
 	$fields->{"Changed-By"} = $v;
-    } elsif (m/^(Version|Changes|Urgency|Distribution|Date|Closes)$/i) {
+    } elsif (m/^(Version|Changes|Urgency|Distribution|Date|Closes|Launchpad-Bugs-Fixed)$/i) {
 	$fields->{$_} = $v;
     } elsif (s/^X[BS]*C[BS]*-//i) {
 	$fields->{$_} = $v;
diff -pruN 1.14.19/scripts/dpkg-gencontrol.pl 1.14.19ubuntu1/scripts/dpkg-gencontrol.pl
--- 1.14.19/scripts/dpkg-gencontrol.pl	2008-05-12 06:02:15.000000000 +0100
+++ 1.14.19ubuntu1/scripts/dpkg-gencontrol.pl	2008-05-27 13:07:55.000000000 +0100
@@ -203,7 +203,7 @@ foreach $_ (keys %{$changelog}) {
     } elsif (m/^Version$/) {
 	$sourceversion = $v;
 	$fields->{$_} = $v unless defined($forceversion);
-    } elsif (m/^(Maintainer|Changes|Urgency|Distribution|Date|Closes)$/) {
+    } elsif (m/^(Maintainer|Changes|Urgency|Distribution|Date|Closes|Launchpad-Bugs-Fixed)$/) {
     } elsif (s/^X[CS]*B[CS]*-//i) {
 	$fields->{$_} = $v;
     } elsif (!m/^X[CS]+-/i) {
diff -pruN 1.14.19/scripts/dpkg-source.pl 1.14.19ubuntu1/scripts/dpkg-source.pl
--- 1.14.19/scripts/dpkg-source.pl	2008-05-12 05:24:38.000000000 +0100
+++ 1.14.19ubuntu1/scripts/dpkg-source.pl	2008-05-27 13:07:55.000000000 +0100
@@ -238,7 +238,7 @@ if ($options{'opmode'} eq 'build') {
 	    $fields->{$_} = $v;
 	} elsif (s/^X[BS]*C[BS]*-//i) {
 	    $fields->{$_} = $v;
-	} elsif (m/^(Maintainer|Changes|Urgency|Distribution|Date|Closes)$/i ||
+	} elsif (m/^(Maintainer|Changes|Urgency|Distribution|Date|Closes|Launchpad-Bugs-Fixed)$/i ||
 		 m/^X[BS]+-/i) {
 	} else {
 	    unknown(_g("parsed version of changelog"));
@@ -247,6 +247,22 @@ if ($options{'opmode'} eq 'build') {
     
     $fields->{'Binary'} = join(', ', @binarypackages);
 
+    # check that Maintainer/XSBC-Original-Maintainer comply to
+    # https://wiki.ubuntu.com/DebianMaintainerField
+    if (defined($fields->{Version}) and defined($fields->{Maintainer}) and
+	$fields->{Version} =~ /ubuntu/) {
+	if ($fields->{'Maintainer'} !~ /ubuntu/) {
+	    if ($ENV{'DEBEMAIL'} =~ /ubuntu/) {
+		error(_g('Version number suggests Ubuntu changes, but Maintainer: does not have Ubuntu address'));
+	    } else {
+		warning(_g('Version number suggests Ubuntu changes, but Maintainer: does not have Ubuntu address'));
+	    }
+	}
+	unless ($fields->{'Original-Maintainer'}) {
+	    warning(_g('Version number suggests Ubuntu changes, but there is no XSBC-Original-Maintainer field'));
+	}
+    }
+ 
     unshift @build_formats, $fields->{'Format'} if exists $fields->{'Format'};
     # Try all suggested formats until one is acceptable
     foreach my $format (@build_formats) {
diff -pruN 1.14.19/scripts/t/600_Dpkg_Changelog/fields 1.14.19ubuntu1/scripts/t/600_Dpkg_Changelog/fields
--- 1.14.19/scripts/t/600_Dpkg_Changelog/fields	2008-05-12 05:24:38.000000000 +0100
+++ 1.14.19ubuntu1/scripts/t/600_Dpkg_Changelog/fields	2008-05-27 13:07:55.000000000 +0100
@@ -1,12 +1,14 @@
 fields (2.0-0etch1) stable; urgency=low
 
   * Upload to stable (Closes: #1111111, #2222222)
+  * Fix more stuff. (LP: #54321, #2424242)
 
  -- Frank Lichtenheld <frank@lichtenheld.de>  Sun, 13 Jan 2008 15:49:19 +0100
 
 fields (2.0-1) unstable; urgency=medium
 
   * Upload to unstable (Closes: #1111111, #2222222)
+  * Fix stuff. (LP: #12345, #424242)
 
  -- Frank Lichtenheld <djpig@debian.org>  Sun, 12 Jan 2008 15:49:19 +0100
 
diff -pruN 1.14.19/scripts/t/600_Dpkg_Changelog.t 1.14.19ubuntu1/scripts/t/600_Dpkg_Changelog.t
--- 1.14.19/scripts/t/600_Dpkg_Changelog.t	2008-05-12 05:24:38.000000000 +0100
+++ 1.14.19ubuntu1/scripts/t/600_Dpkg_Changelog.t	2008-05-27 13:07:55.000000000 +0100
@@ -173,10 +173,12 @@ Changes: 
  fields (2.0-0etch1) stable; urgency=low
  .
    * Upload to stable (Closes: #1111111, #2222222)
+   * Fix more stuff. (LP: #54321, #2424242)
  .
  fields (2.0-1) unstable; urgency=medium
  .
    * Upload to unstable (Closes: #1111111, #2222222)
+   * Fix stuff. (LP: #12345, #424242)
  .
  fields (2.0~b1-1) unstable; urgency=low,xc-userfield=foobar
  .
@@ -185,6 +187,7 @@ Changes: 
  fields (1.0) experimental; urgency=high
  .
    * First upload (Closes: #1000000)
+Launchpad-Bugs-Fixed: 12345 54321 424242 2424242
 Xc-Userfield: foobar
 ';
 	cmp_ok($str,'eq',$expected,"fields handling");
@@ -201,10 +204,12 @@ Changes: 
  fields (2.0-1) unstable; urgency=medium
  .
    * Upload to unstable (Closes: #1111111, #2222222)
+   * Fix stuff. (LP: #12345, #424242)
  .
  fields (2.0~b1-1) unstable; urgency=low,xc-userfield=foobar
  .
    * Beta
+Launchpad-Bugs-Fixed: 12345 424242
 Xc-Userfield: foobar
 ';
 	cmp_ok($str,'eq',$expected,"fields handling 2");
diff -pruN 1.14.19/src/configure.c 1.14.19ubuntu1/src/configure.c
--- 1.14.19/src/configure.c	2008-05-12 05:24:38.000000000 +0100
+++ 1.14.19ubuntu1/src/configure.c	2008-05-27 13:07:55.000000000 +0100
@@ -309,11 +309,12 @@ void deferred_configure(struct pkginfo *
 
 	modstatdb_note(pkg);
 
-	maintainer_script_postinst(pkg, "configure",
+	if (maintainer_script_postinst(pkg, "configure",
 	                           informativeversion(&pkg->configversion) ?
 	                           versiondescribe(&pkg->configversion,
 	                                           vdew_nonambig) : "",
-	                           NULL);
+	                           NULL))
+		putchar('\n');
 
 	pkg->eflag= eflagv_ok;
 	post_postinst_tasks(pkg, stat_installed);
diff -pruN 1.14.19/src/trigproc.c 1.14.19ubuntu1/src/trigproc.c
--- 1.14.19/src/trigproc.c	2008-05-12 05:24:38.000000000 +0100
+++ 1.14.19ubuntu1/src/trigproc.c	2008-05-27 13:07:55.000000000 +0100
@@ -295,6 +295,9 @@ trigproc(struct pkginfo *pkg)
 		}
 		varbufaddc(&namesarg, 0);
 
+		/* Setting the status to halfconfigured
+		 * causes modstatdb_note to clear pending triggers.
+		 */
 		pkg->status = stat_halfconfigured;
 		modstatdb_note(pkg);
 
diff -pruN 1.14.19/triplettable 1.14.19ubuntu1/triplettable
--- 1.14.19/triplettable	2008-05-12 05:24:38.000000000 +0100
+++ 1.14.19ubuntu1/triplettable	2008-05-27 13:07:55.000000000 +0100
@@ -4,7 +4,7 @@
 #
 # <Debian triplet>	<Debian arch>
 gnueabi-linux-arm	armel
-gnulp-linux-i386	lpia
+gnulp-linux-i686	lpia
 gnu-linux-<cpu>		<cpu>
 gnu-kfreebsd-<cpu>	kfreebsd-<cpu>
 gnu-knetbsd-<cpu>	knetbsd-<cpu>

Reply to: