* merged with apt--mvo--0 and apt--ddtp--0

Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-19
   * ABI/API change: add "VerIterator::TranslatedDescription()" method to make the life of the api user easier

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-78
   * fix a incorrect example

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-79
   * revert patch from patch-59, causes all sorts of trouble

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-80
   * fix changelog

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-81
   * be extra carefull in cmdline/apt-get.cc:FindSrc() and check VF.File() for NULL

diff --combined apt-pkg/pkgrecords.cc
index f62f945b5b03cb8c14e9072bb6901498ca37ef91,f62f945b5b03cb8c14e9072bb6901498ca37ef91,9c2655d6a774a3b452707f2f5958ec972fc3d7ed..b22f3e73fc80ccf6ffe2943529f17aaa30561102
--- 1/apt-pkg/pkgrecords.cc
--- 2/apt-pkg/pkgrecords.cc
--- 3/apt-pkg/pkgrecords.cc
+++ b/apt-pkg/pkgrecords.cc
@@@@ -42,9 -42,9 -42,6 +42,6 @@@@ pkgRecords::pkgRecords(pkgCache &Cache
         if (Files[I->ID] == 0)
         return;
      }   
--    // We store that to make sure that the destructor won't segfault,
--    // even if the Cache object was destructed before this instance.
--    PackageFileCount = Cache.HeaderP->PackageFileCount;
   }
                                                                        /*}}}*/
   // Records::~pkgRecords - Destructor                                 /*{{{*/
@@@@ -52,7 -52,7 -49,7 +49,7 @@@@
   /* */
   pkgRecords::~pkgRecords()
   {
--    for (unsigned I = 0; I != PackageFileCount; I++)
++    for (unsigned I = 0; I != Cache.HeaderP->PackageFileCount; I++)
         delete Files[I];
      delete [] Files;
   }
@@@@ -66,12 -66,12 -63,3 +63,12 @@@@ pkgRecords::Parser &pkgRecords::Lookup(
      return *Files[Ver.File()->ID];
   }
                                                                        /*}}}*/
  +// Records::Lookup - Get a parser for the package description file   /*{{{*/
  +// ---------------------------------------------------------------------
  +/* */
  +pkgRecords::Parser &pkgRecords::Lookup(pkgCache::DescFileIterator const &Desc)
  +{
  +   Files[Desc.File()->ID]->Jump(Desc);
  +   return *Files[Desc.File()->ID];
  +}
  +                                                                     /*}}}*/

diff --combined apt-pkg/pkgrecords.h
index ece91680e518e3daf3b86cd912ded17c35bc7128,ece91680e518e3daf3b86cd912ded17c35bc7128,08f00441463e428da12e6268c9123a5116742f55..31c444dbf9c82becf1cdde4fbf94be5eea74d890
--- 1/apt-pkg/pkgrecords.h
--- 2/apt-pkg/pkgrecords.h
--- 3/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@@@ -33,13 -33,13 -33,11 +33,12 @@@@ class pkgRecord
      
      pkgCache &Cache;
      Parser **Files;
--    int PackageFileCount;
         
      public:
   
      // Lookup function
      Parser &Lookup(pkgCache::VerFileIterator const &Ver);
  +   Parser &Lookup(pkgCache::DescFileIterator const &Desc);
   
      // Construct destruct
      pkgRecords(pkgCache &Cache);
@@@@ -51,7 -51,7 -49,6 +50,7 @@@@ class pkgRecords::Parse
      protected:
      
      virtual bool Jump(pkgCache::VerFileIterator const &Ver) = 0;
  +   virtual bool Jump(pkgCache::DescFileIterator const &Desc) = 0;
      
      public:
      friend class pkgRecords;

diff --combined debian/changelog
index 2b100e0403b10992c621e1bbfcd755911aeadef8,0e85b511793c5e3815388673fe1440ad71606052,9716c3836d31aa4c70bbb42be2240d15f10d908b..b854d174198dd8e0846069c9c72cc5d6f081fa7f
--- 1/debian/changelog
--- 2/debian/changelog
--- 3/debian/changelog
+++ b/debian/changelog
@@@@ -1,13 -1,3 -1,15 +1,25 @@@@
-  apt (0.6.42.0exp1) experimental; urgency=low
+++apt (0.6.42.1exp1) 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.1) unstable; urgency=low
++ 
++   * fix a incorrect example in the apt_prefrences man page
++     (thanks to Filipus Klutiero, closes: #282918)
++   * apt-pkg/pkgrecords.cc:
++     - revert patch from last version, it causes trouble on alpha 
++       and ia64 (closes: #335102, #335103)
++   * cmdline/apt-get.cc:
++     - be extra carefull in FindSrc (closes: #335213)
++ 
++  -- Michael Vogt <mvo@debian.org>  Sat, 22 Oct 2005 23:44:35 +0200
++ 
   apt (0.6.42) unstable; urgency=low
   
     * apt-pkg/cdrom.cc:
@@@@ -27,7 -17,7 -29,7 +39,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)
@@@@ -39,7 -29,7 -41,7 +51,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
@@@@ -124,7 -114,7 -126,6 +136,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