The following commit has been merged in the master branch: commit e6b7685a540c24da1f6357fe8869602d84444aee Merge: d5aedf7fdff4dfeb8d329aa45486464d4596ec7a 7627d8027482b28a40c88599be9808ce85e58a04 Author: Christian PERRIER <bubu...@debian.org> Date: Tue Jul 19 09:49:06 2011 +0200
Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg diff --combined debian/changelog index 6220f33,d6fcd5c..82d8043 --- a/debian/changelog +++ b/debian/changelog @@@ -77,6 -77,8 +77,8 @@@ dpkg (1.16.1) UNRELEASED; urgency=lo * Fix update-alternatives to not remove a real file when dropping a symlink for a slave that's not provided by the new current choice. Closes: #633627 + * Improve dpkg-source's error message complaining about the lack + of the upstream tarball. Closes: #634510 [ Guillem Jover ] * Install deb-src-control(5) man pages in dpkg-dev. Closes: #620520 @@@ -163,7 -165,6 +165,7 @@@ [ Updated dpkg translations ] * German (Sven Joachim). Closes: #620312 * Swedish (Peter Krefting). + * French (Christian Perrier). [ Updated man page translations ] * German (Helge Kreutzmann) including improvement by "Flo". @@@ -171,7 -172,6 +173,7 @@@ [ Updated scripts translations ] * German (Helge Kreutzmann). * Swedish (Peter Krefting). + * French (Christian Perrier). -- Raphaƫl Hertzog <hert...@debian.org> Sat, 02 Apr 2011 09:21:26 +0200 -- 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