Update configuration for wheezy release.

Make squeeze oldstable, wheezy stable and add jessie as the new testing.

diff --git a/config/debian-security/cron.buildd b/config/debian-security/cron.buildd
index 35f95ad243b7b52ae7e465d8fbf9eed984b18b07..959d4e65a5d2cfcce6e232cb65d1e17269e107aa 100755 (executable)
--- a/config/debian-security/cron.buildd
+++ b/config/debian-security/cron.buildd
@@ -41,12 +41,15 @@ if [ ! -z "${dists}" ]; then
     trap 'kill -TERM $SSH_PID' 0
     for d in ${dists}; do
         case ${d} in
-            stable)
+            oldstable)
                 send=squeeze
                 ;;
-            testing)
+            stable)
                 send=wheezy
                 ;;
+            testing)
+                send=jessie
+                ;;
             *)
                 send=unknown
                 ;;

diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily
index 41127c1a28a54ec749080ffbb09a5beb8920360c..3105dd69bd5014354e623a92057321f8d7a5a576 100755 (executable)
--- a/config/debian-security/cron.daily
+++ b/config/debian-security/cron.daily
@@ -23,8 +23,9 @@ find . -maxdepth 1 -mindepth 1 -type l | xargs --no-run-if-empty rm
 
 for suite in stable testing; do
     case $suite in
-        stable) override_suite=squeeze;;
-        testing) override_suite=wheezy;;
+        oldstable) override_suite=squeeze;;
+        stable) override_suite=wheezy;;
+        testing) override_suite=jessie;;
         *) echo "Unknown suite type ($suite)"; exit 1;;
     esac
     for component in $components; do
@@ -50,7 +51,7 @@ for suite in stable testing; do
 done
 
 # Generate .all3 overides for the buildd support
-for dist in squeeze wheezy; do
+for dist in squeeze wheezy jessie; do
     rm -f override.$dist.all3
     components="main contrib non-free";
     if [ -f override.$dist.main.debian-installer.gz ]; then

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 7a438ba1adbf73e4f366feb731c9046c9ac0a779..1da7d3557e5d0e7f3654fbb62c99cb2504e52531 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -175,8 +175,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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index fc0ec404969de84bcd9788a54f3ae2609a953dc6..c4bca87f4a95f28d6290f46197ccd9c5c18cfff1 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -217,16 +217,20 @@ Suite
 
 SuiteMappings
 {
- "silent-map squeeze-security stable-security";
- "silent-map wheezy-security testing-security";
+ "silent-map squeeze-security oldstable-security";
+ "silent-map wheezy-security stable-security";
+ "silent-map jessie-security testing-security";
  "propup-version stable-security testing testing-proposed-updates unstable";
  "propup-version testing-security unstable";
- "map squeeze stable";
- "map squeeze-proposed-updates proposed-updates";
- "map squeeze-updates proposed-updates";
- "map wheezy testing";
- "map wheezy-proposed-updates testing-proposed-updates";
- "map wheezy-updates testing-proposed-updates";
+ "map squeeze oldstable";
+ "map squeeze-proposed-updates oldstable-proposed-updates";
+ "map squeeze-updates oldstable-proposed-updates";
+ "map wheezy stable";
+ "map wheezy-proposed-updates proposed-updates";
+ "map wheezy-updates proposed-updates";
+ "map jessie testing";
+ "map jessie-proposed-updates testing-proposed-updates";
+ "map jessie-updates testing-proposed-updates";
  "map sid unstable";
  "map rc-buggy experimental";
  "map stable proposed-updates";

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 1cfdf28baf7f7ccbf22f9224fcc51b7f52db2a44..135dabdd1b9518609b212d8adae34fbd40ee2cd7 100644 (file)
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -245,7 +245,7 @@ function mkmaintainers() {
 function copyoverrides() {
     log 'Copying override files into public view ...'
 
-    for ofile in ${overridedir}/override.{squeeze,wheezy,sid}.{,extra.}{main,contrib,non-free}*; do
+    for ofile in ${overridedir}/override.{squeeze,wheezy,jessie,sid}.{,extra.}{main,contrib,non-free}*; do
         bname=${ofile##*/}
         gzip -9cv --rsyncable ${ofile} > ${indices}/${bname}.gz
         chmod g+w ${indices}/${bname}.gz

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index 21eaac9ebed0ad9d21f71ee03a5fa9c5b1c0ece7..a849f36db0477323d4f7f524aecd252b6dbd0215 100755 (executable)
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -156,8 +156,10 @@ class ReleaseWriter(object):
             if getattr(suite, dbfield) is not None:
                 # TEMPORARY HACK HACK HACK until we change the way we store the suite names etc
                 if key == 'Suite' and getattr(suite, dbfield) == 'squeeze-updates':
-                    out.write("Suite: stable-updates\n")
+                    out.write("Suite: oldstable-updates\n")
                 elif key == 'Suite' and getattr(suite, dbfield) == 'wheezy-updates':
+                    out.write("Suite: stable-updates\n")
+                elif key == 'Suite' and getattr(suite, dbfield) == 'jessie-updates':
                     out.write("Suite: testing-updates\n")
                 else:
                     out.write("%s: %s\n" % (key, getattr(suite, dbfield)))

diff --git a/scripts/debian/import_dataset.sh b/scripts/debian/import_dataset.sh
index 3293b1c3bc5b52ab000c02d4667b4b99f77b0b85..24ab88edb0ca54993467655046f25a6801047769 100755 (executable)
--- a/scripts/debian/import_dataset.sh
+++ b/scripts/debian/import_dataset.sh
@@ -43,6 +43,11 @@ case "${IMPORTSUITE}" in
         INPUTFILE="/srv/release.debian.org/sets/squeeze-updates/current"
         DO_CHANGELOG="false"
         ;;
+    wheezy-updates)
+        # What file we look at.
+        INPUTFILE="/srv/release.debian.org/sets/wheezy-updates/current"
+        DO_CHANGELOG="false"
+        ;;
     *)
         echo "You are so wrong here that I can't even believe it. Sod off."
         exit 42