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!)

diff --combined debian/apt.cron.daily
index 0128e0194dfd56e69e7a6b5de2b23b03d4149925,5145a5d2f52707b1fe888837f8cc98a81bcd826f..1d830260b82c50f9b2e6859bd4abb268c61ebc4b
--- 1/debian/apt.cron.daily
--- 2/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@@ -69,57 -69,12 +69,57 @@@ update_stamp(
  
  
  
 +# we check here if autoclean was enough sizewise
 +check_size_constraints()
 +{
 +    # min-age in days
 +    MaxAge=0
 +    MaxSize=0
 +    CacheDir="var/cache/apt"
 +    CacheArchive="archives/"
 +    eval $(apt-config shell MaxAge APT::Archives::MaxAge)
 +    eval $(apt-config shell MaxSize APT::Archives::MaxSize)
 +    eval $(apt-config shell CacheDir Dir::Cache)
 +    eval $(apt-config shell CacheArchive Dir::Cache::archives)
 +
 +    # sanity check
 +    if [ -z "$CacheDir" -o -z "$CacheArchive" ]; then
 +      echo "empty Dir::Cache or Dir::Cache::archives, exiting"
 +      exit
 +    fi
 +    Cache="/"$CacheDir$CacheArchive
 +
 +    # check age
 +    if [ ! $MaxAge -eq 0 ]; then
 +      find $Cache -name "*.deb"  -mtime +$MaxAge -print0 | xargs -r -0 rm -f
 +    fi
 +    
 +    # check size
 +    if [ ! $MaxSize -eq 0 ]; then
 +      # reverse-sort by mtime
 +      for file in $(ls -rt $Cache/*.deb); do 
 +          du=$(du -s $Cache)
 +          size=${du%%/*}
 +          # check if the cache is small enough
 +          if [ $size -lt $MaxSize ]; then
 +              break
 +          fi
 +          # delete oldest file
 +          rm -f $file
 +      done
 +    fi
 +}
 +
 +check_size_constraints
 +
 +
 +
  # we check here if autoclean was enough sizewise
  check_size_constraints()
  {
      # min-age in days
      MaxAge=0
-     MinAge=1
+     MinAge=2
      MaxSize=0
      CacheDir="var/cache/apt"
      CacheArchive="archives/"
@@@ -218,7 -173,6 +218,7 @@@ f
  AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp
  if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then
      apt-get -qq autoclean
 +    check_size_contrains
      update_stamp $AUTOCLEAN_STAMP
  fi
  

diff --combined debian/changelog
index 2b093b0dccbb3f2d700646c6c516bcaa0563d5fb,a6886490cd7d1ef6c1c1c51799488d03d13a99e1..1071d0b24b01bdb0687c57e406a2cab739a5b95a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,29 +1,21 @@@
+ 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 (incorporates 0.6.34ubuntu1):
 +  * Merge apt--mvo--0:
      - Implement MaxSize and MaxAge in apt.cron.daily, to prevent the cache
        from growing too large (Ubuntu #6761)
 -    - some comments about the pkgAcqMetaSig::Custom600Headers() added
 -    - use gpg --with-colons
 -    - commented the ftp no_proxy unseting in methods/ftp.cc
 -    - added support for "Acquire::gpgv::options" in methods/gpgv.cc
 -  * Merge bubulle@debian.org--2005/apt--main--0
 -    - Make capitalization more consistent
 -    - Un-fuzzy translations resulting from capitalization changes
 -    - Italian translation update
  
   -- Matt Zimmerman <mdz@ubuntu.com>  Mon,  7 Mar 2005 20:08:33 -0800
  

diff --combined po/apt-all.pot
index f0dfad50a69476fb93945ea922e3a267a762bc22,b9232cac436c22bf8def9583d555b39868cb4278..311c47fdc3df72ae0facf0595f9ad53f6d195484
--- 1/po/apt-all.pot
--- 2/po/apt-all.pot
+++ b/po/apt-all.pot
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2005-04-06 13:03+0200\n"
 +"POT-Creation-Date: 2005-03-29 07:17+0200\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@@ -2251,31 -2251,31 +2251,31 @@@ msgstr "
  msgid "rename failed, %s (%s -> %s)."
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+ #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
  msgid "MD5Sum mismatch"
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:708
+ #: apt-pkg/acquire-item.cc:714
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
  "to manually fix this package. (due to missing arch)"
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:761
+ #: apt-pkg/acquire-item.cc:767
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
  "manually fix this package."
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:797
+ #: apt-pkg/acquire-item.cc:803
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:884
+ #: apt-pkg/acquire-item.cc:890
  msgid "Size mismatch"
  msgstr ""