* merged with main

Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-77
   * renamed Trust-CDROM to TrustCDROM to make it consistent with ubuntu

diff --combined apt-pkg/deb/debmetaindex.cc
index ea53a847ef194bca314460d3e65666f6cedca4bb,85e5b16b328ba352315522e48313d212fb104dd0..d3b6ed957181941e5b28d431e71410c354419c2f
--- 1/apt-pkg/deb/debmetaindex.cc
--- 2/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@@ -157,14 -157,6 +157,14 @@@ bool debReleaseIndex::GetIndexes(pkgAcq
                     ComputeIndexTargets(),
                     new indexRecords (Dist));
  
 +   // Queue the translations
 +   for (vector<const debSectionEntry *>::const_iterator I = SectionEntries.begin(); 
 +      I != SectionEntries.end(); I++) {
 +
 +      debTranslationsIndex i = debTranslationsIndex(URI,Dist,(*I)->Section);
 +      i.GetIndexes(Owner);
 +   }
 +
     return true;
  }
  
@@@ -173,7 -165,7 +173,7 @@@ bool debReleaseIndex::IsTrusted() cons
     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;
     
@@@ -189,16 -181,11 +189,16 @@@ vector <pkgIndexFile *> *debReleaseInde
  
     Indexes = new vector <pkgIndexFile*>;
     for (vector<const debSectionEntry *>::const_iterator I = SectionEntries.begin(); 
 -      I != SectionEntries.end(); I++)
 +      I != SectionEntries.end(); I++) {
        if ((*I)->IsSrc)
           Indexes->push_back(new debSourcesIndex (URI, Dist, (*I)->Section, IsTrusted()));
        else 
 +      {
           Indexes->push_back(new debPackagesIndex (URI, Dist, (*I)->Section, IsTrusted()));
 +       Indexes->push_back(new debTranslationsIndex(URI, Dist, (*I)->Section));
 +      }
 +   }
 +
     return Indexes;
  }
  

diff --combined debian/changelog
index ff400a6aba5454c759922e1017668f2229c57b19,6b858cdcde162ae4e96696bf3053965eb3e213f1..2b100e0403b10992c621e1bbfcd755911aeadef8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,3 +1,13 @@@
 +apt (0.6.42.0exp1) experimental; urgency=low
 +
 +  * added support for package index diffs 
 +  * added support for i18n of the package descriptions
++  * synced with the apt--debian-sid--0 branch
 +  * build from mvo@debian.org--2005/apt--debian-experimental--0
 +    (from http://people.debian.org/~mvo/arch)
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 19 Oct 2005 22:12:13 +0200
 +
  apt (0.6.42) unstable; urgency=low
  
    * apt-pkg/cdrom.cc:
@@@ -26,7 -17,7 +27,7 @@@
    * 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)
@@@ -38,7 -29,7 +39,7 @@@
    * cmdline/apt-cdrom.cc: 
      - fix some missing gettext() calls (closes: #334539)
    * doc/apt-cache.8.xml: fix typo (closes: #334714)
 -  
 +
   -- Michael Vogt <mvo@debian.org>  Wed, 19 Oct 2005 22:02:09 +0200
  
  apt (0.6.41) unstable; urgency=low
@@@ -123,7 -114,6 +124,7 @@@ apt (0.6.38) unstable; urgency=lo
    
   -- Matt Zimmerman <mdz@debian.org>  Sat, 25 Jun 2005 09:51:00 -0700
  
 +>>>>>>> MERGE-SOURCE
  apt (0.6.37) breezy; urgency=low
  
    * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81