The following commit has been merged in the master branch:
commit bc79c5a9cd2409bf9886a36996b52085af39ad9b
Merge: 51c23eb12c81ed11bf7ee3357b70a92109828a6b
5e8a4ccb795c0dcff9e9ec44b908ded2484012bd
Author: Guillem Jover <guil...@debian.org>
Date: Sat Jun 9 00:13:14 2012 +0200
Merge branch 'sid' (through tag '1.16.4.1')
Conflicts:
debian/changelog
diff --combined debian/changelog
index 4cf8652,c455d30..5d85626
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+dpkg (1.16.5) UNRELEASED; urgency=low
+
+ *
+
+ -- Guillem Jover <guil...@debian.org> Fri, 08 Jun 2012 09:39:42 +0200
+
+ dpkg (1.16.4.1) unstable; urgency=low
+
+ * Fix explicit file trigger activation. Regression introduced in 1.16.4.
+ Closes: #676684
+
+ -- Guillem Jover <guil...@debian.org> Fri, 08 Jun 2012 23:17:11 +0200
+
dpkg (1.16.4) unstable; urgency=low
[ Guillem Jover ]
@@@ -61,14 -62,14 +68,14 @@@
become uninstallable. Thanks to Dominic Hargreaves <d...@earth.li>.
Closes: #675947
* Put an & before field_capitalize() calls in Dpkg::Control::Fields to
- fix a usege before declaration warning with perl 5.16. Closes: #676262
+ fix a usage before declaration warning with perl 5.16. Closes: #676262
* Do not warn in dpkg-divert on missing files list file for packages never
installed before. Closes: #673518
* Add support for liblzma to handle .xz and .lzma compressed files, and
switch to it instead of using xz-utils. This removes the xz-utils
Pre-Depends from dpkg. Thanks to Jonathan Nieder <jrnie...@gmail.com>.
* Always activate all path components for file triggers, this fixes file
- trigger handling for conffiles and dpkg-trigger invokations.
+ trigger handling for conffiles and dpkg-trigger invocations.
Closes: #675613, #676061, #676062, #676107, #676118, #676122
* Do not reset Multi-Arch field in the update log when removing the package.
Closes: #676496
--
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
