diff options
| author | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-04-06 16:44:08 +0000 |
|---|---|---|
| committer | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-04-06 16:44:08 +0000 |
| commit | 3e79ad48cd780defe869c6caf47dd338a9f5b984 (patch) | |
| tree | a05b0e6fee5624ea6a6c970a0f39487bb8078b81 /debian | |
| parent | 0edc7fba37048fa7c9833d664c4231ee9ad2be40 (diff) | |
| parent | 6ead9d25018d517cd6cfe27399b7fd7e33c1ef19 (diff) | |
Merge apt--mvo--0
Patches applied:
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-14
* changelog entry for 0.6.34ubuntu1 added, MinAge default is 2 days now
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-15
* merged with matts tree
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-16
* changelog updated
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-17
* whitespace change to add incomplete log for last patch
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-18
* honor "Acquire::gpgv::Options" in apt-cdrom too
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-19
* corrected a incorrect use of string().c_str() (thanks to mdz!)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/apt.cron.daily | 2 | ||||
| -rw-r--r-- | debian/changelog | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 7ee7e46db..5145a5d2f 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -74,7 +74,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 1820b2cbf..a30b64f3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +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 + + -- 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 (incorporates 0.6.34ubuntu1): |