The following commit has been merged in the master branch:
commit 03b4300e51cec35e49e38aef14d72acb6adea6bb
Merge: 7444c878aa6a0adabec28800f5015a33239e45a5
4aed1d728958584769d469540e9ae6103e13d424
Author: Guillem Jover <guil...@debian.org>
Date: Sat Jul 31 04:39:19 2010 +0200
Merge branch 'sid' (through tag '1.15.8.2')
Conflicts:
debian/changelog
diff --combined debian/changelog
index aea3542,0dcc00e..f93936d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,15 +1,28 @@@
+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.2) unstable; urgency=low
+
+ * Bump libdpkg-perl Depends on dpkg to 1.15.8, as it will break dpkg
+ versions before that when installing and removing libdpkg-perl,
+ because older update-alternatives and dpkg-divert require Dpkg.pm and
+ Dpkg/Gettext.pm which will disappear due to the Replaces. Closes: #590867
+ Thanks to Sven Joachim <svenj...@gmx.de> for the analysis.
+ * Allow specifying again absolute and relative paths for dpkg-buildpackage
+ -r option. Closes: #591010
+
+ -- Guillem Jover <guil...@debian.org> Sat, 31 Jul 2010 04:20:01 +0200
+
dpkg (1.15.8.1) unstable; urgency=low
* Fix off-by-one error in update-alternatives that lead to an infinite loop
--
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
