The following commit has been merged in the master branch: commit 3b92f3e93a42387026a59081f0eaa8005abcbfef Merge: 10df436ba35393ae904a0743ebdc538ab67c0f5b 03ea6d848f9d81cbe706d643f9b0b582fb52af40 Author: Christian PERRIER <bubu...@debian.org> Date: Mon Jul 2 15:55:59 2012 -0400
Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg diff --combined debian/changelog index 001f96c,0dbac74..74d3d44 --- a/debian/changelog +++ b/debian/changelog @@@ -1,8 -1,18 +1,18 @@@ - dpkg (1.16.7) UNRELEASED; urgency=low + dpkg (1.16.8) UNRELEASED; urgency=low + + * + + -- Raphaël Hertzog <hert...@debian.org> Mon, 02 Jul 2012 21:37:00 +0200 + + dpkg (1.16.7) unstable; urgency=low [ Guillem Jover ] * Fix bogus dpkg-query --control-show badusage() strings. + [ Raphaël Hertzog ] + * Fix dpkg-gencontrol to correctly compute the source version + in the case of "old-style" bin-nmus. Closes: #679959 + [ Updated dselect translations ] * Catalan (Guillem Jover). * French (Christian Perrier). @@@ -10,19 -20,18 +20,20 @@@ * Swedish (Peter Krefting). [ Updated programs translations ] - * Italian (Milo Casagrande). * French (Christian Perrier). + * German (Sven Joachim). + * Italian (Milo Casagrande). * Swedish (Peter Krefting). [ Updated man page translations ] * Swedish (Peter Krefting). + * French (Christian Perrier). [ Updated scripts translations ] * Swedish (Peter Krefting). + * French (Christian Perrier). - -- Guillem Jover <guil...@debian.org> Sat, 30 Jun 2012 22:17:55 +0200 + -- Raphaël Hertzog <hert...@debian.org> Mon, 02 Jul 2012 21:16:12 +0200 dpkg (1.16.6) unstable; urgency=low -- 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