[dak/master] Stretch release
- remove squeeze
- wheezy is oldoldstable
- jessie is oldstable
- stretch is stable
- welcome buster as testing
---
config/debian-security/cron.buildd | 12 ++++----
config/debian-security/cron.daily | 6 ++--
config/debian-security/dak.conf | 10 +++----
config/debian/dak.conf | 45 ++++++++++++++--------------
config/debian/dinstall.functions | 6 ++--
config/homedir/ssh/ftpmaster-authorized_keys | 1 +
scripts/debian/ddtp-i18n-check.sh | 2 +-
7 files changed, 42 insertions(+), 40 deletions(-)
diff --git a/config/debian-security/cron.buildd b/config/debian-security/cron.buildd
index 88d62ca..47ac74f 100755
--- a/config/debian-security/cron.buildd
+++ b/config/debian-security/cron.buildd
@@ -34,20 +34,20 @@ if [ ! -z "${dists}" ]; then
for d in ${dists}; do
case ${d} in
oldoldstable)
- send=squeeze
- ;;
- oldstable)
send=wheezy
;;
- stable)
+ oldstable)
send=jessie
;;
- stable-kfreebsd)
+ oldstable-kfreebsd)
send=jessie-kfreebsd
;;
- testing)
+ stable)
send=stretch
;;
+ testing)
+ send=buster
+ ;;
*)
send=unknown
;;
diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily
index 9417a85..3e3efa6 100755
--- a/config/debian-security/cron.daily
+++ b/config/debian-security/cron.daily
@@ -23,9 +23,9 @@ find . -maxdepth 1 -mindepth 1 -type l -delete
for suite in oldstable stable testing; do
case $suite in
- oldstable) override_suite=wheezy ;;
- stable) override_suite=jessie ;;
- testing) override_suite=stretch ;;
+ oldstable) override_suite=jessie ;;
+ stable) override_suite=stretch ;;
+ testing) override_suite=buster ;;
*) 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 f2c0eed..bf8b7ee 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -118,11 +118,11 @@ SuiteMappings
"silent-map oldstable-security oldstable";
"silent-map oldoldstable-security oldoldstable";
"silent-map testing-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";
+ "silent-map wheezy-security oldoldstable";
+ "silent-map jessie-security oldstable";
+ "silent-map jessie-kfreebsd-security oldstable-kfreebsd";
+ "silent-map stretch-security stable";
+ "silent-map buster-security testing";
"reject oldoldstable";
};
diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index da7bf57..d66a5c2 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -121,27 +121,27 @@ Process-New
SuiteMappings
{
- "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";
- "silent-map stretch-security testing-security";
+ "silent-map wheezy-security oldoldstable-security";
+ "silent-map jessie-security oldstable-security";
+ "silent-map jessie-kfreebsd-security oldstable-kfreebsd-security";
+ "silent-map stretch-security stable-security";
+ "silent-map buster-security testing-security";
"propup-version stable-security testing testing-proposed-updates unstable";
"propup-version testing-security unstable";
- "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 wheezy oldoldstable";
+ "map wheezy-proposed-updates oldoldstable-proposed-updates";
+ "map wheezy-updates oldoldstable-proposed-updates";
+ "map jessie oldstable";
+ "map jessie-proposed-updates oldstable-proposed-updates";
+ "map jessie-updates oldstable-proposed-updates";
+ "map jessie-kfreebsd oldstable-kfreebsd";
+ "map jessie-kfreebsd-proposed-updates oldstable-kfreebsd-proposed-updates";
+ "map stretch stable";
+ "map stretch-proposed-updates proposed-updates";
+ "map stretch-updates proposed-updates";
+ "map buster testing";
+ "map buster-proposed-updates testing-proposed-updates";
+ "map buster-updates testing-proposed-updates";
"map sid unstable";
"map rc-buggy experimental";
"map oldoldstable oldoldstable-proposed-updates";
@@ -150,12 +150,12 @@ SuiteMappings
"map oldstable oldstable-proposed-updates";
"map oldstable-security oldstable-proposed-updates";
"map oldstable-updates oldstable-proposed-updates";
+ "map oldstable-kfreebsd oldstable-kfreebsd-proposed-updates";
+ "map oldstable-kfreebsd-security oldstable-kfreebsd-proposed-updates";
"map stable proposed-updates";
"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";
@@ -165,10 +165,11 @@ SuiteMappings
"map-unreleased testing-proposed-updates unstable";
"reject oldoldstable-proposed-updates";
- "reject stable-kfreebsd";
+ "reject oldstable-kfreebsd";
"reject wheezy-updates";
"reject jessie-updates";
"reject stretch-updates";
+ "reject buster-updates";
};
AutomaticByHandPackages {
diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 06fa019..bdf3bf2 100755
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -272,7 +272,7 @@ function copyoverrides() {
(
shopt -s nullglob
- for ofile in ${overridedir}/override.{squeeze,wheezy,jessie,stretch,sid}.{,extra.}{main,contrib,non-free}*; do
+ for ofile in ${overridedir}/override.{wheezy,jessie,stretch,buster,sid}.{,extra.}{main,contrib,non-free}*; do
bname=${ofile##*/}
gzip -9cv --rsyncable --no-name ${ofile} > ${indices}/${bname}.gz
chmod g+w ${indices}/${bname}.gz
@@ -404,12 +404,12 @@ function mkfilesindices() {
done
(cd $base/ftp/
- for dist in sid jessie stretch; do
+ for dist in sid jessie stretch buster; 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 ; zcat translation-stretch.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 ; zcat translation-buster.list.gz) |
sort -u | poolfirst > ../typical.files
rm -f $ARCHLIST
diff --git a/config/homedir/ssh/ftpmaster-authorized_keys b/config/homedir/ssh/ftpmaster-authorized_keys
index 6d63a0d..b0dadb5 100644
--- a/config/homedir/ssh/ftpmaster-authorized_keys
+++ b/config/homedir/ssh/ftpmaster-authorized_keys
@@ -7,6 +7,7 @@ command="/srv/ftp-master.debian.org/dak/scripts/debian/import_dataset.sh testing
command="/srv/ftp-master.debian.org/dak/scripts/debian/import_dataset.sh squeeze-updates",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="138.16.160.12,franck.debian.org,5.153.231.29,2001:41c8:1000:21::21:29,respighi.debian.org" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAs0CFETy4E2rR7sH5kl5tgPVltcimtdmkpWSYLO+AJrrTvN447KjL0GhAc9raWv/wp6UeGw9zhOOxH6UGGD2DKI+lIZKW2PraLnQMs9g67B7Q/7MH7rHIzKue1niOANgPZppQ18rdiexagWyj+E8z/A1cFqpfaIIupi543eXZ4yZV3fjrHIE6zTvIzoTzlAZ5IaCOYyFT8wx6Ql53aEZfMk6S1FvXou24wFBD08CArTjRMf2eYo/aPqWbJs955eZwNqp1kS4jtJKwc7DCKpY7elHCyIqfR7YZxTUOBEGpoaAIfjIitgEedZnuMmBl8IUi1jQ0HvM7HDb4n4NVR/hbew== release@franck
command="/srv/ftp-master.debian.org/dak/scripts/debian/import_dataset.sh wheezy-updates",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="138.16.160.12,franck.debian.org,5.153.231.29,2001:41c8:1000:21::21:29,respighi.debian.org" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBFRjQe43ruKGoTUFUOD9B2RG6yKfd2H402ywB3m7kEUGgsE0CI6+qGO0J/xiY6P4CBSVH1uwUpxxKvFJbVTI6227O9+1LnpeNliKcHo3H0i//Or18f1+mL1zoHAGimFvDydtnbYiSstYOzzPfvkaf1HPOZtaBUO2HleARbGR2zFtjZ3R/2QKj7a3xNQ/AkFY+N8YquqqRh4gNY8vEPTCVgNl/jy4Kb7lDtHAfS8O6oxDkqVon2nPO4KTgawYXw90CyBZP2/it5JUg5Z19U0mjw0wJ0hP7fU6tuSOm16ClS3w0phXRSsRO+jj7ngdSEhCFklmVSQtbX0+k7hNQKM91 release@franck
command="/srv/ftp-master.debian.org/dak/scripts/debian/import_dataset.sh jessie-updates",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="138.16.160.12,franck.debian.org,5.153.231.29,2001:41c8:1000:21::21:29,respighi.debian.org" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDxfl1ufQv7gtWZnFXCPdZKp3faa4sS3/LYLIcyojZkUMHLt05Rz4gKqU2XUdLXZ7BL9bfggC+O3OJu0uDQFgwAW8G+vwdLG9tSbCPJ4dLq2S1zS1Oe5ZLEmudDcQ6vVTv+zrzq8KAqsi1HvxctdSI/cDJV37zvStbgEhEQ1zURrZXgItxGNL07fxoVXBWpwSD7gPEzTBAc/+MPk/8krsF9wLXsVMGls8qxHmjyL1aBBItYOgUAdo5PMPy203+aO8BC5ExKzqMk/T6x/mvZ5IaWl0IgSvEizgO8Q07mpa8+A0p+uAiFe01rJpYaSdLsOnbr0gu+cBBMP1VEJzQw8sAB release@franck
+command="/srv/ftp-master.debian.org/dak/scripts/debian/import_dataset.sh stretch-updates",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="138.16.160.12,franck.debian.org,5.153.231.29,2001:41c8:1000:21::21:29,respighi.debian.org" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC19ORZTjAB3fXAnUUWHVPNKVNKF+SVLGqq28M03pNkZgcAfH79q2Q/1lDOajDzxarKTxrP4wyoniiquy4PsZXrUpSyPJgnkxvlaTwDE6OupXJsaCawKcFe6eitFY9tWR2Bu71WXzjHHFI/6G9bLoiVRFAuxP/pOSJQ1doB7NEdQu8i+/hlN++0Itoa9WiHfK7PcBXjFa3eM6NqYKskxp0+cEWKV/GY51/DNp34mUO+e/ad49wz6URK8bCkdIu/ExLIAfQqLOePcSMH8XxGj6hs/Uk/CH+QzyXRZSzDU5G2QLCMN2XaoCosLzZdP7CaiWhvNth09djjPmKA8xeIZpQX release@respighi
# release team tpu removals
command="/srv/ftp-master.debian.org/dak/scripts/debian/release_team_removals.sh",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="138.16.160.12,franck.debian.org,5.153.231.29,2001:41c8:1000:21::21:29,respighi.debian.org" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCw6DLpbCsiadOqxenRfW5In7UFG5HoIDt0xV/dRDbqNUUihNcDi6SqlREuSBCA75lOqbhL1w2tWsdsTIMnJeq3Fdr3LdFjIKlG6QQZVThaD3SI76EkGtjt0XQDoN2d4hi0Xn2LOPKz8hxaY4jKYzSUN0TVue3C1EHTJD0S8Grkd5tPaDgXt4pJzHmNwT4r2dH5OT3Y3vJL2UGhbY6Y+rNFfmnKzDcBtNdUTLTtrAfCCMkPITTYrMvZevA9u/SzNenN9qwEQicc06FrycSCi6+XSA+t4k1YNf1NTHhTQEncEX4/FRf+jgbkt1lkchiu+eShx3bUZCsKPuoNEsuWUU5v release@franck
diff --git a/scripts/debian/ddtp-i18n-check.sh b/scripts/debian/ddtp-i18n-check.sh
index 93b2c19..ecdc511 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="stretch"
+TESTING="buster"
UNSTABLE="sid"
# Original SHA256SUMS, generated by i18n.debian.net
--
2.1.4
Reply to: