merge from lp:~mvo/apt/mvo

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

diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h
index bb72275a577f9a24499d6964733b8f76ab4c7ec7..7868bfa3d5410b3f6f65ebb2ff2612a9489249e0 100644 (file)
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@ -14,15 +14,15 @@
 #ifndef PKGLIB_DEBRECORDS_H
 #define PKGLIB_DEBRECORDS_H
 
 #ifndef PKGLIB_DEBRECORDS_H
 #define PKGLIB_DEBRECORDS_H
 

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

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

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

 #include <apt-pkg/tagfile.h>
 
 class debRecordParser : public pkgRecords::Parser
 {
 #include <apt-pkg/tagfile.h>
 
 class debRecordParser : public pkgRecords::Parser
 {

+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+

    FileFd File;
    pkgTagFile Tags;
    pkgTagSection Section;
    FileFd File;
    pkgTagFile Tags;
    pkgTagSection Section;


@@ -30,6 +30,7 @@ class debRecordParser : public pkgRecords::Parser
    protected:
    
    virtual bool Jump(pkgCache::VerFileIterator const &Ver);
    protected:
    
    virtual bool Jump(pkgCache::VerFileIterator const &Ver);

+   virtual bool Jump(pkgCache::DescFileIterator const &Desc);

    
    public:
 
    
    public:
 


@@ -37,6 +38,8 @@ class debRecordParser : public pkgRecords::Parser
    virtual string FileName();
    virtual string MD5Hash();
    virtual string SHA1Hash();
    virtual string FileName();
    virtual string MD5Hash();
    virtual string SHA1Hash();

+   virtual string SHA256Hash();
+   virtual string SHA512Hash();

    virtual string SourcePkg();
    virtual string SourceVer();
    
    virtual string SourcePkg();
    virtual string SourceVer();
    


@@ -45,10 +48,15 @@ class debRecordParser : public pkgRecords::Parser
    virtual string ShortDesc();
    virtual string LongDesc();
    virtual string Name();
    virtual string ShortDesc();
    virtual string LongDesc();
    virtual string Name();

+   virtual string Homepage();
+
+   // An arbitrary custom field
+   virtual string RecordField(const char *fieldName);

 
    virtual void GetRec(const char *&Start,const char *&Stop);
    
    debRecordParser(string FileName,pkgCache &Cache);
 
    virtual void GetRec(const char *&Start,const char *&Stop);
    
    debRecordParser(string FileName,pkgCache &Cache);

+   virtual ~debRecordParser() {};

 };
 
 #endif
 };
 
 #endif