From: Ansgar Burchardt Date: Sat, 25 Apr 2015 08:49:14 +0000 (+0200) Subject: Switch to "jessie" as stable. X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=commitdiff_plain;h=19ffc1de995fd165d9438a8b7769cd7c45bbce60 Switch to "jessie" as stable. --- diff --git a/config/debian-security/cron.buildd b/config/debian-security/cron.buildd index 67094c76..33f847c3 100755 --- a/config/debian-security/cron.buildd +++ b/config/debian-security/cron.buildd @@ -41,15 +41,18 @@ if [ ! -z "${dists}" ]; then trap 'kill -TERM $SSH_PID' 0 for d in ${dists}; do case ${d} in - oldstable) + oldoldstable) send=squeeze ;; - stable) + oldstable) send=wheezy ;; - testing) + stable) send=jessie ;; + testing) + send=stretch + ;; *) send=unknown ;; diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily index 984c8b75..f2eff107 100755 --- a/config/debian-security/cron.daily +++ b/config/debian-security/cron.daily @@ -21,11 +21,11 @@ for file in override*.gz; do done find . -maxdepth 1 -mindepth 1 -type l | xargs --no-run-if-empty rm -for suite in stable testing; do +for suite in oldstable stable testing; do case $suite in - oldstable) override_suite=squeeze;; - stable) override_suite=wheezy;; - testing) override_suite=jessie;; + oldstable) override_suite=wheezy ;; + stable) override_suite=jessie ;; + testing) override_suite=stretch ;; *) echo "Unknown suite type ($suite)"; exit 1;; esac for component in $components; do diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf index 87f444ab..12ee2a18 100644 --- a/config/debian-security/dak.conf +++ b/config/debian-security/dak.conf @@ -124,14 +124,17 @@ Security-Install SuiteMappings { "silent-map stable-security stable"; + "silent-map stable-kfreebsd-security stable-kfreebsd"; "silent-map oldstable-security oldstable"; - "silent-map etch-secure oldstable"; + "silent-map oldoldstable-security oldoldstable"; "silent-map testing-security testing"; - "silent-map squeeze-security oldstable"; - "silent-map wheezy-security stable"; - "silent-map jessie-security testing"; + "silent-map squeeze-security oldoldstable"; + "silent-map wheezy-security oldstable"; + "silent-map jessie-security stable"; + "silent-map jessie-kfreebsd-security stable-kfreebsd"; + "silent-map stretch-security testing"; - "reject oldstable"; + "reject oldoldstable"; }; Dir diff --git a/config/debian/dak.conf b/config/debian/dak.conf index ebbac582..c8c642f5 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -121,23 +121,31 @@ Process-New SuiteMappings { - "silent-map squeeze-security oldstable-security"; - "silent-map wheezy-security stable-security"; - "silent-map jessie-security testing-security"; + "silent-map squeeze-security oldoldstable-security"; + "silent-map wheezy-security oldstable-security"; + "silent-map jessie-security stable-security"; + "silent-map jessie-kfreebsd-security stable-kfreebsd-security"; "propup-version stable-security testing testing-proposed-updates unstable"; "propup-version testing-security unstable"; - "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 jessie-kfreebsd testing-kfreebsd"; + "map squeeze oldoldstable"; + "map squeeze-proposed-updates oldoldstable-proposed-updates"; + "map squeeze-updates oldoldstable-proposed-updates"; + "map wheezy oldstable"; + "map wheezy-proposed-updates oldstable-proposed-updates"; + "map wheezy-updates oldstable-proposed-updates"; + "map jessie stable"; + "map jessie-proposed-updates proposed-updates"; + "map jessie-updates proposed-updates"; + "map jessie-kfreebsd stable-kfreebsd"; + "map jessie-kfreebsd-proposed-updates stable-kfreebsd-proposed-updates"; + "map stretch testing"; + "map stretch-proposed-updates testing-proposed-updates"; + "map stretch-updates testing-proposed-updates"; "map sid unstable"; "map rc-buggy experimental"; + "map oldoldstable oldoldstable-proposed-updates"; + "map oldoldstable-security oldoldstable-proposed-updates"; + "map oldoldstable-updates oldoldstable-proposed-updates"; "map oldstable oldstable-proposed-updates"; "map oldstable-security oldstable-proposed-updates"; "map oldstable-updates oldstable-proposed-updates"; @@ -145,6 +153,8 @@ SuiteMappings "map stable-security proposed-updates"; "map stable-proposed-updates proposed-updates"; "map stable-updates proposed-updates"; + "map stable-kfreebsd stable-kfreebsd-proposed-updates"; + "map stable-kfreebsd-security stable-kfreebsd-proposed-updates"; "map testing-updates testing-proposed-updates"; "map-unreleased stable unstable"; "map-unreleased proposed-updates unstable"; @@ -153,9 +163,11 @@ SuiteMappings "map-unreleased testing unstable"; "map-unreleased testing-proposed-updates unstable"; - "reject oldstable-proposed-updates"; - "reject testing-kfreebsd"; + "reject oldoldstable-proposed-updates"; + "reject stable-kfreebsd"; + "reject wheezy-updates"; "reject jessie-updates"; + "reject stretch-updates"; }; AutomaticByHandPackages { diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions index 6d0f74f7..2cf6e120 100644 --- a/config/debian/dinstall.functions +++ b/config/debian/dinstall.functions @@ -76,7 +76,7 @@ function i18n1() { # Lets check! if ${scriptsdir}/ddtp-i18n-check.sh . ${scriptdir}/i18n/${TSTAMP}; then # Yay, worked, lets copy around - for dir in jessie sid; do + for dir in stretch sid; do if [ -d dists/${dir}/ ]; then cd dists/${dir}/main/i18n rsync -aq --delete --delete-after --exclude Translation-en.bz2 --exclude Translation-*.diff/ . ${ftpdir}/dists/${dir}/main/i18n/. @@ -227,7 +227,7 @@ function mkmaintainers() { function copyoverrides() { log 'Copying override files into public view ...' - for ofile in ${overridedir}/override.{squeeze,wheezy,jessie,sid}.{,extra.}{main,contrib,non-free}*; do + for ofile in ${overridedir}/override.{squeeze,wheezy,jessie,stretch,sid}.{,extra.}{main,contrib,non-free}*; do bname=${ofile##*/} gzip -9cv --rsyncable ${ofile} > ${indices}/${bname}.gz chmod g+w ${indices}/${bname}.gz @@ -358,12 +358,12 @@ function mkfilesindices() { done (cd $base/ftp/ - for dist in sid jessie; do + for dist in sid jessie stretch; do find ./dists/$dist/main/i18n/ \! -type d | sort -u | gzip -9 > $base/ftp/indices/files/components/translation-$dist.list.gz done ) - (cat ../arch-i386.files ../arch-amd64.files; zcat suite-proposed-updates.list.gz ; zcat translation-sid.list.gz ; zcat translation-jessie.list.gz) | + (cat ../arch-i386.files ../arch-amd64.files; zcat suite-proposed-updates.list.gz ; zcat translation-sid.list.gz ; zcat translation-jessie.list.gz ; zcat translation-stretch.list.gz) | sort -u | poolfirst > ../typical.files rm -f $ARCHLIST diff --git a/scripts/debian/ddtp-i18n-check.sh b/scripts/debian/ddtp-i18n-check.sh index 71391154..93b2c192 100755 --- a/scripts/debian/ddtp-i18n-check.sh +++ b/scripts/debian/ddtp-i18n-check.sh @@ -81,7 +81,7 @@ elif [ ! -d "$PACKAGES_LISTS_DIR" ]; then fi #STABLE="squeeze" -TESTING="jessie" +TESTING="stretch" UNSTABLE="sid" # Original SHA256SUMS, generated by i18n.debian.net