remove exposing {MetaIndexInfo,MetaIndexFile,MetaIndexURI} again as this is package...

diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h
index 9f488898db1b82117549cc6e0ac7de2a2c3e26b4..cef8d68f751e8199ddb782fa0b9df48514e30fcb 100644 (file)
--- a/apt-pkg/deb/debmetaindex.h
+++ b/apt-pkg/deb/debmetaindex.h
@@ -41,15 +41,11 @@ class debReleaseIndex : public metaIndex {
    std::vector <struct IndexTarget *>* ComputeIndexTargets() const;
    std::string Info(const char *Type, std::string const &Section, std::string const &Arch="") const;
 
    std::vector <struct IndexTarget *>* ComputeIndexTargets() const;
    std::string Info(const char *Type, std::string const &Section, std::string const &Arch="") const;
 

-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13)

    std::string MetaIndexInfo(const char *Type) const;
    std::string MetaIndexFile(const char *Types) const;
    std::string MetaIndexURI(const char *Type) const;
    std::string MetaIndexInfo(const char *Type) const;
    std::string MetaIndexFile(const char *Types) const;
    std::string MetaIndexURI(const char *Type) const;

-#else
-   virtual std::string MetaIndexInfo(const char *Type) const;
-   virtual std::string MetaIndexFile(const char *Types) const;
-   virtual std::string MetaIndexURI(const char *Type) const;

 
 

+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)

    virtual std::string LocalFileName() const;
 #endif
 
    virtual std::string LocalFileName() const;
 #endif
 

diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h
index 14715422778f09c398ed5947a5f798b8dc5712ae..18a90a29da868bd009e5e8da343a324c2477d4c7 100644 (file)
--- a/apt-pkg/metaindex.h
+++ b/apt-pkg/metaindex.h
@@ -36,10 +36,6 @@ class metaIndex
 
    // interface to to query it
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
 
    // interface to to query it
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)

-   virtual std::string MetaIndexInfo(const char *Type) const {return "";};
-   virtual std::string MetaIndexFile(const char *Types) const {return "";};
-   virtual std::string MetaIndexURI(const char *Type) const {return "";};
-

    // returns the path of the local file (or "" if its not available)
    virtual std::string LocalFileName() const {return "";};
 #endif
    // returns the path of the local file (or "" if its not available)
    virtual std::string LocalFileName() const {return "";};
 #endif