Merge remote-tracking branch 'origin/master'

[dak.git] / config / debian-security / dak.conf

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index c1b6c94e1bff98f93e0aa71ab1e23f83efe06222..f6459d5c62a96f7011d1a70af0b0902dce8ea520 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -12,8 +12,6 @@ Dinstall
    PackagesServer "packages.debian.org";
    Bcc "archive@ftp-master.debian.org";
    // GroupOverrideFilename "override.group-maint";
-   FutureTimeTravelGrace 28800; // 8 hours
-   PastCutoffYear "1984";
    SkipTime 300;
    CloseBugs "false";
    OverrideDisparityCheck "false";
@@ -175,8 +173,9 @@ SuiteMappings
  "silent-map oldstable-security oldstable";
   "silent-map etch-secure oldstable";
   "silent-map testing-security testing";
-  "silent-map squeeze-security stable";
-  "silent-map wheezy-security testing";
+  "silent-map squeeze-security oldstable";
+  "silent-map wheezy-security stable";
+  "silent-map jessie-security testing";
 };
 
 Dir
@@ -350,11 +349,6 @@ Urgency
   };
 };
 
-Changelogs
-{
-  Export "/srv/security-master.debian.org/export/changelogs";
-}
-
 Generate-Releases
 {
   MD5Sum