sync

diff --git a/apt.conf.buildd b/apt.conf.buildd
index ddf92245b0f61888ee470a5ffc4a7b375a06296e..0cc3eff0a5d4cae2f23f3b4deafe3fe9e81c8979 100644 (file)
--- a/apt.conf.buildd
+++ b/apt.conf.buildd
@@ -20,8 +20,6 @@ bindirectory "incoming"
    Sources "Sources";
    Contents " ";
 
-   FileList "/org/ftp.debian.org/database/dists/unstable_accepted.list";
-
    BinOverride "override.sid.all3";
    BinCacheDB "packages-accepted.db";
    PathPrefix "";

diff --git a/cron.buildd b/cron.buildd
index 89f86f2749ee750edf630cffde98dbee81c06433..785fad93f71843ad4df87c32bcbf5729b9de4cfa 100644 (file)
--- a/cron.buildd
+++ b/cron.buildd
@@ -10,11 +10,10 @@ export SCRIPTVARS=/org/ftp.debian.org/katie/vars
 
 if [ ! -e $ftpdir/Archive_Maintenance_In_Progress ]; then
         cd $overridedir
-        denise
+        denise &>/dev/null
         rm -f override.sid.all3
         for i in main contrib non-free main.debian-installer; do cat override.sid.$i >> override.sid.all3; done
        cd $masterdir
-       cameron
        apt-ftparchive -qq generate apt.conf.buildd
        cd /org/incoming.debian.org/buildd
        for a in $ARCHS; do

diff --git a/katie.conf b/katie.conf
index fca9ece57161b1e3f5b25d553fc17d965b1b29bc..07731a21a5721c0cf789ae97426f3d1af4caa4e3 100644 (file)
--- a/katie.conf
+++ b/katie.conf
@@ -329,9 +329,11 @@ Suite
 SuiteMappings
 {
  "map stable proposed-updates";
+ "map stable-security proposed-updates";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
  "map testing woody-proposed-updates";
+ "map testing-security woody-proposed-updates";
  "map-unreleased testing unstable";
  "map-unreleased woody-proposed-updates unstable";
 };

diff --git a/katie.conf-non-US b/katie.conf-non-US
index 2d16907f6bd9607f62b83831245792327e4693f2..5c1aff2a1d9291b7659806253ac82a3aa7245765 100644 (file)
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -279,9 +279,11 @@ Suite
 SuiteMappings
 {
  "map stable proposed-updates";
+ "map stable-security proposed-updates";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
  "map testing woody-proposed-updates";
+ "map testing-security woody-proposed-updates";
  "map-unreleased testing unstable-";
  "map-unreleased woody-proposed-updates unstable";
 };

diff --git a/katie.conf-security b/katie.conf-security
index 7f6444049acd836d03e57529b8ddcff52ab120e1..7a24b106109d7b411ea795ba84cdabf5b7134ca9 100644 (file)
--- a/katie.conf-security
+++ b/katie.conf-security
@@ -162,8 +162,8 @@ Suite
 
 SuiteMappings
 {
- "map stable-sec potato";
- "map testing-sec woody";
+ "map stable-security potato";
+ "map testing-security woody";
 };
 
 Dir
@@ -179,6 +179,7 @@ Dir
   Morgue "/org/security.debian.org/morgue/";
   MorgueReject "reject";
   Override "/org/security.debian.org/scripts/override/";
+  AcceptedAutoBuild "/org/security.debian.org/buildd/";
   Queue
   {
     Root "/org/security.debian.org/queue/";
@@ -189,7 +190,6 @@ Dir
     New "/org/security.debian.org/queue/new/";
     Reject "/org/security.debian.org/queue/reject/";
     Unchecked "/org/security.debian.org/queue/unchecked/";
-    AcceptedAutoBuild "/org/security.debian.org/buildd/";
   };
 };