Ubuntu (new upstream) dpkg 1.15.5.6ubuntu1
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: Sun, 14 Feb 2010 01:32:19 +0000
Source: dpkg
Binary: dpkg dpkg-dev dselect
Architecture: source
Version: 1.15.5.6ubuntu1
Distribution: lucid
Urgency: low
Maintainer: Ubuntu Core 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
Closes: 131633 402527 421367 453005 454628 482166 494136 516631 530070 536066 537338 543581 545274 545446 548541 548541 548541 548541 548615 551829 553328 553580 554136 554612 554689 555806 556786 557013 557547 557618 557664 557667 557668 558233 558595 560391 561237 562038
Changes:
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.
.
dpkg (1.15.5.6) unstable; urgency=low
.
* dpkg-source: with format "3.0 (quilt)" ensure quilt's .pc directory is
created before trying to register a new patch in .pc/applied-patches.
Thanks to Tommi Vainikainen <thv+debian@iki.fi> for the report and the
patch. Closes: #561237
* Fix dpkg-buildpackage to set "parallel=" in DEB_BUILD_OPTIONS instead of
the invalid "parallel=-1" when option "-j" is given. Closes: #562038
* Clarify how dpkg-source --print-format works and display messages on
STDERR when the requested format is discarded. Closes: #560391
* Add ${misc:Depends} in all Depends fields.
.
dpkg (1.15.5.5) unstable; urgency=low
.
* Allow again new lines in dpkg-source and dpkg-genchanges on substvar and
maintainer arguments.
.
dpkg (1.15.5.4) unstable; urgency=low
.
* Fix Dpkg::Index::get() and remove(). Thanks to Roderich Schupp
<roderich.schupp@googlemail.com> for the patch. Closes: #558595
* Modify implementation of "3.0 (quilt)" source format to not be
behave differently depending on whether quilt is installed or not.
The option --without-quilt is thus gone and dpkg-source creates
and relies on the .pc directory to know whether patches are applied
or not. Closes: #557667
* Add new dpkg-source option --single-debian-patch supported by the source
format "3.0 (quilt)" so that it behaves more like 1.0 and its single diff
that is constantly updated with all upstream changes. Useful if the
workflow is VCS based and can't generate a full patch set.
* dpkg-source now uses debian/source/patch-header as header of the automatic
Debian patch in format "3.0 (quilt)".
* Fix Debian changelog parser so that the trailer line is again checked.
.
dpkg (1.15.5.3) unstable; urgency=low
.
[ Raphael Hertzog ]
* Avoid usage of IO::String in dpkg-scanpackages, rely on Dpkg::IPC
instead to directly get a pipe file descriptor. Closes: #557013
* Put "3.0 (quilt)" in the default list of formats tried by dpkg-source
after "1.0" and before "3.0 (native)".
* Let dpkg-source fail if several upstream orig.tar files are available
(using different compression scheme) since we don't know which one
to use.
* Add missing "use Dpkg::Gettext" in Dpkg::Changelog::Entry::Debian.
Closes: #557668
* When building "3.0 (quilt)" source packages, use QUILT_PATCH_OPTS="-t -F 0
-N -u -V never -g0" so that quilt is as strict as dpkg-source's internal
implementation of quilt. Closes: #557664, #558233
* Before accepting to build a 3.0 (quilt) source packages, ensure that
debian/patches is a directory (or non-existing) and that
debian/patches/series is a file (or non-existing). Closes: #557618
* Dpkg::IPC::fork_and_exec() now includes the changed environment
variables in the default error message displayed when the sub-process
fails.
.
[ Guillem Jover ]
* Verify that the alternative used in update-alternatives --set has been
registered instead of failing with an undefined value in the slave
method. Closes: #554136
* Strip leading spaces in the first line of a field's value in
Dpkg::Control::Hash. Closes: #557547
.
dpkg (1.15.5.2) unstable; urgency=low
.
* Change Dpkg::Version API to accept invalid versions by default and add
is_valid() method. The boolean evaluation of a version object returns
true if the version is valid, false otherwise.
* Update dpkg-shlibdeps to always use Dpkg::Version now that it can
contain the empty version string. Closes: #556786
* Keep compatibility with perl 5.8 by avoiding the _ prototype.
.
dpkg (1.15.5.1) unstable; urgency=low
.
* Fix build failures due to off_t type missmatch caused by not including
<config.h> first on the unit tests. Suggested by Pierre Habouzit and
Julien Cristau, thanks!
.
dpkg (1.15.5) unstable; urgency=low
.
[ Guillem Jover ]
* Remove obsolete conffiles on purge. Closes: #421367, #453005, #454628
* Update list of binaries dpkg checks on the PATH.
- Remove install-info, now a wrapper that will disappear soonish.
- Add programs used by dpkg itself: sh, rm, find, tar and dpkg-deb.
* Check and warn on duplicate conffiles in dpkg-deb. Closes: #131633
* Make the upstream build system silent by default with automake 1.11 or
newer, and always verbose when building the Debian packages.
* Fix small leak when parsing â??--ignore-dependsâ?? option values.
* Define compatibility WCOREDUMP only if the system does not have it.
* When start-stop-daemon fails to set the io scheduling warn instead of
finishing fatally. Closes: #553580
* Update md5 file paths in debian/copyright.
Thanks to Jonathan Nieder <jrnieder@gmail.com>.
* On â??dpkg-trigger --helpâ?? print the default admindir instead of the one
passed on the command line.
* Abort on configure if the required C99 extensions are not supported.
* Add C coding style document.
* Make dpkg as strict as dpkg-statoverride on input when validating the
parsed data from the statdb.
* Rewrite dpkg-statoverride in C.
* Use C99 snprintf function family semantics to avoid having to call them
in a loop to grow the varbuf buffer. This should reduce memory usage and
be slightly faster on varbufprintf calls.
* Use the size from stat to allocate the buffers for readlink, instead of
indefinitely calling readlink and growing the buffer. This should reduce
memory usage when handling lots of symlinks, and be slightly faster.
* Rework varbuf api to avoid increasing buffers indefinitely when adding
content to them, regardless of space being already available.
* Fix build macros to allow start-stop-deaemon to use TIOCNOTTY.
* Generate the autoconf version from git to make it easier to see when a
snapshot version is being used.
* Add infrastructure for doxygen, for now not installed anywhere.
* Allow overriding the pkg-config path to ease cross-compilation.
Suggested by Tollef Fog Heen <tfheen@err.no>.
* Fix spelling errors in the Catalan translation. Closes: #553328
Thanks to Robert Millan.
* Update the FSF postal address in the source code license headers by
replacing it with a URL to the gnu.org page.
* Fix a file descriptor leak in dpkg-deb.
Reported by Raphael Geissert <atomo64@gmail.com>.
* Fix resource leaks on error conditions in compat scandir.
* Add a new status-fd action when disappearing a package. Closes: #537338
.
[ Raphaël Hertzog ]
* Add versioned dependency on base-files (>= 5.0.0) to dpkg-dev to ensure
that /etc/dpkg/origins/default exists. Closes: #545274
* Update Standards-Version to 3.8.3 (no changes needed).
* Major changes to the perl API:
- Dpkg::Control is now Dpkg::Control::Info
- Dpkg::Cdata is gone and is replaced by a new Dpkg::Control
- Dpkg::Control::Fields contains authoritative information
about fields allowed in various types of control information
(and can be customized by each vendor). It also integrates
information that was previously available through Dpkg::Deps.
- Dpkg::Changelog has been split in multiple modules and largely
modified to offer an interface that is now more in line with the
other modules.
* All dpkg-* perl programs that work with control information have been
updated to use the new Dpkg::Control interface.
In this process, dpkg-scanpackages has been fixed to not skip non-standard
fields. Closes: #494136
* Create Launchpad-Bugs-Fixed directly in the changelog parsing code thanks
to a new vendor hook post-process-changelog-entry. Closes: #536066
* Integrate dpkg-ftp into dselect. Add the required Replaces and Conflicts.
* dpkg-scanpackages/dpkg-scansources now supports compressed override files.
* dpkg-scanpackages now supports a new --medium option as needed to
generate Packages.cd file for consumption by the multicd dselect access
method. Closes: #402527
* Integrate dpkg-multicd into dselect. Add the required Replaces and
Conflicts. The dpkg-scanpackages fork is dropped. Closes: #516631
* Fix bashisms in dselect multicd access method. Closes: #530070
* Add support of "xz" compression method for source packages. Add dependency
dpkg-dev â?? xz-utils to ensure xz and unxz are available.
* Fix dpkg-source --include-binaries to correctly compute the path name of
the discovered binary files. Closes: #554612
* Remove extra quoting that should not be there while passing an exclude
file to git ls-files during build of 3.0 (git) source package.
Thanks to Courtney Bane for the patch. Closes: #551829
* Optimize dpkg-source -b by avoiding many diff calls when not required.
Thanks to Mike Hommey for the idea. Closes: #554689
* Add new option --print-format to dpkg-source to be able to know by advance
the source format that would be used during a build.
* Modify dpkg-source -b to use default build options from
debian/source/options. Thus it's now possible to have sticky options, for
example for the choice of a compression method (--compression=<comp>).
* dpkg-source outputs the list of upstream files modified by the diff.gz
(applies only to source packages using format 1.0). Closes: #482166
It also recommends usage of 3.0 (quilt) format during dpkg-source -b if it
detects changes to upstream files that are stored in the .diff.gz.
* Add DEP-3 compliant headers to automatic patches created by dpkg-source
in 3.0 (quilt) source format. Closes: #543581
* Switch dpkg to source format "3.0 (native)" with bzip2 compression.
.
[ Updated dpkg translations ]
* Czech (Miroslav Kure).
* French (Christian Perrier).
* German (Sven Joachim).
* Italian (Milo Casagrande). Closes: #548615, #555806
* Polish (Wiktor Wandachowicz). Closes: #548541
* Swedish (Peter Krefting).
.
[ Updated dselect translations ]
* Czech (Miroslav Kure).
* French (Christian Perrier).
* German (Sven Joachim).
* Polish (Wiktor Wandachowicz). Closes: #548541
* Swedish (Peter Krefting).
.
[ Updated man page translations ]
* French (Christian Perrier).
* French translation error fixed (Christian Perrier)
Thanks to Pietro Battiston for spotting it. Closes: #545446
* German (Helge Kreutzmann).
* Polish (Wiktor Wandachowicz). Closes: #548541
* Swedish (Peter Krefting).
.
[ Updated scripts translations ]
* German (Helge Kreutzmann).
* Polish (Wiktor Wandachowicz). Closes: #548541
* Swedish (Peter Krefting).
Checksums-Sha1:
b7ce1f205c2e49b51df89d220519a31c12f8b30a 2001 dpkg_1.15.5.6ubuntu1.dsc
2258e95ac10247e56eef9b3fa479d12d1327719d 4699077 dpkg_1.15.5.6ubuntu1.tar.bz2
Checksums-Sha256:
2cdc538ff1bd07b327a0007d7a2283a132b7c95bba5b87688cf63f552dddd1bb 2001 dpkg_1.15.5.6ubuntu1.dsc
e2054d775c9c7a72b74eeca04a81d1320e471de39f3fd868fdb5cbf9f7dd31bc 4699077 dpkg_1.15.5.6ubuntu1.tar.bz2
Files:
7d84cf6e9de99b75f0676569a929d6bd 2001 admin required dpkg_1.15.5.6ubuntu1.dsc
6a7d896b55502c58d4ab25a7a8ed95b2 4699077 admin required dpkg_1.15.5.6ubuntu1.tar.bz2
Original-Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>
diff -pruN 1.15.5.6/debian/changelog 1.15.5.6ubuntu1/debian/changelog
--- 1.15.5.6/debian/changelog 2010-01-08 18:02:03.000000000 +0000
+++ 1.15.5.6ubuntu1/debian/changelog 2010-02-14 01:40:26.000000000 +0000
@@ -1,3 +1,28 @@
+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
@@ -214,6 +239,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
@@ -221,6 +276,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 ]
@@ -353,6 +443,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 ]
@@ -360,6 +479,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 ]
@@ -436,6 +584,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 ]
@@ -874,6 +1054,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
[ Raphael Hertzog ]
@@ -903,6 +1143,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
[ Raphael Hertzog ]
@@ -949,6 +1239,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
[ Raphael Hertzog ]
@@ -1038,6 +1382,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 ]
@@ -1102,6 +1531,61 @@ dpkg (1.14.20) unstable; urgency=low
-- Raphael 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 ]
@@ -1184,6 +1668,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 ]
@@ -1410,6 +1941,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
@@ -1559,6 +2190,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 ]
@@ -1706,6 +2405,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 ]
@@ -2015,6 +2775,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.5.6/debian/control 1.15.5.6ubuntu1/debian/control
--- 1.15.5.6/debian/control 2010-01-08 18:02:02.000000000 +0000
+++ 1.15.5.6ubuntu1/debian/control 2010-02-14 01:40:26.000000000 +0000
@@ -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: Guillem Jover <guillem@debian.org>, Raphael Hertzog <hertzog@debian.org>
Origin: debian
Bugs: debbugs://bugs.debian.org
@@ -26,7 +27,7 @@ Replaces: manpages-de (<= 0.4-3), manpag
# see http://wiki.debian.org/Transitions/DpkgToGnuInstallInfo
Breaks: 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.5.6/.dist-version 1.15.5.6ubuntu1/.dist-version
--- 1.15.5.6/.dist-version 2010-01-08 18:05:23.000000000 +0000
+++ 1.15.5.6ubuntu1/.dist-version 2010-02-14 01:40:26.000000000 +0000
@@ -1 +1 @@
-1.15.5.6
+1.15.5.6ubuntu1
diff -pruN 1.15.5.6/lib/dpkg/cleanup.c 1.15.5.6ubuntu1/lib/dpkg/cleanup.c
--- 1.15.5.6/lib/dpkg/cleanup.c 2010-01-08 08:00:34.000000000 +0000
+++ 1.15.5.6ubuntu1/lib/dpkg/cleanup.c 2010-02-14 01:40:26.000000000 +0000
@@ -32,8 +32,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
@@ -49,7 +51,8 @@ cu_closedir(int argc, void **argv)
{
DIR *d = (DIR *)(argv[0]);
- closedir(d);
+ if (d)
+ closedir(d);
}
void
@@ -57,6 +60,7 @@ cu_closefd(int argc, void **argv)
{
int ip = *(int *)argv[0];
- close(ip);
+ if (ip >= 0)
+ close(ip);
}
diff -pruN 1.15.5.6/man/dpkg-buildpackage.1 1.15.5.6ubuntu1/man/dpkg-buildpackage.1
--- 1.15.5.6/man/dpkg-buildpackage.1 2010-01-08 17:23:06.000000000 +0000
+++ 1.15.5.6ubuntu1/man/dpkg-buildpackage.1 2010-02-14 01:40:26.000000000 +0000
@@ -233,6 +233,7 @@ set to default values unless already pre
this mechanism was only introduced in version 1.14.17 of dpkg-dev 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
@@ -297,6 +298,38 @@ have to be stripped from these options).
Optimization options appended to the compiler flags when linking code,
which must not be overwritten by the package (mostly used to for test
builds). Default value: empty.
+.TP
+.B DEB_BUILD_OPTIONS
+As indicated above,
+.BR noopt
+will disable optimation.
+Additionally, when used with the
+.BR hardening-wrapper
+package, the values
+.BR hardening
+and
+.BR 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 BUGS
It should be possible to specify spaces and shell metacharacters in
diff -pruN 1.15.5.6/scripts/dpkg-buildpackage.pl 1.15.5.6ubuntu1/scripts/dpkg-buildpackage.pl
--- 1.15.5.6/scripts/dpkg-buildpackage.pl 2010-01-08 17:51:40.000000000 +0000
+++ 1.15.5.6ubuntu1/scripts/dpkg-buildpackage.pl 2010-02-14 01:40:27.000000000 +0000
@@ -269,7 +269,7 @@ my %flags = ( CPPFLAGS => '',
CFLAGS => $default_flags,
CXXFLAGS => $default_flags,
FFLAGS => $default_flags,
- LDFLAGS => '',
+ LDFLAGS => '-Wl,-Bsymbolic-functions',
);
foreach my $flag (keys %flags) {
@@ -286,6 +286,41 @@ foreach my $flag (keys %flags) {
}
}
+# Allow control of hardening-wrapper via dpkg-buildpackage DEB_BUILD_OPTIONS
+my $hardening = $build_opts->{'hardening'};
+if (defined $build_opts->{'nohardening'}) {
+ $hardening = 0;
+}
+if (defined $hardening) {
+ my $flag = 'DEB_BUILD_HARDENING';
+ if ($hardening ne "0") {
+ if (! -x '/usr/bin/hardened-cc') {
+ syserr(_g("%s: 'hardening' flag found but 'hardening-wrapper' not installed\n"),
+ $progname);
+ }
+ if ($hardening ne "1") {
+ my @options = split(/,\s*/,$hardening);
+ $hardening=1;
+
+ my @hardopts = ('format', 'fortify', 'stackprotector',
+ 'pie', 'relro');
+ foreach my $item (@hardopts) {
+ my $upitem = uc($item);
+ foreach my $option (@options) {
+ if ($option =~ /^(no)?$item$/) {
+ $ENV{$flag.'_'.$upitem} = ($1 eq "");
+ }
+ }
+ }
+ }
+ }
+ if (defined $ENV{$flag}) {
+ printf(_g("%s: overriding %s in environment: %s\n"), $progname,
+ $flag, $hardening);
+ }
+ $ENV{$flag}=$hardening;
+}
+
my $cwd = cwd();
my $dir = basename($cwd);
diff -pruN 1.15.5.6/scripts/t/600_Dpkg_Changelog/fields 1.15.5.6ubuntu1/scripts/t/600_Dpkg_Changelog/fields
--- 1.15.5.6/scripts/t/600_Dpkg_Changelog/fields 2010-01-08 08:00:34.000000000 +0000
+++ 1.15.5.6ubuntu1/scripts/t/600_Dpkg_Changelog/fields 2010-02-14 01:40:27.000000000 +0000
@@ -1,6 +1,7 @@
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
@@ -8,6 +9,7 @@ fields (2.0-1) unstable frozen; urgency
[ Frank Lichtenheld ]
* Upload to unstable (Closes: #1111111, #2222222)
+ * Fix stuff. (LP: #12345, #424242)
[ Raphael Hertzog ]
* New upstream release.
diff -pruN 1.15.5.6/scripts/t/600_Dpkg_Changelog.t 1.15.5.6ubuntu1/scripts/t/600_Dpkg_Changelog.t
--- 1.15.5.6/scripts/t/600_Dpkg_Changelog.t 2010-01-08 17:23:06.000000000 +0000
+++ 1.15.5.6ubuntu1/scripts/t/600_Dpkg_Changelog.t 2010-02-14 01:40:27.000000000 +0000
@@ -177,15 +177,18 @@ Urgency: high
Maintainer: Frank Lichtenheld <frank@lichtenheld.de>
Date: Sun, 13 Jan 2008 15:49:19 +0100
Closes: 1000000 1111111 2222222
+Launchpad-Bugs-Fixed: 12345 54321 424242 2424242
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 frozen; urgency=medium
.
[ Frank Lichtenheld ]
* Upload to unstable (Closes: #1111111, #2222222)
+ * Fix stuff. (LP: #12345, #424242)
.
[ Raphael Hertzog ]
* New upstream release.
@@ -213,11 +216,13 @@ Urgency: medium
Maintainer: Frank Lichtenheld <djpig@debian.org>
Date: Sun, 12 Jan 2008 15:49:19 +0100
Closes: 1111111 2222222
+Launchpad-Bugs-Fixed: 12345 424242
Changes:
fields (2.0-1) unstable frozen; urgency=medium
.
[ Frank Lichtenheld ]
* Upload to unstable (Closes: #1111111, #2222222)
+ * Fix stuff. (LP: #12345, #424242)
.
[ Raphael Hertzog ]
* New upstream release.
@@ -276,11 +281,11 @@ Xb-Userfield2: foobar
"get_timestamp");
my @items = $data[1]->get_change_items();
is($items[0], " [ Frank Lichtenheld ]\n", "change items 1");
- is($items[3], " * New upstream release.
+ is($items[4], " * New upstream release.
- implements a
- implements b
", "change items 2");
- is($items[4], " * Update S-V.\n", "change items 3");
+ is($items[5], " * Update S-V.\n", "change items 3");
}
SKIP: {
diff -pruN 1.15.5.6/src/configure.c 1.15.5.6ubuntu1/src/configure.c
--- 1.15.5.6/src/configure.c 2010-01-08 17:23:06.000000000 +0000
+++ 1.15.5.6ubuntu1/src/configure.c 2010-02-14 01:40:27.000000000 +0000
@@ -339,11 +339,12 @@ deferred_configure(struct pkginfo *pkg)
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 = eflag_ok;
post_postinst_tasks(pkg, stat_installed);
Reply to: