Merge branch 'master' into security

* master: (1430 commits)
  process_new.py: show NEW comments as a whole
  Use Changes-file as field name for deferred .changes files
  team not ftpmaster for this stuff
  process_new.py: s/Binaries/No-Binaries/
  Ups, \
  Adjust mail address
  l-bpo-sloppy
  Add an option to reverse sorting of binary-NEW packages
  examine-package: colorize distribution
  Use the good mail from only.
  Add buildd-squeeze-volatile
  Add hourly cronjob
  only nag once a day
  Remove settings given by defaults
  No longer provide uncompressed files on bpo
  right keyring
  Dont fail if file to rm isnt there
  Import os
  Join cnf.exportpath into a temp variable
  [Mark] Fix for the _setup_routines()
  ...

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

diff --cc dak/new_security_install.py
index 1bb325b0d5ec7efc34ca1e256a829f9bbfdce4df,23b765f6fb680498fd75c73110ae8ddc37eebdb7..854a5834919e96aac6be9f64eb9ace94bec8d5e7
--- 1/dak/new_security_install.py
--- 2/dak/new_security_install.py
+++ b/dak/new_security_install.py
@@@ -473,8 -474,9 +474,9 @@@ def _do_Approve()
      # 3. run dak make-suite-file-list / apt-ftparchve / dak generate-releases
      print "Updating file lists for apt-ftparchive..."
      spawn("dak make-suite-file-list")
+     spawn("dak generate-filelist")
      print "Updating Packages and Sources files..."
 -    spawn("/org/security.debian.org/dak/config/debian-security/map.sh")
 +    spawn("/org/security-master.debian.org/dak/config/debian-security/map.sh")
      spawn("apt-ftparchive generate %s" % (utils.which_apt_conf_file()))
      print "Updating Release files..."
      spawn("dak generate-releases")
@@@ -558,16 -567,12 +568,12 @@@ def _do_Reject()
          if not aborted:
              os.unlink(c[:-8]+".dak")
              for f in files:
-                 Upload.projectB.query(
-                     "DELETE FROM queue_build WHERE filename = '%s'" % (f))
-                 try:
-                     os.unlink(f)
-                 except OSError, e:
-                     # Make it nicer if you want, for now its pass
-                     pass
+                 session.execute("DELETE FROM queue_build WHERE filename = :filename",
+                     {'filename': f})
+                 os.unlink(f)
  
      print "Updating buildd information..."
 -    spawn("/org/security.debian.org/dak/config/debian-security/cron.buildd")
 +    spawn("/org/security-master.debian.org/dak/config/debian-security/cron.buildd")
  
      adv_file = "./advisory.%s" % (advisory)
      if os.path.exists(adv_file):

diff --cc docs/README.first
index 9b7aa9cb221ce5d7ffe200199db6545a13068da5,7d0d40741c1a7f71af8353aae790a6f59b8dca81..bcfa1f3fd60caf0fab588bb1f47abf6d0d1aa83d
--- 1/docs/README.first
--- 2/docs/README.first
+++ b/docs/README.first
@@@ -25,9 -25,8 +25,8 @@@ o To process queue/
  
  o To generate indices files:
  
-   * dak make-suite-file-list - generates file lists for apt-ftparchive
-                                and removes obsolete packages from
-                                suites 
 -  * dak dominate          - removes obsolete packages from suites 
++  * dak dominate          - removes obsolete packages from suites
+   * dak generate-filelist - generates file lists for apt-ftparchive
    * dak generate-releases - generates Release
  
  o To clean things up:

diff --cc tools/debianqueued-0.9/config-security
Simple merge

diff --cc tools/debianqueued-0.9/debianqueued
Simple merge