Update changelog

diff --git a/debian/changelog b/debian/changelog
index 6f4796489c78540cc3474406fcc23e0c66d15027..f20dcc31361ea5e15d3422f20f082501a066677b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,12 @@
-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
 
 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)
     - 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
 
 
  -- Matt Zimmerman <mdz@ubuntu.com>  Mon,  7 Mar 2005 20:08:33 -0800