The following commit has been merged in the master branch:
commit cbde7fa861fa6851cdbc56ae70b73332ab9db935
Merge: 140527fc6129f0e4f2a7c64f28d8d19fe5e60b3f 
bd1d6cd247f8e5eb7f2465c0d686cba363c64a57
Author: Guillem Jover <guil...@debian.org>
Date:   Wed May 4 11:00:11 2011 +0200

    Merge branch 'sid' (through tag '1.16.0.3')
    
    Conflicts:
        debian/changelog

diff --combined debian/changelog
index bc414e9,db016b3..5934c8e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,68 -1,10 +1,75 @@@
 +dpkg (1.16.1) UNRELEASED; urgency=low
 +
 +  [ Raphaël Hertzog ]
 +  * Dpkg::Deps: Implement new "reset" method and bump module version to 1.01
 +    due to this.
 +  * Improved description of --search in dpkg-query(1). Closes: #621066
 +    Thanks to Lars Buitinck <larsm...@gmail.com> for the patch.
 +  * Let update-alternatives fsync() its administrative files before
 +    moving them in place to avoid empty files with some filesystems.
 +    LP: #344019
 +  * Tighten the regexp used by dpkg-source to ignore the .pc directory of
 +    quilt. Thanks to Mike Hommey for noticing the problem.
 +
 +  [ Guillem Jover ]
 +  * Install deb-src-control(5) man pages in dpkg-dev. Closes: #620520
 +  * Add ‘.gitmodules’ to the default dpkg-source ignore lists. Closes: #620490
 +  * Document in dpkg-query(1) man page that on --listfiles each list of
 +    files per package name is separated by a blank line. Same goes for
 +    --status and --print-avail.
 +  * Use execvp(3) unconditionally in command_exec(). Making the call always
 +    fallback to use the system shell in case of error, such as with empty
 +    maintainer scripts. Thanks to Jonathan Nieder <jrnie...@gmail.com>.
 +    Closes: #622094
 +  * Improve deb-split(5) format description by splitting debian-split
 +    member contents into a list.
 +  * Switch to debhelper compatibility level 7.
 +    - Use dh_prep instead of deprecated “dh_clean -k”.
 +  * Bump Standards-Version to 3.9.2 (no changes needed).
 +  * Generate filenames following current conventions on “dpkg-split --join”,
 +    by including the architecture in the debian-split member of a split
 +    package and using underscores to separate filename parts.
 +  * Support conffiles with spaces when diffing them. Closes: #147583
 +  * Allow installing packages with bogus versions with new
 +    --force-bad-version.
 +  * Do not fail when unpacking a diverted hardlink. Closes: #245322
 +    Based on a patch by Christopher Baines <cbain...@gmail.com>.
 +  * Document in dpkg-deb(1) that --fsys-tarfile will always process the
 +    input archive sequentially. Closes: #616609
 +  * Remove long non-functional --new and --old dpkg-deb option handling
 +    from dpkg which were being treated as dpkg commands.
 +  * Remove reference to --nocheck dpkg-deb option from dpkg man page as
 +    the latter does not pass it to the former.
 +  * Clarify the current dpkg behaviour when running the dpkg-deb and
 +    dpkg-query back-ends, of not passing through back-end specific options
 +    when running them from dpkg. Closes: #610940
 +  * Use “unselected” as an adjective in dpkg output messages instead of
 +    “deselected”. Closes: #231089
 +  * Clarify exit status in dpkg-split and start-stop-daemon --help output.
 +  * Clarify “EXIT STATUS” section in man pages by using a table.
 +  * Add a --status command to start-stop-daemon returning LSB Init Script
 +    status action exit codes.
 +  * Add start-stop-daemon process name kernel limits for Solaris, NetBSD,
 +    OpenBSD, FreeBSD and Darwin.
 +
 +  [ Updated dpkg translations ]
 +  * German (Sven Joachim). Closes: #620312
 +
 +  [ Updated man page translations ]
 +  * German (Helge Kreutzmann).
 +
 +  [ Updated scripts translations ]
 +  * German (Helge Kreutzmann).
 +
 + -- Raphaël Hertzog <hert...@debian.org>  Sat, 02 Apr 2011 09:21:26 +0200
 +
+ dpkg (1.16.0.3) unstable; urgency=medium
+ 
+   * Allow again Priority field values not known to dpkg. Regression
+     introduced in 1.16.0.
+ 
+  -- Guillem Jover <guil...@debian.org>  Wed, 04 May 2011 10:01:30 +0200
+ 
  dpkg (1.16.0.2) unstable; urgency=high
  
    * Fix dpkg-split --auto to not fail when opening the new depot file.

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to