The following commit has been merged in the master branch: commit f56c9fc6a07f609a122696c463c25caf4ebd36ff Merge: 03b4300e51cec35e49e38aef14d72acb6adea6bb 624aa0fadb9daf2757563197fa376b8223d11f2d Author: Guillem Jover <guil...@debian.org> Date: Mon Aug 2 10:53:35 2010 +0200
Merge branch 'sid' (through tag '1.15.8.3') Conflicts: debian/changelog diff --combined debian/changelog index f93936d,1e4f02c..c79469d --- a/debian/changelog +++ b/debian/changelog @@@ -1,16 -1,18 +1,31 @@@ +dpkg (1.15.9) UNRELEASED; urgency=low + + [ Guillem Jover ] + * Fix realloc usage on compat scandir() implementation. + + [ Updated man page translations ] + * German (Helge Kreutzmann). + + [ Updated scripts translations ] + * German (Helge Kreutzmann). + + -- Guillem Jover <guil...@debian.org> Thu, 29 Jul 2010 11:00:22 +0200 + + dpkg (1.15.8.3) unstable; urgency=low + + [ Raphaƫl Hertzog ] + * Fix dpkg-divert test suite to cope with + and other special characters for + regexps in the build directory name. Thanks to Jonathan Nieder for the + patch and to Phil Kern for the report. Closes: #591182 + + [ Guillem Jover ] + * Fix buffer overflow in dpkg_ar_member_put_header causing it to write the + header to fd 0 (instead of ar_fd) depending on the stack layout, affecting + armel. Thanks to Phil Kern for the analysis and Reinhard Tartler for the + initial patch. Closes: #591312 + + -- Guillem Jover <guil...@debian.org> Mon, 02 Aug 2010 10:38:07 +0200 + dpkg (1.15.8.2) unstable; urgency=low * Bump libdpkg-perl Depends on dpkg to 1.15.8, as it will break dpkg -- 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