Merge with Matt

Patches applied:

 * apt@packages.debian.org/apt--main--0--patch-79
   Merge michael.vogt@ubuntu.com--2005/apt--mvo--0

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-20
   * supress output when /var/cache/apt/archives is empty; break when min-age is reached

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-21
   * changed distro to "experimental", changed version number to 0.6.36

diff --combined debian/apt.cron.daily
index 1d830260b82c50f9b2e6859bd4abb268c61ebc4b,2d93a5ba47fc5363befc6a6a6693fa4d7aba9015..24ad6855a6e1f246bb2ffed6f08a64dab597a30f
--- 1/debian/apt.cron.daily
--- 2/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@@ -69,51 -69,6 +69,51 @@@ 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()
  {
@@@ -155,7 -110,7 +155,7 @@@
        MinAge=$(($MinAge*24*60*60))
  
        # reverse-sort by mtime
-       for file in $(ls -rt $Cache/*.deb); do 
+       for file in $(ls -rt $Cache/*.deb 2>/dev/null); do 
            du=$(du -s $Cache)
            size=${du%%/*}
            # check if the cache is small enough
@@@ -170,7 -125,7 +170,7 @@@
                #echo "$file ($delta), $MinAge"
                if [ $delta -le $MinAge ]; then
                    #echo "Skiping $file (delta=$delta)"
-                   continue
+                   break
                fi
            fi
  
@@@ -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 1071d0b24b01bdb0687c57e406a2cab739a5b95a,87e713d3daa0f9cf1828335e6c75ccf3a0396876..8df894e16d5416c368391d31a50662c682e47288
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,4 @@@
- apt (0.6.36) unstable; urgency=low
+ apt (0.6.36) experimental; urgency=low
  
    * Merge apt--mvo--0:
      - apt-pkg/acquire-item.cc:
@@@ -13,9 -13,17 +13,9 @@@
  
  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