Merge last changes from apt--main--0.

Merge last changes from apt--main--0.

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 --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 5145a5d2f52707b1fe888837f8cc98a81bcd826f..2d93a5ba47fc5363befc6a6a6693fa4d7aba9015 100644 (file)
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -110,7 +110,7 @@ check_size_constraints()
        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
@@ -125,7 +125,7 @@ check_size_constraints()
                #echo "$file ($delta), $MinAge"
                if [ $delta -le $MinAge ]; then
                    #echo "Skiping $file (delta=$delta)"
-                   continue
+                   break
                fi
            fi
 

diff --git a/debian/changelog b/debian/changelog
index 4cdeee956255dcc96354de7a3d37a87e198f586d..4cf7ea40ae0be04836985e76fe64c4c03ef9e2a6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ apt (0.6.36os1) unstable; urgency=low
 
  -- Otavio Salvador <otavio@debian.org>  Thu,  7 Apr 2005 21:16:46 -0300
 
-apt (0.6.36) unstable; urgency=low
+apt (0.6.36) experimental; urgency=low
 
   * Merge apt--mvo--0:
     - apt-pkg/acquire-item.cc: