From: Michael Vogt <mvo@ubuntu.com>
Date: Tue, 1 Apr 2014 10:21:10 +0000 (+0200)
Subject: Merge remote-tracking branch 'mvo/debian/sid' into debian/sid
X-Git-Tag: 1.0~11
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/a78578a9bfabf9c1b5a84e8f26fa5f193a56cb76?hp=-c

Merge remote-tracking branch 'mvo/debian/sid' into debian/sid
---

a78578a9bfabf9c1b5a84e8f26fa5f193a56cb76
diff --combined doc/examples/configure-index
index df6bbb1e3,020f0d2ce..2d9f829ba
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@@ -149,7 -149,7 +149,7 @@@ AP
      MaxSize "0"; // (new)
      // - Set maximum size of the cache in MB (0=disable). If the cache
      //   is bigger, cached package files are deleted until the size
-     //   requirement is met (the biggest packages will be deleted 
+     //   requirement is met (the oldest packages will be deleted 
      //   first).
  
      Update-Package-Lists "0";
@@@ -450,7 -450,7 +450,7 @@@ Debu
    aptcdrom "false";        // Show found package files
    IdentCdrom "false";
    acquire::netrc "false";  // netrc parser
 -  
 +  RunScripts "false";      // debug invocation of external scripts  
  }
  
  pkgCacheGen::Essential "native"; // other modes: all, none, installed