summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/apt.cron.daily2
-rw-r--r--debian/changelog13
2 files changed, 14 insertions, 1 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 0128e0194..1d830260b 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -119,7 +119,7 @@ check_size_constraints()
{
# min-age in days
MaxAge=0
- MinAge=1
+ MinAge=2
MaxSize=0
CacheDir="var/cache/apt"
CacheArchive="archives/"
diff --git a/debian/changelog b/debian/changelog
index 2b093b0dc..1071d0b24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+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
+
apt (0.6.35) hoary; urgency=low
* Merge apt--mvo--0: