* apt-pkg/deb/dpkgpm.cc:

[apt.git] / apt-pkg / pkgcachegen.h

diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index 9a729eea4f9b0689611b8cb14b541e22d8382788..b6715294af363aa6475f9a9089b632a8f5b1f0b0 100644 (file)
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -19,11 +19,9 @@
 #ifndef PKGLIB_PKGCACHEGEN_H
 #define PKGLIB_PKGCACHEGEN_H
 
 #ifndef PKGLIB_PKGCACHEGEN_H
 #define PKGLIB_PKGCACHEGEN_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/pkgcachegen.h"
-#endif 

 
 #include <apt-pkg/pkgcache.h>
 
 #include <apt-pkg/pkgcache.h>

+#include <apt-pkg/md5.h>

 
 class pkgSourceList;
 class OpProgress;
 
 class pkgSourceList;
 class OpProgress;


@@ -53,9 +51,11 @@ class pkgCacheGenerator
    // Flag file dependencies
    bool FoundFileDeps;
    
    // Flag file dependencies
    bool FoundFileDeps;
    

-   bool NewPackage(pkgCache::PkgIterator &Pkg,const string &Pkg);
+   bool NewPackage(pkgCache::PkgIterator &Pkg,const string &PkgName);

    bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List);
    bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List);

+   bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List);

    unsigned long NewVersion(pkgCache::VerIterator &Ver,const string &VerStr,unsigned long Next);
    unsigned long NewVersion(pkgCache::VerIterator &Ver,const string &VerStr,unsigned long Next);

+   map_ptrloc NewDescription(pkgCache::DescIterator &Desc,const string &Lang,const MD5SumValue &md5sum,map_ptrloc Next);

 
    public:
 
 
    public:
 


@@ -108,6 +108,9 @@ class pkgCacheGenerator::ListParser
    virtual string Package() = 0;
    virtual string Version() = 0;
    virtual bool NewVersion(pkgCache::VerIterator Ver) = 0;
    virtual string Package() = 0;
    virtual string Version() = 0;
    virtual bool NewVersion(pkgCache::VerIterator Ver) = 0;

+   virtual string Description() = 0;
+   virtual string DescriptionLanguage() = 0;
+   virtual MD5SumValue Description_md5() = 0;

    virtual unsigned short VersionHash() = 0;
    virtual bool UsePackage(pkgCache::PkgIterator Pkg,
                           pkgCache::VerIterator Ver) = 0;
    virtual unsigned short VersionHash() = 0;
    virtual bool UsePackage(pkgCache::PkgIterator Pkg,
                           pkgCache::VerIterator Ver) = 0;