Update changelog

diff --git a/debian/changelog b/debian/changelog
index a30b64f3cf038cd219454c897cd9a978f9c959c2..a6886490cd7d1ef6c1c1c51799488d03d13a99e1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-apt (0.6.35ubuntu1) hoary; urgency=low
-
-  * 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 verfiying the signature
+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