Merge last changes from apt--main--0.

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index ad3d0f66e373669e1c97f4342359b8bb45968529..4cf7ea40ae0be04836985e76fe64c4c03ef9e2a6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,21 @@
+apt (0.6.36os1) unstable; urgency=low
+
+   * Resync with apt--main--0--patch-71.
+     [ This include the DDTP support for testing propose, report bugs
+     directly to me ]
+
+ -- Otavio Salvador <otavio@debian.org>  Thu,  7 Apr 2005 21:16:46 -0300
+
 apt (0.6.36) experimental; 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
+  * 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