criss-cross merge with my sid branch

[apt.git] / apt-pkg / deb / deblistparser.h

diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index 5f91e073e3cc309f746ad4d59a63d7e0412d7faa..8da051530fd06cf9b60e5a25e318a90ee733c64d 100644 (file)
--- a/apt-pkg/deb/deblistparser.h
+++ b/apt-pkg/deb/deblistparser.h
@@ -47,6 +47,7 @@ class debListParser : public pkgCacheGenerator::ListParser
    // These all operate against the current section
    virtual string Package();
    virtual string Architecture();
    // These all operate against the current section
    virtual string Package();
    virtual string Architecture();

+   virtual bool ArchitectureAll();

    virtual string Version();
    virtual bool NewVersion(pkgCache::VerIterator Ver);
    virtual string Description();
    virtual string Version();
    virtual bool NewVersion(pkgCache::VerIterator Ver);
    virtual string Description();


@@ -69,7 +70,7 @@ class debListParser : public pkgCacheGenerator::ListParser
                            bool const &StripMultiArch = false);
    static const char *ConvertRelation(const char *I,unsigned int &Op);
 
                            bool const &StripMultiArch = false);
    static const char *ConvertRelation(const char *I,unsigned int &Op);
 

-   debListParser(FileFd *File);
+   debListParser(FileFd *File, string const &Arch = "");

 };
 
 #endif
 };
 
 #endif