Support /etc/apt/preferences.d, by adding ReadPinDir() (Closes: #535512)

diff --git a/debian/changelog b/debian/changelog
index 9024f687d53b51d147fee0b588b28bbfa8d3528a..615a0efcb85a22d48477e0e6d68dd06afa9c4618 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,7 +41,9 @@ apt (0.7.22) UNRELEASED; urgency=low
   * apt-pkg/contrib/configuration.cc: Fix a small memory leak in
     ReadConfigFile.
   * Introduce support for the Enhances field. (Closes: #137583) 
-  * Support /etc/apt/preferences.d (Closes: #535512)
+  * Support /etc/apt/preferences.d, by adding ReadPinDir() (Closes: #535512)
+  * configure-index: document Dir::Etc::SourceParts and some other options
+    (Closes: #459605)
 
  -- Julian Andres Klode <jak@debian.org>  Fri, 03 Jul 2009 08:27:35 +0200
 

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index cea0dcc0919cdaac14f37b48b24e83ddbf459071..c2b1bb27217505f2d4fb0d0deac40b5935c90f62 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -219,10 +219,14 @@ Dir "/"
   
   // Config files
   Etc "etc/apt/" {
-     SourceList "sources.list";
      Main "apt.conf";
-     Preferences "preferences";     
      Parts "apt.conf.d/";
+     Preferences "preferences";
+     PreferencesParts "preferences.d";
+     SourceList "sources.list";
+     SourceParts "sources.list.d";
+     VendorList "vendors.list";
+     VendorParts "vendors.list.d";
   };
   
   // Locations of binaries