Merge remote-tracking branch 'ansgar/pu/wheezy' into merge

* ansgar/pu/wheezy:
  Remove dead code.
  Remove redundant indices from database.
  Add path to removal logs to minimal configuration.
  Make dominate -s <suite> work without Obsolete::Options::Suite set.
  setup/README: update for postgresql-9.1
  setup/README: remove no longer needed postgresql packages
  stop using deprecated python-apt functions
  merge check for Description field with other checks
  add our own deb_extract_control function
  Stop passing order_by as a string.
  Allow use with SQLAlchemy 0.7

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --combined dak/new_security_install.py
index 3de9823eabfb2076ced37c5c0d0aff61ad0cc778,026dcced053bff432a4038ece86c0ed13ee6101a..353f8859dde9b5d981020cd51d911de7498e459d
--- 1/dak/new_security_install.py
--- 2/dak/new_security_install.py
+++ b/dak/new_security_install.py
@@@ -142,9 -142,9 +142,9 @@@ def main()
          if not cnf.has_key("Security::Options::%s" % (i)):
              cnf["Security::Options::%s" % (i)] = ""
  
-     changes_files = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
+     changes_files = apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
  
-     Options = cnf.SubTree("Security::Options")
+     Options = cnf.subtree("Security::Options")
      if Options['Help']:
          usage()
  
@@@ -188,11 -188,9 +188,11 @@@
          acceptfilename="%s/COMMENTS/ACCEPT.%s_%s" % (os.path.dirname(os.path.abspath(changes[0])), dbchange.source, version)
          acceptfiles[acceptfilename]=1
  
 +    print "Would create %s now and then go on to accept this package, if you allow me to." % (acceptfiles.keys())
      if Options["No-Action"]:
 -        print "Would create %s now and then go on to accept this package, but No-Action is set" % (acceptfiles.keys())
          sys.exit(0)
 +    else:
 +        raw_input("Press Enter to continue")
  
      for acceptfilename in acceptfiles.keys():
          accept_file = file(acceptfilename, "w")