diff options
| author | Christian Perrier <bubulle@debian.org> | 2005-04-10 08:44:52 +0000 |
|---|---|---|
| committer | Christian Perrier <bubulle@debian.org> | 2005-04-10 08:44:52 +0000 |
| commit | b0df1de1a426b65a4c0cdcc81d00d83792620f2b (patch) | |
| tree | 27252f763b64bf472c003d9cb53e997032dcd69e /debian | |
| parent | a1f950b7f503003077441e313178153c17a1a3f2 (diff) | |
| parent | ea8704883049f180ca1c5607f1de0118b7d86c60 (diff) | |
Merge with Matt
Patches applied:
* apt@packages.debian.org/apt--main--0--patch-77
Merge apt--mvo--0
* apt@packages.debian.org/apt--main--0--patch-78
Update changelog
* 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 | 13 |
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: |