The following commit has been merged in the master branch:
commit 1e93ee6fac346aecc0a0aa307931284a5d8f5395
Merge: 66abf29395eea02e861ed41cd43092c6a29d6d45
41d56b350b196aaca09d3901741aaada1138e862
Author: Christian Perrier <[email protected]>
Date: Wed Aug 19 08:53:45 2009 +0200
Merged changes
diff --combined debian/changelog
index f61e6a1,8d9e386..4d6e0de
--- a/debian/changelog
+++ b/debian/changelog
@@@ -12,7 -12,7 +12,7 @@@ dpkg (1.15.4) UNRELEASED; urgency=lo
handled already by “dpkg-deb -I”.
* Properly mark packages being purged for disappearance from the database.
This will make the status database not be left behind with traces of old
- not-installed packages.
+ not-installed packages. Closes: #472208
* On parse mark not-installed leftover packages for automatic removal from
the database on next dump. This obsoletes the --forget-old-unavail option,
thus making it now a no-op. Closes: #33394, #429262
@@@ -26,6 -26,11 +26,11 @@@
* Add uClibc Linux support to ostable and triplettable. Closes: #455501
* Add uClinux support to ostable and triplettable.
Thanks to Simon Richter <[email protected]>.
+ * When aborting due to file conflicts print the version of the conflicted
+ package. Closes: #540019
+ * Remove double slash in database path visible to the user in some error
+ conditions.
+ * Stop macthing sparc64-*-* GNU triplets with sparc Debian architecture.
[ Raphael Hertzog ]
* Replace install-info by a wrapper around GNU's install-info. The wrapper
@@@ -44,6 -49,31 +49,31 @@@
Closes: #537800
* Fix update-alternatives to mention the correct slave link that can't
be installed due to a conflicting file instead of quoting the master link.
+ * Add support for extra override file in dpkg-scanpackages. Thanks to Robert
+ Millan for the patch. Closes: #537559
+ * Add support for extra override file in dpkg-scansources.
+ * Document format of extra override file in a new manual page
+ deb-extra-override(5).
+ * Update sample in dpkg-gensymbols(1) to give an accurate listing of
+ 64 bit arches. Thanks to Julien Cristau for the patch. Closes: #540382
+ * Create /etc/cron.daily/dpkg to handle the backup of
+ /var/lib/dpkg/status in /var/backups. This is taken out of the cron
+ package and need no conflicts/breaks as the code does nothing if
+ the current status file is already backupped. Thanks to Leo 'costela'
+ Antunes <[email protected]> for the patch. Closes: #541412
+ * Change behaviour of dpkg --merge-avail to not update a package's
+ information if the version provided is older than the one already listed
+ in the available file. Thanks to Ian Jackson
+ <[email protected]> for the patch. Closes: #496114
+ * dpkg-architecture can now export DEB_{HOST,BUILD}_ARCH_{BITS,ENDIAN}
+ (pointer size and endianness):
+ - cputable (in dpkg) modified to contain those information
+ - dpkg-dev depends on dpkg (>= 1.15.4) to ensure that we have an updated
+ cputable (and so that a versioned build-dependency on dpkg-dev is enough
+ to use this new feature)
+ Closes: #531307
+ * Split overly long Binary: field values over multiple lines. This is
+ allowed since policy 3.8.3. Closes: #494714
[ Modestas Vainius ]
* Provide a meaningful label for dpkg-gensymbols diff.
@@@ -53,23 -83,20 +83,23 @@@
* French (Christian Perrier).
* German (Sven Joachim).
* Italian (Milo Casagrande). Closes: #536538
+ * Russian (Yuri Kozlov). Closes: #542254
* Slovak (Ivan Masár). Closes: #537742
* Swedish (Peter Krefting).
[ Updated dselect translations ]
+ * Russian (Yuri Kozlov). Closes: #542254
* Slovak (Ivan Masár). Closes: #537741
[ Updated man page translations ]
- * German (Helge Kreutzmann), proofreading by Jens Seidel.
* French completed (Christian Perrier).
+ * German (Helge Kreutzmann), proofreading by Jens Seidel.
* Swedish (Peter Krefting).
[ Updated scripts translations ]
* French completed (Christian Perrier).
* German (Helge Kreutzmann).
+ * Russian (Yuri Kozlov). Closes: #542254
* Swedish (Peter Krefting).
-- Guillem Jover <[email protected]> Sat, 27 Jun 2009 19:25:30 +0200
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
