From bc0f26a328ff6f3a26ff0f04a6e51a8ac6cd5e7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9F=98=B8?= <😸@43-1.org>
Date: Fri, 18 Sep 2020 19:45:34 +0200
Subject: [PATCH] release.txt: use (old)*stable-backports as suitename

Before we used the codename also as the suitename.

Reference: https://bugs.debian.org/714726
---
 docs/release.txt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/release.txt b/docs/release.txt
index b2ad7c19..1f5693ff 100644
--- a/docs/release.txt
+++ b/docs/release.txt
@@ -310,13 +310,13 @@ dak admin v-c add experimental MustBeNewerThan testing
 # copy d-i to new testing (so same d-i in stable, testing, unstable)
 
 # backports
-dak admin suite add ${new_oldstable}-backports-sloppy '' origin="Debian Backports" label='Debian Backports' codename=${new_oldstable}-backports-sloppy description='Debian 9 - Sloppy Backports' archive=ftp-master
-dak admin suite add ${new_oldstable}-backports-sloppy-debug '' origin="Debian Backports" label='Debian Backports debug' codename=${new_oldstable}-backports-sloppy-debug description='Debian 9 - Sloppy Backports - Debug Information' archive=debian-debug
+dak admin suite add oldstable-backports-sloppy '' origin="Debian Backports" label='Debian Backports' codename=${new_oldstable}-backports-sloppy description='Debian 9 - Sloppy Backports' archive=ftp-master
+dak admin suite add oldstable-backports-sloppy-debug '' origin="Debian Backports" label='Debian Backports debug' codename=${new_oldstable}-backports-sloppy-debug description='Debian 9 - Sloppy Backports - Debug Information' archive=debian-debug
 
-dak admin suite add ${new_stable}-backports-debug '' origin="Debian Backports" label='Debian Backports debug' codename=${new_stable}-debug description='Debian 10 - Backports - Debug Information' archive=debian-debug
+dak admin suite add stable-backports-debug '' origin="Debian Backports" label='Debian Backports debug' codename=${new_stable}-debug description='Debian 10 - Backports - Debug Information' archive=debian-debug
 
-dak admin suite add ${new_testing}-backports '' origin="Debian Backports" label='Debian Backports' codename=${new_testing}-backports description='Debian X.Y - Backports' archive=ftp-master
-dak admin suite add ${new_testing}-backports-debug '' origin="Debian Backports" label='Debian Backports debug' codename=${new_testing}-backports-debug description='Debian X.Y - Backports - Debug Information' archive=debian-debug
+dak admin suite add testing-backports '' origin="Debian Backports" label='Debian Backports' codename=${new_testing}-backports description='Debian X.Y - Backports' archive=ftp-master
+dak admin suite add testing-backports-debug '' origin="Debian Backports" label='Debian Backports debug' codename=${new_testing}-backports-debug description='Debian X.Y - Backports - Debug Information' archive=debian-debug
 
 configure-backports-suite() {
   local suite=${1:?}
@@ -326,13 +326,13 @@ configure-backports-suite() {
   dak admin suite-config set ${suite} notautomatic=true butautomaticupgrades=true accept_source_uploads=false accept_binary_uploads=false close_bugs=false
 }
 
-for suite in ${new_oldstable}-backports-sloppy ${new_oldstable}-backports-sloppy-debug; do
+for suite in oldstable-backports-sloppy oldstable-backports-sloppy-debug; do
   configure-backports-suite ${suite} ${new_oldstable}
 done
-for suite in ${new_stable}-backports-debug; do
+for suite in stable-backports-debug; do
   configure-backports-suite ${suite} ${new_stable}
 done
-for suite in ${new_testing}-backports ${new_testing}-backports-debug; do
+for suite in testing-backports testing-backports-debug; do
   configure-backports-suite ${suite} ${new_testing}
 done
 
-- 
GitLab