X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/e8044cfac86e388d2b894d497be256b82bda52d6..6e93338295f53238bd352424939dd97711c2cbd4:/debian/changelog?ds=sidebyside

diff --git a/debian/changelog b/debian/changelog
index 2b093b0dc..87e713d3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,29 @@
-apt (0.6.35) hoary; urgency=low
+apt (0.6.36) experimental; 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 (incorporates 0.6.34ubuntu1):
     - Implement MaxSize and MaxAge in apt.cron.daily, to prevent the cache
       from growing too large (Ubuntu #6761)
+    - some comments about the pkgAcqMetaSig::Custom600Headers() added
+    - use gpg --with-colons
+    - commented the ftp no_proxy unseting in methods/ftp.cc
+    - added support for "Acquire::gpgv::options" in methods/gpgv.cc
+  * Merge bubulle@debian.org--2005/apt--main--0
+    - Make capitalization more consistent
+    - Un-fuzzy translations resulting from capitalization changes
+    - Italian translation update
 
  -- Matt Zimmerman <mdz@ubuntu.com>  Mon,  7 Mar 2005 20:08:33 -0800