Revert changes to debian/changelog and debian/apt.cron.daily

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 8df894e16d5416c368391d31a50662c682e47288..87e713d3daa0f9cf1828335e6c75ccf3a0396876 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,9 +13,17 @@ apt (0.6.36) experimental; 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)
+    - 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