Merge branch 'master' into merge

* master:
  security install
  security_install

diff --git a/config/debian-security/map.sh b/config/debian-security/map.sh
new file mode 100755 (executable)
index 0000000..d0cbaf4
--- /dev/null
+++ b/config/debian-security/map.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+dak make-pkg-file-mapping | bzip2 -9 > /org/security.debian.org/ftp/indices/package-file.map.bz2

diff --git a/dak/new_security_install.py b/dak/new_security_install.py
index b1a47dba8f2527bbe733afea5f014f064acf4634..c72641a2236b71f43ee0cf6867f18710e1af3f98 100755 (executable)
--- a/dak/new_security_install.py
+++ b/dak/new_security_install.py
@@ -474,6 +474,7 @@ def _do_Approve():
     print "Updating file lists for apt-ftparchive..."
     spawn("dak make-suite-file-list")
     print "Updating Packages and Sources files..."
+    spawn("/org/security.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")