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

* 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…