summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Zimmerman <matt.zimmerman@canonical.com>2005-04-06 16:46:20 +0000
committerMatt Zimmerman <matt.zimmerman@canonical.com>2005-04-06 16:46:20 +0000
commitea8704883049f180ca1c5607f1de0118b7d86c60 (patch)
tree88b3798f2e195d6bf547114a75aba31e2e362d50
parent3e79ad48cd780defe869c6caf47dd338a9f5b984 (diff)
Update changelog
-rw-r--r--debian/changelog19
1 files changed, 10 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index a30b64f3c..a6886490c 100644
--- 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