Merge with Michael

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 6b858cdcde162ae4e96696bf3053965eb3e213f1..a4e4030300135a7e4f1b3dc01d661ef0c48c800e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+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: