Merge with Matt

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 70aa273651f07f873aee50a758c467ddbdbf1ed0..1071d0b24b01bdb0687c57e406a2cab739a5b95a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,30 @@
-apt (0.6.34) UNRELEASED; urgency=low
+apt (0.6.36) unstable; urgency=low
+
+  * Merge apt--mvo--0:
+    - apt-pkg/acquire-item.cc:
+      added "Acquire::BrokenProxy" that will force apt to always 
+      re-get the Release.gpg file (for broken proxies)
+    - debian/apt.cron.daily:
+      MinAge is defaulting to 2 days now to prevent over-aggresive removal 
+    - apt-pkg/cdrom.cc:
+      honor "Acquire::gpgv::Options" when verifying the signature (Ubuntu #8496)
+ 
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 31 Mar 2005 20:37:11 +0200
+
+apt (0.6.35) hoary; urgency=low
+
+  * Merge apt--mvo--0:
+    - Implement MaxSize and MaxAge in apt.cron.daily, to prevent the cache
+      from growing too large (Ubuntu #6761)
+
+ -- Matt Zimmerman <mdz@ubuntu.com>  Mon,  7 Mar 2005 20:08:33 -0800
+
+apt (0.6.34) hoary; urgency=low
 
   * Add missing semicolon to configure-index (Closes: #295773)
   * Update build-depends on gettext to 0.12 (Closes: #295077)
+  * Merge from bubulle@debian.org--2005/apt--main--0 to get
+    translation updates
 
  -- Matt Zimmerman <mdz@ubuntu.com>  Fri,  4 Mar 2005 16:13:15 -0800