merged (and resolved a bunch of conflicts) of the debian-sid branch

1 files changed, 2 insertions, 6 deletions

diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h
index 5e1ea1d2f..38211fb0f 100644
--- a/apt-inst/deb/debfile.h
+++ b/apt-inst/deb/debfile.h
@@ -30,11 +30,10 @@
 #include <apt-pkg/pkgcache.h>
 
 #ifndef APT_8_CLEANER_HEADERS
-#include <apt-pkg/database.h>
+#include <apt-pkg/md5.h>
 #endif
 
 class FileFd;
-class pkgDataBase;
 
 class debDebFile
 {
@@ -46,13 +45,10 @@ class debDebFile
    bool CheckMember(const char *Name);
    
    public:
-
    class ControlExtract;
    class MemControlExtract;
-   
-   bool ExtractControl(pkgDataBase &DB);
+
    bool ExtractArchive(pkgDirStream &Stream);
-   pkgCache::VerIterator MergeControl(pkgDataBase &DB);
    const ARArchive::Member *GotoMember(const char *Name);
    inline FileFd &GetFile() {return File;};