ensure that short-name -> long-name detection for dpkg-status works for reinstalls too

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

diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h
index fdf8d762b9a0010188f39807ae87ffc2d47228a9..b5e3bbdba85fd552141784daa3049863224ba9e4 100644 (file)
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@ -15,11 +15,18 @@
 #define PKGLIB_DEBRECORDS_H
 
 #include <apt-pkg/pkgrecords.h>
 #define PKGLIB_DEBRECORDS_H
 
 #include <apt-pkg/pkgrecords.h>

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

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

+#include <apt-pkg/fileutl.h>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/indexfile.h>
+#endif

 
 class debRecordParser : public pkgRecords::Parser
 {
 
 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;


@@ -32,20 +39,28 @@ class debRecordParser : public pkgRecords::Parser
    public:
 
    // These refer to the archive file for the Version
    public:
 
    // These refer to the archive file for the Version

-   virtual string FileName();
-   virtual string MD5Hash();
-   virtual string SHA1Hash();
-   virtual string SourcePkg();
+   virtual std::string FileName();
+   virtual std::string MD5Hash();
+   virtual std::string SHA1Hash();
+   virtual std::string SHA256Hash();
+   virtual std::string SHA512Hash();
+   virtual std::string SourcePkg();
+   virtual std::string SourceVer();

    
    // These are some general stats about the package
    
    // These are some general stats about the package

-   virtual string Maintainer();
-   virtual string ShortDesc();
-   virtual string LongDesc();
-   virtual string Name();
+   virtual std::string Maintainer();
+   virtual std::string ShortDesc();
+   virtual std::string LongDesc();
+   virtual std::string Name();
+   virtual std::string Homepage();
+
+   // An arbitrary custom field
+   virtual std::string RecordField(const char *fieldName);

 
    virtual void GetRec(const char *&Start,const char *&Stop);
    
 
    virtual void GetRec(const char *&Start,const char *&Stop);
    

-   debRecordParser(string FileName,pkgCache &Cache);
+   debRecordParser(std::string FileName,pkgCache &Cache);
+   virtual ~debRecordParser() {};

 };
 
 #endif
 };
 
 #endif