The following commit has been merged in the master branch:
commit f0525ce3409b3dc5422a5b0c5cc28197c55cb015
Merge: 939b0c0f90d145dda2918beec6bfb48694528503
30f797c7c1fa1bac2388e47d1c28302804a9c53b
Author: Guillem Jover <[email protected]>
Date: Fri Jul 10 12:12:03 2009 +0200
Merge branch 'sid' (through tag '1.15.3.1')
Conflicts:
configure.ac
debian/changelog
diff --combined debian/changelog
index a78a768,8a36277..dc85d13
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,39 -1,10 +1,46 @@@
+dpkg (1.15.4) UNRELEASED; urgency=low
+
+ [ Guillem Jover ]
+ * Call _g instead of g_ in dpkg-name.
+ * Fix inverted logic when deciding to assume the architecture in dpkg-name
+ when the package didn't have such field.
+ * Do not take into account Revision and Package_Revision fields in dpkg-name
+ and dpkg-scanpackages as they have been handled already by “dpkg-deb -I”.
+ * Switch dpkg-scansources to use Dpkg::Cdata instead of duplicating the
+ .dsc parsing code. As a side effect it now handles properly bogus files.
+ * Do not remap obsolete fields in dpkg-scanpackages as they have been
+ handled already by “dpkg-deb -I”.
+
+ [ Raphael Hertzog ]
+ * Replace install-info by a wrapper around GNU's install-info. The wrapper
+ will be dropped in squeeze+1. dpkg now Breaks: old versions of
+ info-browsers that do not depend on the new install-info package
+ that provides the real functionality. Closes: #9771, #523980
+ See http://wiki.debian.org/Transitions/DpkgToGnuInstallInfo for details.
+ * Fix dpkg's preinst in case /var/lib/dpkg/alternatives contains unexpected
+ sub-directories. Closes: #535138
+ * Upgrade Standards-Version to 3.8.2 (no changes).
+
+ [ Updated dpkg translations ]
+ * Asturian (Marcos Alvarez Costales). Closes: #535327
+ * French (Christian Perrier).
+ * German (Sven Joachim).
+
+ [ Updated man page translations ]
+ * German (Helge Kreutzmann), proofreading by Jens Seidel.
+
+ [ Updated scripts translations ]
+ * German (Helge Kreutzmann).
+
+ -- Guillem Jover <[email protected]> Sat, 27 Jun 2009 19:25:30 +0200
+
+ dpkg (1.15.3.1) unstable; urgency=low
+
+ [ Modestas Vainius ]
+ * Fix wildcard support in symbol files. Closes: #536034
+
+ -- Guillem Jover <[email protected]> Wed, 08 Jul 2009 11:26:36 +0200
+
dpkg (1.15.3) unstable; urgency=low
[ Guillem Jover ]
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
