* apt-inst/database.{cc,h}, apt-inst/deb/dpkgdb.{cc,h}:

  - drop instead of fix as it is only needed if you want to reimplement dpkg
    and comes straight from the beginning of last decade (Closes: #663372)
* apt-inst/deb/debfile.cc:
  - {Extract,Merge}Control() is another instance of "lets reimplement dpkg"
    so shot of this code before someone ends up using this…

1 files changed, 1 insertions, 9 deletions

diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h
index 5e1ea1d2f..d94b74446 100644
--- a/apt-inst/deb/debfile.h
+++ b/apt-inst/deb/debfile.h
@@ -29,12 +29,7 @@
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/pkgcache.h>
 
-#ifndef APT_8_CLEANER_HEADERS
-#include <apt-pkg/database.h>
-#endif
-
 class FileFd;
-class pkgDataBase;
 
 class debDebFile
 {
@@ -46,13 +41,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;};