From c24f6ce22cd6720004addad2e3382b3caa6b1b7c Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 4 Jan 2010 13:45:14 +0100
Subject: add TrustedParts so in the future new keyrings can just be dropped
 into /etc/apt/trusted.gpg.d/ which eliminates the need to have gpg installed
 to add keys to APTs trusted keyring (with apt-key) (Closes #304846) - Thanks
 to Timo Weingärtner & Peter Palfrader for providing different patchs/ideas
 for this!
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/examples/configure-index | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'doc/examples')

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index be461aaad..87cf97ffe 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -90,11 +90,6 @@ APT
      TrustCDROM "false";            // consider the CDROM always trusted
   };
 
-  GPGV
-  {
-     TrustedKeyring "/etc/apt/trusted.gpg";
-  };
-
   // Some general options
   Ignore-Hold "false";
   Clean-Installed "true";
@@ -320,6 +315,8 @@ Dir "/"
      SourceParts "sources.list.d";
      VendorList "vendors.list";
      VendorParts "vendors.list.d";
+     Trusted "trusted.gpg";
+     TrustedParts "trusted.gpg.d";
   };
   
   // Locations of binaries
-- 
cgit v1.2.3-70-g09d2