Sync with apt@packages.debian.org/apt--main--0--patch-74

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 3059f245c145f802087b1f6467a1d65ab046ffd0..974ba5ec78c8af2319100104e55d42c7a47fed2f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,11 +6,21 @@ apt (0.6.35os1) unstable; urgency=low
 
  -- Otavio Salvador <otavio@debian.org>  Wed, 23 Mar 2005 17:19:28 -0300
 
+apt (0.6.36) hoary; urgency=low
+
+  * 
+
+ -- Matt Zimmerman <mdz@ubuntu.com>  Sat, 26 Mar 2005 08:27:23 -0800
+
 apt (0.6.35) hoary; urgency=low
 
-  * Merge apt--mvo--0:
+  * 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
 
  -- Matt Zimmerman <mdz@ubuntu.com>  Mon,  7 Mar 2005 20:08:33 -0800