The following commit has been merged in the master branch:
commit d00d44020b882cefb0f1cd4b110725750a7b4bf0
Merge: cfd9a24ed19ce0e395c7dd0b3a26176af608733a 
0d03dd4a12e4f860baf36b46f0dc890a4079d26a
Author: Raphaël Hertzog <[email protected]>
Date:   Fri Nov 25 12:06:19 2011 +0100

    Merge commit '1.16.1.2'
    
    Conflicts:
        scripts/mk/architecture.mk

diff --combined debian/changelog
index d244605,d507be7..37a52ef
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,85 -1,17 +1,99 @@@
 +dpkg (1.16.2) UNRELEASED; urgency=low
 +
 +  [ Guillem Jover ]
 +  * Move <config.h> and <compat.h> to the top of trigdeferred.l to properly
 +    use the configured features and compat code.
 +  * Honour --disable-nls when the system lacks obstack support, by updating
 +    the obstack compat module from gnulib.
 +  * Link the libdpkg unit tests with libcompat and libintl, so that systems
 +    needing them will compile correctly.
 +  * Check for the presence of the strnlen declaration and correctly provide
 +    the compat one in case the systems lacks it.
 +  * Do not assume existence of paths on the build system in the test suite.
 +  * Do not fail to link dselect on MacOS X when using --disable-nls.
 +  * Remove versioned coreutils Pre-Depends from dpkg due to the ancient
 +    md5sum transition. Reported by Bill Allombert <[email protected]>.
 +    Closes: #643746
 +  * Change dpkg-architecture to only compute the requested variables. This:
 +    - Fixes the bootstrapping problem, as the dpkg build system only needs
 +      the host architecture, for which dpkg itself is not required.
 +    - Reduces the amount of work performed, including loading and parsing
 +      unnecessary table files or calling either of gcc or dpkg programs.
 +  * Improve error message in dpkg-gencontrol and dpkg-gensymbols when
 +    debian/control does not have any package stanza. Closes: #642473
 +    Based on a patch by Kyle Willmon <[email protected]>.
 +  * Add Pre-Depends on tar >= 1.23 (satisfied in stable) to dpkg due to it
 +    using the ‘--warning=no-timestamp’ option. Closes: #642802
 +  * Do not segfault on GNU/Linux when dpkg cannot retrieve the block size
 +    for the filesystem containing the info database. LP: #872734
 +  * Fix two memory leaks per tar entry in the tar extractor used on unpack.
 +  * Mark dpkg and dselect as Multi-Arch foreign.
 +    Reported by Steve Langasek <[email protected]>.
 +  * Mark dpkg-dev and libdpkg-perl as Multi-Arch foreign. Closes: #648217
 +    Thanks to Colin Watson <[email protected]>.
 +  * Add new deb-origin.5 man page. Closes: #608884
 +    Thanks to Matt Kraai <[email protected]>.
 +  * Return correct status on start-stop-daemon --status when using --pidfile.
 +  * Treat dpkg-deb compression level independently for each backend. This
 +    has the effect of changing the current behaviour for level 0 on all
 +    compressors except gzip.
 +  * Add new dpkg-deb -S option to specify the compression strategy. The only
 +    currently supported value is “extreme” for xz. Closes: #647915
 +
 +  [ Raphaël Hertzog ]
 +  * Update Dpkg::Shlibs to look into multiarch paths when cross-building
 +    too. Closes: #595144
 +  * Rewrite architecture.mk with explicit loops instead of duplicating many
 +    similar lines. Based on a patch by Thorsten Glaser <[email protected]>.
 +  * Modify dpkg-gencontrol and dpkg-distaddfile to grab a write lock
 +    on debian/control before updating debian/files to avoid simultaneous
 +    updates. Closes: #642608
 +    Add libfile-fcntllock-perl to dpkg-dev's Depends since we use this module
 +    to handle the locking.
 +  * Update dpkg-gensymbols(1) to clarify that -e accepts shell patterns
 +    expansions and not regular expressions. And let dpkg-gensymbols output a
 +    warning when a pattern doesn't match any file. Closes: #649248
 +  * Add new option "-a <arch>" to dpkg-checkbuilddeps to check build
 +    dependencies for another architecture. This is really basic for now since
 +    it assumes all build dependencies must be satisfied on the listed
 +    architecture. Closes: #648180 Thanks to Colin Watson for the patch.
 +
 +  [ Jonathan Nieder ]
 +  * Bump po4a version in Build-Depends to 0.41, since earlier versions do
 +    not handle --srcdir correctly. Closes: #644370
 +
 +  [ Updated dpkg translations ]
 +  * German (Sven Joachim).
 +  * Italian (Milo Casagrande). Closes: #627832
 +  * Swedish (Peter Krefting).
 +
 +  [ Updated scripts translations ]
 +  * German (Helge Kreutzmann).
 +  * Spanish (Omar Campagne). Closes: #636238
 +  * Swedish (Peter Krefting).
 +
 +  [ Updated man page translations ]
 +  * German (Helge Kreutzmann), and typo fix in dpkg-genchanges. Closes: 
#646496
 +  * Japanese (TAKAHASHI Motonobu).
 +  * Spanish (Omar Campagne). Closes: #643969
 +  * Swedish (Peter Krefting).
 +
 + -- Helge Kreutzmann <[email protected]>  Fri, 23 Sep 2011 17:29:38 +0200
 +
+ dpkg (1.16.1.2) unstable; urgency=medium
+ 
+   [ Raphaël Hertzog ]
+   * Fix another typo to correctly set DEB_*_ARCH_BITS in architecture.mk.
+   * Set urgency to medium as changes are minor, and it should migrate
+     quickly in case 1.16.2 comes soon.
+ 
+   [ Jonathan Nieder ]
+   * Update dpkg-buildflags(1) to note that the processor option
+     -D_FORTIFY_SOURCE=2 is set in CPPFLAGS now instead of CFLAGS and
+     CXXFLAGS. Closes: #646073
+ 
+  -- Raphaël Hertzog <[email protected]>  Fri, 25 Nov 2011 11:18:30 +0100
+ 
  dpkg (1.16.1.1) unstable; urgency=low
  
    [ Raphaël Hertzog ]

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to