* merged ddtp support

Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--base-0
   tag of otavio@debian.org--2005/apt--ddtp--0.6--patch-14

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-1
   * fixed a problem when it comes to the cache rebuilding

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-2
   * try harder to get the correct language code

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-3
   * fix for output of the description and the debTranslationsIndex::Exists()

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-4
   * made the translation downloading work

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-5
   * FindInCache() uses the correct file now

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-6
   * don't throw any more warnings

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-7
   * merged with otavoi

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-8
   * merged with otavios branch

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-9
   * code cleanups (thanks matt!), moved UsePackage before the description list build in pkgcachegen to catch MMap errors early

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-10
   * added a BUGS file with known problem, added apt-cdrom support for translated package descriptions

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-11
   * updated with mainline

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-12
   * added README.ddtp

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-13
   * merged with apt--mvo

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-14
   * added DDTP::URL-Remap. KILL THIS FEATURE once ddtp support is offical 

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-15
   * remvoed the remap feature again, dosn't work anyway

 * otavio@debian.org--2005/apt--ddtp--0.6--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-71

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-1
   Port DDTP to APT 0.6 branch

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-2
   Fix sintax error on apt-cache

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-3
   Remove a unused var.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-4
   Fix problems due APT and structural changes.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-5
   Fix problems due APT and structural changes.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-6
   Sync with apt@packages.debian.org/apt--main--0--patch-74

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-7
   Sync with apt@packages.debian.org/apt--main--0--patch-75

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-8
   Sync with apt--main--0--patch-76

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-9
   Remote a changelog entry added by mistake while merging.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-10
   Sync with apt--main--0--patch-78

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-11
   Revert fixes changes to move these to apt--fixes--0 branch.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-12
   Another fix included here by mistake. Moving it to apt--fixes--0 branch.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-13
   Merge last changes from apt--main--0.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-14
   Add FindInCache method to skip the rebuild of cache every time.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-15
   Merge changes did by Michael Vogt to solve some rebuilding mistakes.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-16
   Does't show Description twice

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-17
   Merge last fixes did by Michael but preserve my version of apt-cache.cc fix.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-18
   Revert changes did by mistake on translation files.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-19
   Merge last changes did from upstream side.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-20
   Sync with apt--main--0--patch-87

1 files changed, 11 insertions, 2 deletions

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 6ef7cafb0..f76afb935 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -52,7 +52,7 @@ pkgCache::Header::Header()
    
    /* Whenever the structures change the major version should be bumped,
       whenever the generator changes the minor version should be bumped. */
-   MajorVersion = 4;
+   MajorVersion = 5;
    MinorVersion = 0;
    Dirty = false;
    
@@ -60,17 +60,22 @@ pkgCache::Header::Header()
    PackageSz = sizeof(pkgCache::Package);
    PackageFileSz = sizeof(pkgCache::PackageFile);
    VersionSz = sizeof(pkgCache::Version);
+   DescriptionSz = sizeof(pkgCache::Description);
    DependencySz = sizeof(pkgCache::Dependency);
    ProvidesSz = sizeof(pkgCache::Provides);
    VerFileSz = sizeof(pkgCache::VerFile);
+   DescFileSz = sizeof(pkgCache::DescFile);
    
    PackageCount = 0;
    VersionCount = 0;
+   DescriptionCount = 0;
    DependsCount = 0;
    PackageFileCount = 0;
    VerFileCount = 0;
+   DescFileCount = 0;
    ProvidesCount = 0;
    MaxVerFileSize = 0;
+   MaxDescFileSize = 0;
    
    FileList = 0;
    StringList = 0;
@@ -89,8 +94,10 @@ bool pkgCache::Header::CheckSizes(Header &Against) const
        PackageSz == Against.PackageSz &&
        PackageFileSz == Against.PackageFileSz &&
        VersionSz == Against.VersionSz &&
+       DescriptionSz == Against.DescriptionSz &&
        DependencySz == Against.DependencySz &&
        VerFileSz == Against.VerFileSz &&
+       DescFileSz == Against.DescFileSz &&
        ProvidesSz == Against.ProvidesSz)
       return true;
    return false;
@@ -115,8 +122,10 @@ bool pkgCache::ReMap()
    HeaderP = (Header *)Map.Data();
    PkgP = (Package *)Map.Data();
    VerFileP = (VerFile *)Map.Data();
+   DescFileP = (DescFile *)Map.Data();
    PkgFileP = (PackageFile *)Map.Data();
    VerP = (Version *)Map.Data();
+   DescP = (Description *)Map.Data();
    ProvideP = (Provides *)Map.Data();
    DepP = (Dependency *)Map.Data();
    StringItemP = (StringItem *)Map.Data();
@@ -235,11 +244,11 @@ const char *pkgCache::Priority(unsigned char Prio)
    return 0;
 }
 									/*}}}*/
-
 // Bases for iterator classes						/*{{{*/
 void pkgCache::VerIterator::_dummy() {}
 void pkgCache::DepIterator::_dummy() {}
 void pkgCache::PrvIterator::_dummy() {}
+void pkgCache::DescIterator::_dummy() {}
 									/*}}}*/
 // PkgIterator::operator ++ - Postfix incr				/*{{{*/
 // ---------------------------------------------------------------------