* renamed Trust-CDROM to TrustCDROM to make it consistent with ubuntu

diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index ed5cb80d1717f0e852a6be1d73ea8c93683d4f4d..85e5b16b328ba352315522e48313d212fb104dd0 100644 (file)
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -165,7 +165,7 @@ bool debReleaseIndex::IsTrusted() const
    string VerifiedSigFile = _config->FindDir("Dir::State::lists") +
       URItoFileName(MetaIndexURI("Release")) + ".gpg";
    
    string VerifiedSigFile = _config->FindDir("Dir::State::lists") +
       URItoFileName(MetaIndexURI("Release")) + ".gpg";
    

-   if(_config->FindB("APT::Authentication::Trust-CDROM", false))
+   if(_config->FindB("APT::Authentication::TrustCDROM", false))

       if(URI.substr(0,strlen("cdrom:")) == "cdrom:")
         return true;
    
       if(URI.substr(0,strlen("cdrom:")) == "cdrom:")
         return true;
    

diff --git a/debian/changelog b/debian/changelog
index 0b4bd00e9097d6b3e707c7476fd7063637309923..6b858cdcde162ae4e96696bf3053965eb3e213f1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,7 +17,7 @@ apt (0.6.42) unstable; urgency=low
   * fix leak in the mmap code, thanks to Daniel Burrows for the
     patch (closes: #250583)
   * support for apt-get [build-dep|source] -t (closes: #152129)
   * fix leak in the mmap code, thanks to Daniel Burrows for the
     patch (closes: #250583)
   * support for apt-get [build-dep|source] -t (closes: #152129)

-  * added "APT::Authentication::Trust-CDROM" option to make the life
+  * added "APT::Authentication::TrustCDROM" option to make the life

     for the installer people easier (closes: #334656)
   * fix crash in apt-ftparchive (thanks to Bastian Blank for the patch)
     (closes: #334671)
     for the installer people easier (closes: #334656)
   * fix crash in apt-ftparchive (thanks to Bastian Blank for the patch)
     (closes: #334671)

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 5ab84fe05dac49a500f687a94995ec0f8437af0c..a93b743492fade6c31f585d58fb73b4f554e8131 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -74,7 +74,7 @@ APT
 
   Authentication
   {
 
   Authentication
   {

-     Trust-CDROM "false";            // consider the CDROM always trusted
+     TrustCDROM "false";            // consider the CDROM always trusted

   };
 
   GPGV
   };
 
   GPGV