merged from debian-sid

[apt.git] / doc / examples / configure-index

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 0b0025fca2d3a2584a01a008d639d1e3615b2d8e..233fa2b7d7b0ac69d4cc25b21066bfb4fcce95cf 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -90,11 +90,6 @@ APT
      TrustCDROM "false";            // consider the CDROM always trusted
   };
 
      TrustCDROM "false";            // consider the CDROM always trusted
   };
 

-  GPGV
-  {
-     TrustedKeyring "/etc/apt/trusted.gpg";
-  };
-

   // Some general options
   Ignore-Hold "false";
   Clean-Installed "true";
   // Some general options
   Ignore-Hold "false";
   Clean-Installed "true";


@@ -176,7 +171,10 @@ Acquire
   Source-Symlinks "true";
 
   PDiffs "true";     // try to get the IndexFile diffs
   Source-Symlinks "true";
 
   PDiffs "true";     // try to get the IndexFile diffs

-  
+  PDiffs::FileLimit "4"; // don't use diffs if we would need more than 4 diffs
+  PDiffs::SizeLimit "50"; // don't use diffs if size of all patches excess
+                         // 50% of the size of the original file
+

   // HTTP method configuration
   http 
   {
   // HTTP method configuration
   http 
   {


@@ -312,6 +310,8 @@ Dir "/"
      SourceParts "sources.list.d";
      VendorList "vendors.list";
      VendorParts "vendors.list.d";
      SourceParts "sources.list.d";
      VendorList "vendors.list";
      VendorParts "vendors.list.d";

+     Trusted "trusted.gpg";
+     TrustedParts "trusted.gpg.d";

   };
   
   // Locations of binaries
   };
   
   // Locations of binaries


@@ -338,6 +338,13 @@ Dir "/"
        // Media AutoDetect mount path
        MountPath "/media/apt";
   };
        // Media AutoDetect mount path
        MountPath "/media/apt";
   };

+
+  // Media 
+  Media 
+  {
+       // Media AutoDetect mount path
+       MountPath "/media/apt";
+  };

 };
 
 // Things that effect the APT dselect method
 };
 
 // Things that effect the APT dselect method


@@ -395,6 +402,7 @@ Debug
   pkgProblemResolver::ShowScores "false";
   pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies
   pkgDepCache::Marker "false"; 
   pkgProblemResolver::ShowScores "false";
   pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies
   pkgDepCache::Marker "false"; 

+  pkgCacheGen "false";

   pkgAcquire "false";
   pkgAcquire::Worker "false";
   pkgAcquire::Auth "false";
   pkgAcquire "false";
   pkgAcquire::Worker "false";
   pkgAcquire::Auth "false";