Merge remote-tracking branch 'upstream/debian/experimental' into feature/srv-records

1 files changed, 17 insertions, 10 deletions

diff --git a/apt-pkg/edsp/edspindexfile.h b/apt-pkg/edsp/edspindexfile.h
index 8c18d8cbd..4548bff3c 100644
--- a/apt-pkg/edsp/edspindexfile.h
+++ b/apt-pkg/edsp/edspindexfile.h
@@ -18,18 +18,25 @@
 class OpProgress;
 class pkgCacheGenerator;
 
-class APT_HIDDEN edspIndex : public debStatusIndex
+class APT_HIDDEN edspIndex : public pkgDebianIndexRealFile
 {
    /** \brief dpointer placeholder (for later in case we need it) */
-   void *d;
-
-   public:
-
-   virtual const Type *GetType() const APT_CONST;
-
-   virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
-
-   edspIndex(std::string File);
+   void * const d;
+
+protected:
+   APT_HIDDEN virtual pkgCacheListParser * CreateListParser(FileFd &Pkg) APT_OVERRIDE;
+   virtual bool OpenListFile(FileFd &Pkg, std::string const &File) APT_OVERRIDE;
+   virtual uint8_t GetIndexFlags() const APT_OVERRIDE;
+   virtual std::string GetComponent() const APT_OVERRIDE;
+   virtual std::string GetArchitecture() const APT_OVERRIDE;
+public:
+
+   virtual const Type *GetType() const APT_OVERRIDE APT_CONST;
+   virtual bool Exists() const APT_OVERRIDE;
+   virtual bool HasPackages() const APT_OVERRIDE;
+
+   edspIndex(std::string const &File);
+   virtual ~edspIndex();
 };
 
 #endif