From: Michael Vogt Date: Mon, 17 Oct 2005 15:15:19 +0000 (+0000) Subject: * merged with apt--mvo--0 X-Git-Tag: 0.7.21~284^2~50 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/80ada697b4aae3d41ba85fa365ee9b8b77387f06?hp=-c * merged with apt--mvo--0 Patches applied: * bubulle@debian.org--2005/apt--main--0--patch-105 Proofread by Fred Bothamy * bubulle@debian.org--2005/apt--main--0--patch-106 Merge with mvo * bubulle@debian.org--2005/apt--main--0--patch-107 Italian translation corrected * bubulle@debian.org--2005/apt--main--0--patch-108 Italian translation update * bubulle@debian.org--2005/apt--main--0--patch-109 Italian translation completed * bubulle@debian.org--2005/apt--main--0--patch-110 Swedish translation update * bubulle@debian.org--2005/apt--main--0--patch-111 Merge with Michael * bubulle@debian.org--2005/apt--main--0--patch-112 Swedish translation completed * bubulle@debian.org--2005/apt--main--0--patch-113 Silly update to French translation (testing) * bubulle@debian.org--2005/apt--main--0--patch-114 Basque translation update * bubulle@debian.org--2005/apt--main--0--patch-115 Basque translation completed * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-64 * merged with bubulle --- 80ada697b4aae3d41ba85fa365ee9b8b77387f06 diff --combined debian/changelog index 5e3e6f153,28152fa0a..064d240b5 --- a/debian/changelog +++ b/debian/changelog @@@ -5,10 -5,13 +5,13 @@@ apt (0.6.41.1) unstable; urgency=lo * allow cdrom failures and fallback to other sources in that case (closes: #44135) * better error text when dpkg-source fails - * Merge bubulle@debian.org--2005/apt--main--0 up to patch-104: + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-115: - patch-99: Added Galician translation - patch-100: Completed Danish translation (Closes: #325686) - patch-104: French translation completed + - patch-109: Italian translation completed + - patch-112: Swedish translation update + - patch-115: Basque translation completed * applied french man-page update (thanks to Philippe Batailler) (closes: #316318, #327456) * fix leak in the mmap code, thanks to Daniel Burrows for the @@@ -98,7 -101,6 +101,7 @@@ apt (0.6.38) unstable; urgency=lo -- Matt Zimmerman Sat, 25 Jun 2005 09:51:00 -0700 +>>>>>>> MERGE-SOURCE apt (0.6.37) breezy; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81