diff options
| author | Otavio Salvador <otavio@debian.org> | 2005-04-08 00:21:06 +0000 |
|---|---|---|
| committer | Otavio Salvador <otavio@debian.org> | 2005-04-08 00:21:06 +0000 |
| commit | b2869b22be57f9243eec6ef1abe118a0252b7172 (patch) | |
| tree | 374ddbd4acf6d28ed6c9cce9d8130fcf067ef1db /debian | |
| parent | 035df853656f57238ccb59a42e4602c39661df25 (diff) | |
| parent | ea8704883049f180ca1c5607f1de0118b7d86c60 (diff) | |
Sync with apt--main--0--patch-78
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 | 17 |
2 files changed, 16 insertions, 3 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 100125392..4cdeee956 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,23 @@ -apt (0.6.35os1) unstable; urgency=low +apt (0.6.36os1) unstable; urgency=low * Resync with apt--main--0--patch-71. [ This include the DDTP support for testing propose, report bugs directly to me ] - -- Otavio Salvador <otavio@debian.org> Wed, 23 Mar 2005 17:19:28 -0300 + -- Otavio Salvador <otavio@debian.org> Thu, 7 Apr 2005 21:16:46 -0300 + +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 |