* merge with matts tree, added documentation for the gpgv stuff

Patches applied:

 * apt@packages.debian.org/apt--main--0--patch-59
   Open 0.6.32

 * apt@packages.debian.org/apt--main--0--patch-60
   Merge apt--mvo--0

 * apt@packages.debian.org/apt--main--0--patch-61
   Add missing whitespace in new Debug::Acquire::gpgv output

diff --cc doc/apt.conf.5.xml
index b5d223372e656d8f126110d326872e2be1fea757,b5d223372e656d8f126110d326872e2be1fea757..69e212243d7bf1b6aa75ba021710221d9a2b3b9e
--- 1/doc/apt.conf.5.xml
--- 2/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@@ -251,6 -251,6 +251,13 @@@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg
       the cdrom block. It is important to have the trailing slash. Unmount 
       commands can be specified using UMount.</para></listitem>
       </varlistentry>
++
++     <varlistentry><term>gpgv</term>
++     <listitem><para>GPGV URIs; the only option for GPGV URIs is the option to pass additional parameters to gpgv.
++     <literal>gpgv::Options</literal> Additional options passed to gpgv.
++     </para></listitem>
++     </varlistentry>
++
     </variablelist>
    </para>
   </refsect1>
@@@ -373,7 -373,7 +380,9 @@@
     <literal>Debug::NoLocking</literal> disables file locking so APT can do some 
     operations as non-root and <literal>Debug::pkgDPkgPM</literal> will print out the 
     command line for each dpkg invokation. <literal>Debug::IdentCdrom</literal> will 
--   disable the inclusion of statfs data in CDROM IDs.</para>
++   disable the inclusion of statfs data in CDROM IDs.
++   <literal>Debug::Acquire::gpgv</literal> Debugging of the gpgv method.
++   </para>
   </refsect1>
   
   <refsect1><title>Examples</title>

diff --cc doc/examples/configure-index
index 7cb29f08240a4022d229bb282b7140f4b5c7e20c,7cb29f08240a4022d229bb282b7140f4b5c7e20c..c834c49d596a26b4b4cb67d41968fa09203bbd30
--- 1/doc/examples/configure-index
--- 2/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@@ -72,6 -72,6 +72,11 @@@ AP
       NoAct "false";
    };
  
++  GPGV
++  {
++     TrustedKeyring "/etc/apt/trusted.gpg";
++  };
++
    // Some general options
    Ignore-Hold "false";
    Clean-Installed "true";
@@@ -171,6 -171,6 +176,7 @@@ Dir "/
    Bin {
       methods "/usr/lib/apt/methods/";
       gzip "/bin/gzip";
++     gpg  "/usr/bin/gpgv";
       dpkg "/usr/bin/dpkg";
       dpkg-source "/usr/bin/dpkg-source";
       dpkg-buildpackage "/usr/bin/dpkg-buildpackage"
@@@ -229,8 -229,8 +235,10 @@@ Debu
    NoLocking "false";
    Acquire::Ftp "false";    // Show ftp command traffic
    Acquire::Http "false";   // Show http command traffic
++  Acquire::gpgv "false";   // Show the gpgv traffic
    aptcdrom "false";        // Show found package files
    IdentCdrom "false";
++  
  }
  
  /* Whatever you do, do not use this configuration file!! Take out ONLY

diff --cc methods/gpgv.cc
index f7d16ef013aa3b7bb3fff15072e30a176fb35d16,40c072b2beae2c1104999a04ace16e7e248019d0..24e945b2c3c772d4dfc62d7a024b930302de4a94
--- 1/methods/gpgv.cc
--- 2/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@@ -46,7 -46,7 +46,7 @@@ const char *GPGVMethod::VerifyGetSigner
     int status;
     struct stat buff;
     string gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv");
--   string pubringpath = _config->Find("Apt::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg");
++   string pubringpath = _config->Find("APT::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg");
     if (_config->FindB("Debug::Acquire::gpgv", false))
     {
        std::cerr << "gpgv path: " << gpgvpath << std::endl;

diff --cc po/apt-all.pot
index d40d44701012bd567b9d083a957ff932eb303400,d40d44701012bd567b9d083a957ff932eb303400..4fbd34e4e506046196d576ea9ad44dd0c5c50366
--- 1/po/apt-all.pot
--- 2/po/apt-all.pot
+++ b/po/apt-all.pot
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2005-02-08 16:58+0100\n"
++"POT-Creation-Date: 2005-02-09 12:51+0100\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"