summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog15
1 files changed, 8 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index ad3d0f66e..87e713d3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
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