* merged with apt--mvo

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 932ac592f6e85138f2914b79131ef2ad36ef133a..9e9b46ab9c36a9ebd16290465bea3f857f0695b8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,32 @@
+apt (0.6.42.3) unstable; urgency=low
+
+  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-129:
+    - patch-118: Russian translation update by Yuri Kozlov (closes: #335164)
+    - patch-119: add update-po as a pre-req for binary (closes: #329910)
+    - patch-121: Complete French translation
+    - patch-125: Fixed localization of y/n questions in German translation 
+                 (closes: #337078)
+    - patch-126: Swedish translation update (closes: #337163)
+    - patch-127: Complete Tagalog translation (closes: #337306)
+    - patch-128: Danish translation update (closes: #337949)
+    - patch-129: Basque translation update (closes: #338101)
+  * cmdline/apt-get.cc:
+    - bufix in FindSrc  (closes: #335213, #337910)
+  * added armeb to archtable (closes: #333599)
+  * with --allow-unauthenticated use the old fallback behaviour for
+    sources (closes: #335112)
+   
+ -- Michael Vogt <mvo@debian.org>  Wed,  9 Nov 2005 07:22:31 +0100
+
+apt (0.6.42.2) unstable; urgency=high
+
+  * NMU (approved by maintainer)
+  * Add AMD64 archive signing key to debian-archive.gpg (closes: #336500).
+  * Add big-endian arm (armeb) support (closes: #333599).
+  * Priority high to get the AMD key into testing ASAP.
+
+ -- Frans Pop <fjp@debian.org>  Sun, 30 Oct 2005 21:29:11 +0100
+ 
 apt (0.6.42.1) unstable; urgency=low
 
   * fix a incorrect example in the apt_prefrences man page
@@ -5,6 +34,8 @@ apt (0.6.42.1) unstable; urgency=low
   * apt-pkg/pkgrecords.cc:
     - revert patch from last version, it causes trouble on alpha 
       and ia64 (closes: #335102, #335103)
+  * cmdline/apt-get.cc:
+    - be extra carefull in FindSrc (closes: #335213)
 
  -- Michael Vogt <mvo@debian.org>  Sat, 22 Oct 2005 23:44:35 +0200