Merge with Michael

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 9ee7179d5ec21919d6a43719251de9eab70ad588..a4e4030300135a7e4f1b3dc01d661ef0c48c800e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,26 @@
-apt (0.6.41.1) unstable; urgency=low
+apt (0.6.42.2) unstable; urgency=low
+
+  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-118:
+    - patch-118: Russian translation update by Yuri Kozlov (closes: #335164)
+  * cmdline/apt-get.cc:
+    - bufix in FindSrc  (closes: #335213)
+  * added armeb to archtable (closes: #333599)
+   
+ --
+
+apt (0.6.42.1) unstable; urgency=low
+
+  * fix a incorrect example in the apt_prefrences man page
+    (thanks to Filipus Klutiero, closes: #282918)
+  * 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
+
+apt (0.6.42) unstable; urgency=low
 
   * apt-pkg/cdrom.cc:
     - unmount the cdrom when apt failed to locate any package files
@@ -17,7 +39,7 @@ apt (0.6.41.1) unstable; urgency=low
   * fix leak in the mmap code, thanks to Daniel Burrows for the
     patch (closes: #250583)
   * support for apt-get [build-dep|source] -t (closes: #152129)
-  * added "APT::Authentication::Trust-CDROM" option to make the life
+  * added "APT::Authentication::TrustCDROM" option to make the life
     for the installer people easier (closes: #334656)
   * fix crash in apt-ftparchive (thanks to Bastian Blank for the patch)
     (closes: #334671)
@@ -30,7 +52,7 @@ apt (0.6.41.1) unstable; urgency=low
     - fix some missing gettext() calls (closes: #334539)
   * doc/apt-cache.8.xml: fix typo (closes: #334714)
   
- -- 
+ -- Michael Vogt <mvo@debian.org>  Wed, 19 Oct 2005 22:02:09 +0200
 
 apt (0.6.41) unstable; urgency=low