* merged from main

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 0f9b0197377059f38920d68b147b2d7b8d825ad0..c83d5e3503b125e3cb7b7a003c15755579b921ec 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,24 @@
+apt (0.6.46.4) unstable; urgency=low
+
+  * added apt-secure.8 to "See also" section
+  * apt-pkg/deb/dpkgpm.cc:
+    - added "Dpkg::StopOnError" variable that controls if apt
+      will abort on errors from dpkg
+  * apt-pkg/deb/debsrcrecords.{cc,h}:
+    - make the Buffer grow dynmaically (closes: #400874)
+  * Merged from Christian Perrier bzr branch:
+    - uk.po: New Ukrainian translation: 483t28f3u
+    - el.po: Update to 503t9f2u
+    - de.po: Updates and corrections.
+
+ --
+
 apt (0.6.46.3) unstable; urgency=low
 
+  * apt-pkg/deb/dpkgpm.cc:
+    - make progress reporting robust against multiline error
+      messages 
+
   * Merged from Christian Perrier bzr branch:
     - ca.po: Updated to 514t
     - be.po: Updated to 514t
@@ -17,7 +36,7 @@ apt (0.6.46.3) unstable; urgency=low
     - de.po: Updated to 514t.
     - en_GB.po: Updated to 514t.
 
- -- Michael Vogt <mvo@debian.org>  Mon, 30 Oct 2006 08:51:14 +0100
+ -- Michael Vogt <mvo@debian.org>  Thu,  2 Nov 2006 11:37:58 +0100
 
 apt (0.6.46.2) unstable; urgency=low