--- Begin Message ---
Package: release.debian.org
Severity: normal
Tags: trixie
X-Debbugs-Cc: [email protected]
Control: affects -1 + src:devscripts
User: [email protected]
Usertags: pu
[ Reason ]
dch --stable & dch --bpo need to use trixie not bookworm
[ Impact ]
Needs to manually correct the changelog.
[ Tests ]
Package test suite.
[ Risks ]
Low, only dch is changed.
[ Checklist ]
[x] *all* changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in (old)stable
[x] the issue is verified as fixed in unstable
[ Changes ]
The branch needs to be updated for debcheckout & git-buildpackage.
Likewise the distribution for Salsa CI.
The debchange code and its test are updated for trixie.
[ Other info ]
N/A
diff -Nru devscripts-2.25.15/debian/changelog
devscripts-2.25.15+deb13u1/debian/changelog
--- devscripts-2.25.15/debian/changelog 2025-06-16 09:49:57.000000000 +0200
+++ devscripts-2.25.15+deb13u1/debian/changelog 2025-08-15 12:53:58.000000000
+0200
@@ -1,3 +1,11 @@
+devscripts (2.25.15+deb13u1) trixie; urgency=medium
+
+ * Team upload.
+ * Update branch in gbp.conf & Vcs-Git URL.
+ * debchange: trixie is now stable, forky is testing.
+
+ -- Bas Couwenberg <[email protected]> Fri, 15 Aug 2025 12:53:58 +0200
+
devscripts (2.25.15) unstable; urgency=medium
[ Yadd ]
diff -Nru devscripts-2.25.15/debian/control
devscripts-2.25.15+deb13u1/debian/control
--- devscripts-2.25.15/debian/control 2025-05-08 01:26:41.000000000 +0200
+++ devscripts-2.25.15+deb13u1/debian/control 2025-08-15 12:53:58.000000000
+0200
@@ -69,7 +69,7 @@
Standards-Version: 4.7.2
Rules-Requires-Root: no
Vcs-Browser: https://salsa.debian.org/debian/devscripts
-Vcs-Git: https://salsa.debian.org/debian/devscripts.git
+Vcs-Git: https://salsa.debian.org/debian/devscripts.git -b trixie
Package: devscripts
Architecture: all
diff -Nru devscripts-2.25.15/debian/gbp.conf
devscripts-2.25.15+deb13u1/debian/gbp.conf
--- devscripts-2.25.15/debian/gbp.conf 2024-11-23 11:24:47.000000000 +0100
+++ devscripts-2.25.15+deb13u1/debian/gbp.conf 2025-08-15 12:53:58.000000000
+0200
@@ -1,3 +1,3 @@
[DEFAULT]
-debian-branch = main
+debian-branch = trixie
debian-tag = v%(version)s
diff -Nru devscripts-2.25.15/debian/salsa-ci.yml
devscripts-2.25.15+deb13u1/debian/salsa-ci.yml
--- devscripts-2.25.15/debian/salsa-ci.yml 2025-05-08 01:26:41.000000000
+0200
+++ devscripts-2.25.15+deb13u1/debian/salsa-ci.yml 2025-08-15
12:53:58.000000000 +0200
@@ -1,3 +1,6 @@
---
include:
-
https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
+
+vars:
+ RELEASE: 'trixie'
diff -Nru devscripts-2.25.15/scripts/debchange.bash_completion
devscripts-2.25.15+deb13u1/scripts/debchange.bash_completion
--- devscripts-2.25.15/scripts/debchange.bash_completion 2025-05-08
01:26:41.000000000 +0200
+++ devscripts-2.25.15+deb13u1/scripts/debchange.bash_completion
2025-08-15 12:53:58.000000000 +0200
@@ -25,9 +25,9 @@
#--------------------------------------------------------------------------
#FIXME: I don't want hard-coding codename...
#--------------------------------------------------------------------------
- oldstable_codename='bullseye'
- stable_codename='bookworm'
- testing_codename='trixie'
+ oldstable_codename='bookworm'
+ stable_codename='trixie'
+ testing_codename='forky'
distro="oldstable-security oldstable-proposed-updates\
"$oldstable_codename"-security\
diff -Nru devscripts-2.25.15/scripts/debchange.pl
devscripts-2.25.15+deb13u1/scripts/debchange.pl
--- devscripts-2.25.15/scripts/debchange.pl 2025-05-12 11:09:14.000000000
+0200
+++ devscripts-2.25.15+deb13u1/scripts/debchange.pl 2025-08-15
12:53:58.000000000 +0200
@@ -163,10 +163,10 @@
distribution name
--bpo
Increment the Debian release number for a backports upload
- to "bookworm-backports"
+ to "trixie-backports"
--sloppy
Increment the Debian release number for a sloppy backports upload
- to "bullseye-backports-sloppy"
+ to "bookworm-backports-sloppy"
--stable
Increment the Debian release number for a stable upload.
-l, --local <suffix>
@@ -526,7 +526,7 @@
if (defined $opt_D) {
if ($vendor eq 'Debian') {
unless ($opt_D
- =~
/^(experimental|unstable|sid|UNRELEASED|((old){0,2}stable|testing|buster|bullseye|bookworm|trixie)(-proposed-updates|-security)?|proposed-updates)$/
+ =~
/^(experimental|unstable|sid|UNRELEASED|((old){0,2}stable|testing|buster|bullseye|bookworm|trixie|forky)(-proposed-updates|-security)?|proposed-updates)$/
) {
my $deb_info = get_debian_distro_info();
my ($oldstable_backports, $stable_backports) = ("", "");
@@ -549,9 +549,9 @@
if $oldstable_backports;
warn "$progname warning: Recognised distributions are: \n"
. "experimental, unstable, testing, stable, oldstable,
oldoldstable,\n"
- . "{trixie,bookworm,bullseye,buster}-proposed-updates,\n"
+ .
"{forky,trixie,bookworm,bullseye,buster}-proposed-updates,\n"
.
"{testing,stable,oldstable,oldoldstable}-proposed-updates,\n"
- . "{trixie,bookworm,bullseye,buster}-security,\n"
+ . "{forky,trixie,bookworm,bullseye,buster}-security,\n"
.
"{testing,stable,oldstable,oldoldstable}}-security$oldstable_backports$stable_backports
and UNRELEASED.\n"
. "Using your request anyway.\n";
$warnings++ if not $opt_force_dist;
@@ -688,8 +688,9 @@
my $EMAIL = 'EMAIL';
my $DISTRIBUTION = 'UNRELEASED';
# when updating the lines below also update the help text, the manpage and the
testcases.
-my %dists = (10, 'buster', 11, 'bullseye', 12, 'bookworm', 13, 'trixie');
-my $latest_dist = '12';
+my %dists
+ = (10, 'buster', 11, 'bullseye', 12, 'bookworm', 13, 'trixie', 14, 'forky');
+my $latest_dist = '13';
my $old_dist = $latest_dist - 1;
my $lts_dist = '11';
# dist guessed from backports, SRU, security uploads...
diff -Nru devscripts-2.25.15/test/test_debchange
devscripts-2.25.15+deb13u1/test/test_debchange
--- devscripts-2.25.15/test/test_debchange 2025-05-08 01:26:41.000000000
+0200
+++ devscripts-2.25.15+deb13u1/test/test_debchange 2025-08-15
12:53:58.000000000 +0200
@@ -117,7 +117,10 @@
}
testDebianDistributions() {
+ checkDebianDistribution "forky"
+ checkDebianDistribution "forky-security"
checkDebianDistribution "trixie"
+ checkDebianDistribution "trixie-proposed-updates"
checkDebianDistribution "trixie-security"
checkDebianDistribution "bookworm"
checkDebianDistribution "bookworm-proposed-updates"
@@ -262,11 +265,11 @@
testGuessedDistribution() {
verifyGuessedDistribution unstable -i unstable
verifyGuessedDistribution experimental -i experimental
- verifyGuessedDistribution bookworm-backports -i bookworm-backports
+ verifyGuessedDistribution trixie-backports -i trixie-backports
verifyGuessedDistribution trixie -i trixie
- verifyGuessedDistribution unstable --sloppy bullseye-backports-sloppy
- verifyGuessedDistribution unstable --bpo bookworm-backports
- verifyGuessedDistribution unstable --stable bookworm
+ verifyGuessedDistribution unstable --sloppy bookworm-backports-sloppy
+ verifyGuessedDistribution unstable --bpo trixie-backports
+ verifyGuessedDistribution unstable --stable trixie
}
testSpecialCharacterMaintainer() {
--- End Message ---
