Merge branch 'master' into auto-decruft-passive

Conflicts:
	dak/generate_filelist.py

diff --combined dak/dak.py
index 18be3cefc015764464ca38b57297f31be5ec6619,334bde0816e4dc94319e5d77d4a622f6b1f3bbbf..c6c979a72e0f6f944ac17734318821faaab96785
--- 1/dak/dak.py
--- 2/dak/dak.py
+++ b/dak/dak.py
@@@ -84,14 -84,10 +84,10 @@@ def init()
           "export a suite to a flat directory structure"),
          ("make-pkg-file-mapping",
           "Generate package <-> file mapping"),
-         ("generate-filelist",
-          "Generate file lists for apt-ftparchive"),
          ("generate-releases",
           "Generate Release files"),
-         ("generate-packages-sources",
-          "Generate Packages/Sources files"),
          ("generate-packages-sources2",
-          "Generate Packages/Sources files [directly from database]"),
+          "Generate Packages/Sources files"),
          ("contents",
           "Generate content files"),
          ("metadata",
@@@ -117,8 -113,6 +113,8 @@@
           "Update suite with packages from a different suite"),
          ("cruft-report",
           "Check for obsolete or duplicated packages"),
 +        ("auto-decruft",
 +         "Clean cruft without reverse dependencies automatically"),
          ("examine-package",
           "Show information useful for NEW processing"),
          ("import",