shorten names

75 files changed, 9 insertions, 9 deletions

diff --git a/contrib/ci/generate-jobs b/contrib/ci/generate-jobs
index 18c11698a..4b1679f62 100755
--- a/contrib/ci/generate-jobs
+++ b/contrib/ci/generate-jobs
@@ -3,7 +3,7 @@ set -e
 
 export CI_DIR="$(pwd)/$(dirname $0)";
 
-# the number to use as a base for generated ci job indexes
+# the number to use as a base for gen ci job indexes
 BASE_IDX=100;
 # the amount of indexes to increment - the room a script has to put scripts in.
 INCREMENT=5;
@@ -27,7 +27,7 @@ DISTRO_IMAGES['debian']='docker.io/library/debian';
 DISTRO_IMAGES['archlinux']='docker.io/library/archlinux';
 
 chmod +w -R $CI_DIR/jobs;
-rm -rf $CI_DIR/jobs/*-generated;
+rm -rf $CI_DIR/jobs/*-gen $CI_DIR/jobs/*-generated;
 
 TMPBINDIR="/tmp/ci-temp-bin-$RANDOM/"
 mkdir -p "$TMPBINDIR"
@@ -42,7 +42,7 @@ mkfn mktarget '#!/bin/bash
 RELATIVEIDX=$1
 JOBNAME="$2"
 OURIDX=$(($IDX + $RELATIVEIDX))
-JOB="${OURIDX}-${JOBNAME}-${DISTRO}-${CODENAME}-${ARCH}-generated"
+JOB="${OURIDX}-${JOBNAME}-${DISTRO}-${CODENAME}-${ARCH}-gen"
 cd "$CI_DIR/jobs"
 mkdir -p "${JOB}"
 echo -n "${JOB}"
@@ -77,5 +77,5 @@ for TARGET in "${BUILD_FOR[@]}"; do
 done;
 
 rm -rf "$TMPBINDIR"
-chmod +x -R $CI_DIR/jobs/*-generated
-chmod -w -R $CI_DIR/jobs/*-generated
+chmod +x -R $CI_DIR/jobs/*-gen
+chmod -w -R $CI_DIR/jobs/*-gen
diff --git a/contrib/ci/jobs/100-build-debian-bookworm-amd64-generated/Containerfile b/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/Containerfile
index a7fe8a3ac..a7fe8a3ac 100755
--- a/contrib/ci/jobs/100-build-debian-bookworm-amd64-generated/Containerfile
+++ b/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/Containerfile
diff --git a/contrib/ci/jobs/100-build-debian-bookworm-amd64-generated/build.sh b/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/build.sh
index d3fcfab85..d3fcfab85 100755
--- a/contrib/ci/jobs/100-build-debian-bookworm-amd64-generated/build.sh
+++ b/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/build.sh
diff --git a/contrib/ci/jobs/100-build-debian-bookworm-amd64-generated/job.sh b/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/job.sh
index 8d79902c5..8d79902c5 100755
--- a/contrib/ci/jobs/100-build-debian-bookworm-amd64-generated/job.sh
+++ b/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/job.sh
diff --git a/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/Containerfile b/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-gen/Containerfile
index a7fe8a3ac..a7fe8a3ac 100755
--- a/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/Containerfile
+++ b/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-gen/Containerfile
diff --git a/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/install-fix.patch b/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-gen/install-fix.patch
index 8334c5a7a..8334c5a7a 100755
--- a/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/install-fix.patch
+++ b/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-gen/install-fix.patch
diff --git a/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/job.sh b/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-gen/job.sh
index 922f8bf63..922f8bf63 100755
--- a/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/job.sh
+++ b/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-gen/job.sh
diff --git a/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/version.sh b/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-gen/version.sh
index 52031b23a..52031b23a 100755
--- a/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/version.sh
+++ b/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-gen/version.sh
diff --git a/contrib/ci/jobs/102-deploy-package-debian-bookworm-amd64-generated/config.ini b/contrib/ci/jobs/102-upload-debian-bookworm-amd64-gen/config.ini
index 8d6409a6e..8d6409a6e 100755
--- a/contrib/ci/jobs/102-deploy-package-debian-bookworm-amd64-generated/config.ini
+++ b/contrib/ci/jobs/102-upload-debian-bookworm-amd64-gen/config.ini
diff --git a/contrib/ci/jobs/102-deploy-package-debian-bookworm-amd64-generated/job.sh b/contrib/ci/jobs/102-upload-debian-bookworm-amd64-gen/job.sh
index bc77ef954..bc77ef954 100755
--- a/contrib/ci/jobs/102-deploy-package-debian-bookworm-amd64-generated/job.sh
+++ b/contrib/ci/jobs/102-upload-debian-bookworm-amd64-gen/job.sh
diff --git a/contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/Containerfile b/contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/Containerfile
index a7fe8a3ac..a7fe8a3ac 100755
--- a/contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/Containerfile
+++ b/contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/Containerfile
diff --git a/contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/build.sh b/contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/build.sh
index d3fcfab85..d3fcfab85 100755
--- a/contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/build.sh
+++ b/contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/build.sh
diff --git a/contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/config.ini b/contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/config.ini
index 2a99a970e..2a99a970e 100755
--- a/contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/config.ini
+++ b/contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/config.ini
diff --git a/contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/job.sh b/contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/job.sh
index 8d79902c5..8d79902c5 100755
--- a/contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/job.sh
+++ b/contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/job.sh
diff --git a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/Containerfile b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/Containerfile
index a7fe8a3ac..a7fe8a3ac 100755
--- a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/Containerfile
+++ b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/Containerfile
diff --git a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/config.ini b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/config.ini
index 2a99a970e..2a99a970e 100755
--- a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/config.ini
+++ b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/config.ini
diff --git a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/install-fix.patch b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/install-fix.patch
index 8334c5a7a..8334c5a7a 100755
--- a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/install-fix.patch
+++ b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/install-fix.patch
diff --git a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/job.sh b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/job.sh
index 922f8bf63..922f8bf63 100755
--- a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/job.sh
+++ b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/job.sh
diff --git a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/version.sh b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/version.sh
index 52031b23a..52031b23a 100755
--- a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/version.sh
+++ b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/version.sh
diff --git a/contrib/ci/jobs/107-deploy-package-debian-bookworm-arm64-generated/config.ini b/contrib/ci/jobs/107-upload-debian-bookworm-arm64-gen/config.ini
index 8d6409a6e..8d6409a6e 100755
--- a/contrib/ci/jobs/107-deploy-package-debian-bookworm-arm64-generated/config.ini
+++ b/contrib/ci/jobs/107-upload-debian-bookworm-arm64-gen/config.ini
diff --git a/contrib/ci/jobs/107-deploy-package-debian-bookworm-arm64-generated/job.sh b/contrib/ci/jobs/107-upload-debian-bookworm-arm64-gen/job.sh
index bc77ef954..bc77ef954 100755
--- a/contrib/ci/jobs/107-deploy-package-debian-bookworm-arm64-generated/job.sh
+++ b/contrib/ci/jobs/107-upload-debian-bookworm-arm64-gen/job.sh
diff --git a/contrib/ci/jobs/110-build-debian-trixie-amd64-generated/Containerfile b/contrib/ci/jobs/110-build-debian-trixie-amd64-gen/Containerfile
index dc6d84149..dc6d84149 100755
--- a/contrib/ci/jobs/110-build-debian-trixie-amd64-generated/Containerfile
+++ b/contrib/ci/jobs/110-build-debian-trixie-amd64-gen/Containerfile
diff --git a/contrib/ci/jobs/110-build-debian-trixie-amd64-generated/build.sh b/contrib/ci/jobs/110-build-debian-trixie-amd64-gen/build.sh
index d3fcfab85..d3fcfab85 100755
--- a/contrib/ci/jobs/110-build-debian-trixie-amd64-generated/build.sh
+++ b/contrib/ci/jobs/110-build-debian-trixie-amd64-gen/build.sh
diff --git a/contrib/ci/jobs/110-build-debian-trixie-amd64-generated/job.sh b/contrib/ci/jobs/110-build-debian-trixie-amd64-gen/job.sh
index 8d79902c5..8d79902c5 100755
--- a/contrib/ci/jobs/110-build-debian-trixie-amd64-generated/job.sh
+++ b/contrib/ci/jobs/110-build-debian-trixie-amd64-gen/job.sh
diff --git a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/Containerfile b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/Containerfile
index dc6d84149..dc6d84149 100755
--- a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/Containerfile
+++ b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/Containerfile
diff --git a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/install-fix.patch b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/install-fix.patch
index 8334c5a7a..8334c5a7a 100755
--- a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/install-fix.patch
+++ b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/install-fix.patch
diff --git a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/job.sh b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/job.sh
index 922f8bf63..922f8bf63 100755
--- a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/job.sh
+++ b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/job.sh
diff --git a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/version.sh b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/version.sh
index 52031b23a..52031b23a 100755
--- a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/version.sh
+++ b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/version.sh
diff --git a/contrib/ci/jobs/112-deploy-package-debian-trixie-amd64-generated/config.ini b/contrib/ci/jobs/112-upload-debian-trixie-amd64-gen/config.ini
index 8d6409a6e..8d6409a6e 100755
--- a/contrib/ci/jobs/112-deploy-package-debian-trixie-amd64-generated/config.ini
+++ b/contrib/ci/jobs/112-upload-debian-trixie-amd64-gen/config.ini
diff --git a/contrib/ci/jobs/112-deploy-package-debian-trixie-amd64-generated/job.sh b/contrib/ci/jobs/112-upload-debian-trixie-amd64-gen/job.sh
index 4793d5bb1..4793d5bb1 100755
--- a/contrib/ci/jobs/112-deploy-package-debian-trixie-amd64-generated/job.sh
+++ b/contrib/ci/jobs/112-upload-debian-trixie-amd64-gen/job.sh
diff --git a/contrib/ci/jobs/115-build-debian-trixie-arm64-generated/Containerfile b/contrib/ci/jobs/115-build-debian-trixie-arm64-gen/Containerfile
index dc6d84149..dc6d84149 100755
--- a/contrib/ci/jobs/115-build-debian-trixie-arm64-generated/Containerfile
+++ b/contrib/ci/jobs/115-build-debian-trixie-arm64-gen/Containerfile
diff --git a/contrib/ci/jobs/115-build-debian-trixie-arm64-generated/build.sh b/contrib/ci/jobs/115-build-debian-trixie-arm64-gen/build.sh
index d3fcfab85..d3fcfab85 100755
--- a/contrib/ci/jobs/115-build-debian-trixie-arm64-generated/build.sh
+++ b/contrib/ci/jobs/115-build-debian-trixie-arm64-gen/build.sh
diff --git a/contrib/ci/jobs/115-build-debian-trixie-arm64-generated/config.ini b/contrib/ci/jobs/115-build-debian-trixie-arm64-gen/config.ini
index 2a99a970e..2a99a970e 100755
--- a/contrib/ci/jobs/115-build-debian-trixie-arm64-generated/config.ini
+++ b/contrib/ci/jobs/115-build-debian-trixie-arm64-gen/config.ini
diff --git a/contrib/ci/jobs/115-build-debian-trixie-arm64-generated/job.sh b/contrib/ci/jobs/115-build-debian-trixie-arm64-gen/job.sh
index 8d79902c5..8d79902c5 100755
--- a/contrib/ci/jobs/115-build-debian-trixie-arm64-generated/job.sh
+++ b/contrib/ci/jobs/115-build-debian-trixie-arm64-gen/job.sh
diff --git a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/Containerfile b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/Containerfile
index dc6d84149..dc6d84149 100755
--- a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/Containerfile
+++ b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/Containerfile
diff --git a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/config.ini b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/config.ini
index 2a99a970e..2a99a970e 100755
--- a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/config.ini
+++ b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/config.ini
diff --git a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/install-fix.patch b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/install-fix.patch
index 8334c5a7a..8334c5a7a 100755
--- a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/install-fix.patch
+++ b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/install-fix.patch
diff --git a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/job.sh b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/job.sh
index 922f8bf63..922f8bf63 100755
--- a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/job.sh
+++ b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/job.sh
diff --git a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/version.sh b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/version.sh
index 52031b23a..52031b23a 100755
--- a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/version.sh
+++ b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/version.sh
diff --git a/contrib/ci/jobs/117-deploy-package-debian-trixie-arm64-generated/config.ini b/contrib/ci/jobs/117-upload-debian-trixie-arm64-gen/config.ini
index 8d6409a6e..8d6409a6e 100755
--- a/contrib/ci/jobs/117-deploy-package-debian-trixie-arm64-generated/config.ini
+++ b/contrib/ci/jobs/117-upload-debian-trixie-arm64-gen/config.ini
diff --git a/contrib/ci/jobs/117-deploy-package-debian-trixie-arm64-generated/job.sh b/contrib/ci/jobs/117-upload-debian-trixie-arm64-gen/job.sh
index 4793d5bb1..4793d5bb1 100755
--- a/contrib/ci/jobs/117-deploy-package-debian-trixie-arm64-generated/job.sh
+++ b/contrib/ci/jobs/117-upload-debian-trixie-arm64-gen/job.sh
diff --git a/contrib/ci/jobs/120-build-debian-unstable-amd64-generated/Containerfile b/contrib/ci/jobs/120-build-debian-unstable-amd64-gen/Containerfile
index c3bbade45..c3bbade45 100755
--- a/contrib/ci/jobs/120-build-debian-unstable-amd64-generated/Containerfile
+++ b/contrib/ci/jobs/120-build-debian-unstable-amd64-gen/Containerfile
diff --git a/contrib/ci/jobs/120-build-debian-unstable-amd64-generated/build.sh b/contrib/ci/jobs/120-build-debian-unstable-amd64-gen/build.sh
index d3fcfab85..d3fcfab85 100755
--- a/contrib/ci/jobs/120-build-debian-unstable-amd64-generated/build.sh
+++ b/contrib/ci/jobs/120-build-debian-unstable-amd64-gen/build.sh
diff --git a/contrib/ci/jobs/120-build-debian-unstable-amd64-generated/job.sh b/contrib/ci/jobs/120-build-debian-unstable-amd64-gen/job.sh
index 8d79902c5..8d79902c5 100755
--- a/contrib/ci/jobs/120-build-debian-unstable-amd64-generated/job.sh
+++ b/contrib/ci/jobs/120-build-debian-unstable-amd64-gen/job.sh
diff --git a/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/Containerfile b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/Containerfile
index c3bbade45..c3bbade45 100755
--- a/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/Containerfile
+++ b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/Containerfile
diff --git a/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/install-fix.patch b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/install-fix.patch
index 8334c5a7a..8334c5a7a 100755
--- a/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/install-fix.patch
+++ b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/install-fix.patch
diff --git a/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/job.sh b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/job.sh
index 922f8bf63..922f8bf63 100755
--- a/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/job.sh
+++ b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/job.sh
diff --git a/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/version.sh b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/version.sh
index 52031b23a..52031b23a 100755
--- a/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/version.sh
+++ b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/version.sh
diff --git a/contrib/ci/jobs/122-deploy-package-debian-unstable-amd64-generated/config.ini b/contrib/ci/jobs/122-upload-debian-unstable-amd64-gen/config.ini
index 8d6409a6e..8d6409a6e 100755
--- a/contrib/ci/jobs/122-deploy-package-debian-unstable-amd64-generated/config.ini
+++ b/contrib/ci/jobs/122-upload-debian-unstable-amd64-gen/config.ini
diff --git a/contrib/ci/jobs/122-deploy-package-debian-unstable-amd64-generated/job.sh b/contrib/ci/jobs/122-upload-debian-unstable-amd64-gen/job.sh
index ac6c27e56..ac6c27e56 100755
--- a/contrib/ci/jobs/122-deploy-package-debian-unstable-amd64-generated/job.sh
+++ b/contrib/ci/jobs/122-upload-debian-unstable-amd64-gen/job.sh
diff --git a/contrib/ci/jobs/125-build-debian-unstable-arm64-generated/Containerfile b/contrib/ci/jobs/125-build-debian-unstable-arm64-gen/Containerfile
index c3bbade45..c3bbade45 100755
--- a/contrib/ci/jobs/125-build-debian-unstable-arm64-generated/Containerfile
+++ b/contrib/ci/jobs/125-build-debian-unstable-arm64-gen/Containerfile
diff --git a/contrib/ci/jobs/125-build-debian-unstable-arm64-generated/build.sh b/contrib/ci/jobs/125-build-debian-unstable-arm64-gen/build.sh
index d3fcfab85..d3fcfab85 100755
--- a/contrib/ci/jobs/125-build-debian-unstable-arm64-generated/build.sh
+++ b/contrib/ci/jobs/125-build-debian-unstable-arm64-gen/build.sh
diff --git a/contrib/ci/jobs/125-build-debian-unstable-arm64-generated/config.ini b/contrib/ci/jobs/125-build-debian-unstable-arm64-gen/config.ini
index 2a99a970e..2a99a970e 100755
--- a/contrib/ci/jobs/125-build-debian-unstable-arm64-generated/config.ini
+++ b/contrib/ci/jobs/125-build-debian-unstable-arm64-gen/config.ini
diff --git a/contrib/ci/jobs/125-build-debian-unstable-arm64-generated/job.sh b/contrib/ci/jobs/125-build-debian-unstable-arm64-gen/job.sh
index 8d79902c5..8d79902c5 100755
--- a/contrib/ci/jobs/125-build-debian-unstable-arm64-generated/job.sh
+++ b/contrib/ci/jobs/125-build-debian-unstable-arm64-gen/job.sh
diff --git a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/Containerfile b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/Containerfile
index c3bbade45..c3bbade45 100755
--- a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/Containerfile
+++ b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/Containerfile
diff --git a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/config.ini b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/config.ini
index 2a99a970e..2a99a970e 100755
--- a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/config.ini
+++ b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/config.ini
diff --git a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/install-fix.patch b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/install-fix.patch
index 8334c5a7a..8334c5a7a 100755
--- a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/install-fix.patch
+++ b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/install-fix.patch
diff --git a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/job.sh b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/job.sh
index 922f8bf63..922f8bf63 100755
--- a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/job.sh
+++ b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/job.sh
diff --git a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/version.sh b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/version.sh
index 52031b23a..52031b23a 100755
--- a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/version.sh
+++ b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/version.sh
diff --git a/contrib/ci/jobs/127-deploy-package-debian-unstable-arm64-generated/config.ini b/contrib/ci/jobs/127-upload-debian-unstable-arm64-gen/config.ini
index 8d6409a6e..8d6409a6e 100755
--- a/contrib/ci/jobs/127-deploy-package-debian-unstable-arm64-generated/config.ini
+++ b/contrib/ci/jobs/127-upload-debian-unstable-arm64-gen/config.ini
diff --git a/contrib/ci/jobs/127-deploy-package-debian-unstable-arm64-generated/job.sh b/contrib/ci/jobs/127-upload-debian-unstable-arm64-gen/job.sh
index ac6c27e56..ac6c27e56 100755
--- a/contrib/ci/jobs/127-deploy-package-debian-unstable-arm64-generated/job.sh
+++ b/contrib/ci/jobs/127-upload-debian-unstable-arm64-gen/job.sh
diff --git a/contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/Containerfile b/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/Containerfile
index c3bbade45..c3bbade45 100755
--- a/contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/Containerfile
+++ b/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/Containerfile
diff --git a/contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/build.sh b/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/build.sh
index d3fcfab85..d3fcfab85 100755
--- a/contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/build.sh
+++ b/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/build.sh
diff --git a/contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/config.ini b/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/config.ini
index f3afa2db7..f3afa2db7 100755
--- a/contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/config.ini
+++ b/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/config.ini
diff --git a/contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/job.sh b/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/job.sh
index 8d79902c5..8d79902c5 100755
--- a/contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/job.sh
+++ b/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/job.sh
diff --git a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/Containerfile b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/Containerfile
index c3bbade45..c3bbade45 100755
--- a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/Containerfile
+++ b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/Containerfile
diff --git a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/config.ini b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/config.ini
index f3afa2db7..f3afa2db7 100755
--- a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/config.ini
+++ b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/config.ini
diff --git a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/install-fix.patch b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/install-fix.patch
index 8334c5a7a..8334c5a7a 100755
--- a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/install-fix.patch
+++ b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/install-fix.patch
diff --git a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/job.sh b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/job.sh
index 922f8bf63..922f8bf63 100755
--- a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/job.sh
+++ b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/job.sh
diff --git a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/version.sh b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/version.sh
index 52031b23a..52031b23a 100755
--- a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/version.sh
+++ b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/version.sh
diff --git a/contrib/ci/jobs/132-deploy-package-debian-unstable-riscv64-generated/config.ini b/contrib/ci/jobs/132-upload-debian-unstable-riscv64-gen/config.ini
index 8d6409a6e..8d6409a6e 100755
--- a/contrib/ci/jobs/132-deploy-package-debian-unstable-riscv64-generated/config.ini
+++ b/contrib/ci/jobs/132-upload-debian-unstable-riscv64-gen/config.ini
diff --git a/contrib/ci/jobs/132-deploy-package-debian-unstable-riscv64-generated/job.sh b/contrib/ci/jobs/132-upload-debian-unstable-riscv64-gen/job.sh
index ac6c27e56..ac6c27e56 100755
--- a/contrib/ci/jobs/132-deploy-package-debian-unstable-riscv64-generated/job.sh
+++ b/contrib/ci/jobs/132-upload-debian-unstable-riscv64-gen/job.sh
diff --git a/contrib/ci/targets/debian/setup-job.sh b/contrib/ci/targets/debian/setup-job.sh
index ff3e2c34a..ad61c3ef1 100755
--- a/contrib/ci/targets/debian/setup-job.sh
+++ b/contrib/ci/targets/debian/setup-job.sh
@@ -44,7 +44,7 @@ CONTAINER_ARCH = '"$ARCH"'
 ' > config.ini
 fi;
 
-# Generate the deploy-package target
-cd "${CI_DIR}/jobs/$(mktarget 2 deploy-package)"
-cp "$DISTRO_TARGET/deploy-package/config.ini" ./
-sed "s|bookworm|$CODENAME|g" "$DISTRO_TARGET/deploy-package/job.sh" > ./job.sh
+# Generate the upload target
+cd "${CI_DIR}/jobs/$(mktarget 2 upload)"
+cp "$DISTRO_TARGET/upload/config.ini" ./
+sed "s|bookworm|$CODENAME|g" "$DISTRO_TARGET/upload/job.sh" > ./job.sh
diff --git a/contrib/ci/targets/debian/deploy-package/config.ini b/contrib/ci/targets/debian/upload/config.ini
index 8d6409a6e..8d6409a6e 100644
--- a/contrib/ci/targets/debian/deploy-package/config.ini
+++ b/contrib/ci/targets/debian/upload/config.ini
diff --git a/contrib/ci/targets/debian/deploy-package/job.sh b/contrib/ci/targets/debian/upload/job.sh
index bc77ef954..bc77ef954 100755
--- a/contrib/ci/targets/debian/deploy-package/job.sh
+++ b/contrib/ci/targets/debian/upload/job.sh