Bug#1054287: bookworm-pu: package devscripts/2.23.4+deb12u1
Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian.org@packages.debian.org
Usertags: pu
X-Debbugs-Cc: devscripts@packages.debian.org
Control: affects -1 + src:devscripts
[ Reason ]
`dch --bpo` & `dch --stable` still use bullseye in 2.23.4.
Now that bookworm is releases it should be used instead.
[ Impact ]
Needs to manually change the version and codename to correct the changelog.
[ Tests ]
Package test suite.
[ Risks ]
Low, only the commit for debchange was cherry-picked.
[ 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 gbp.conf & Vcs-Git changes are required to let git-buildpackage and debcheckout use the correct branch.
The debchange changes are cherry-picked from 2.23.5 which is in testing for a while now.
[ Other info ]
N/A
Kind Regards,
Bas
diff -Nru devscripts-2.23.4/debian/changelog devscripts-2.23.4+deb12u1/debian/changelog
--- devscripts-2.23.4/debian/changelog 2023-04-05 12:40:28.000000000 +0200
+++ devscripts-2.23.4+deb12u1/debian/changelog 2023-10-20 18:54:42.000000000 +0200
@@ -1,3 +1,16 @@
+devscripts (2.23.4+deb12u1) bookworm; urgency=medium
+
+ * Team upload.
+
+ [ Bas Couwenberg ]
+ * Update branch in gbp.conf & Vcs-Git URL.
+
+ [ Benjamin Drung ]
+ * debchange: Update to current Debian distributions
+ (closes: #1037336, #1038389, #1043021)
+
+ -- Bas Couwenberg <sebastic@debian.org> Fri, 20 Oct 2023 18:54:42 +0200
+
devscripts (2.23.4) unstable; urgency=medium
[ Johannes Schauer Marin Rodrigues ]
diff -Nru devscripts-2.23.4/debian/control devscripts-2.23.4+deb12u1/debian/control
--- devscripts-2.23.4/debian/control 2023-04-05 12:36:46.000000000 +0200
+++ devscripts-2.23.4+deb12u1/debian/control 2023-10-20 18:54:42.000000000 +0200
@@ -66,7 +66,7 @@
Standards-Version: 4.6.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 bookworm
Package: devscripts
Architecture: any
diff -Nru devscripts-2.23.4/debian/gbp.conf devscripts-2.23.4+deb12u1/debian/gbp.conf
--- devscripts-2.23.4/debian/gbp.conf 2022-06-18 18:14:16.000000000 +0200
+++ devscripts-2.23.4+deb12u1/debian/gbp.conf 2023-10-20 18:54:42.000000000 +0200
@@ -1,2 +1,3 @@
[DEFAULT]
debian-tag = v%(version)s
+debian-branch = bookworm
diff -Nru devscripts-2.23.4/scripts/debchange.bash_completion devscripts-2.23.4+deb12u1/scripts/debchange.bash_completion
--- devscripts-2.23.4/scripts/debchange.bash_completion 2022-06-18 18:14:15.000000000 +0200
+++ devscripts-2.23.4+deb12u1/scripts/debchange.bash_completion 2023-10-20 18:54:42.000000000 +0200
@@ -25,11 +25,11 @@
#--------------------------------------------------------------------------
#FIXME: I don't want hard-coding codename...
#--------------------------------------------------------------------------
- oldstable_codename='squeeze'
- stable_codename='wheezy'
- testing_codename='jessie'
+ oldstable_codename='bullseye'
+ stable_codename='bookworm'
+ testing_codename='trixie'
- lts='squeeze-lts'
+ lts='buster-lts'
distro="oldstable-security oldstable-proposed-updates\
"$oldstable_codename"-security\
diff -Nru devscripts-2.23.4/scripts/debchange.pl devscripts-2.23.4+deb12u1/scripts/debchange.pl
--- devscripts-2.23.4/scripts/debchange.pl 2023-04-03 01:03:09.000000000 +0200
+++ devscripts-2.23.4+deb12u1/scripts/debchange.pl 2023-10-20 18:54:42.000000000 +0200
@@ -163,7 +163,7 @@
distribution name
--bpo
Increment the Debian release number for a backports upload
- to "bullseye-backports"
+ to "bookworm-backports"
--stable
Increment the Debian release number for a stable upload.
-l, --local <suffix>
@@ -507,7 +507,7 @@
if (defined $opt_D) {
if ($vendor eq 'Debian') {
unless ($opt_D
- =~ /^(experimental|unstable|sid|UNRELEASED|((old){0,2}stable|testing|wheezy|jessie|stretch|buster|bullseye)(-proposed-updates|-security)?|proposed-updates)$/
+ =~ /^(experimental|unstable|sid|UNRELEASED|((old){0,2}stable|testing|buster|bullseye|bookworm|trixie)(-proposed-updates|-security)?|proposed-updates)$/
) {
my $deb_info = get_debian_distro_info();
my ($oldstable_backports, $stable_backports) = ("", "");
@@ -530,9 +530,9 @@
if $oldstable_backports;
warn "$progname warning: Recognised distributions are: \n"
. "experimental, unstable, testing, stable, oldstable, oldoldstable,\n"
- . "{bullseye,buster,stretch,jessie,wheezy}-proposed-updates,\n"
+ . "{trixie,bookworm,bullseye,buster}-proposed-updates,\n"
. "{testing,stable,oldstable,oldoldstable}-proposed-updates,\n"
- . "{bullseye,buster,stretch,jessie,wheezy}-security,\n"
+ . "{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;
@@ -668,12 +668,9 @@
my $EMAIL = 'EMAIL';
my $DISTRIBUTION = 'UNRELEASED';
# when updating the lines below also update the help text, the manpage and the testcases.
-my %dists = (
- 8, 'jessie', 9, 'stretch', 10, 'buster',
- 11, 'bullseye', 12, 'bookworm', 13, 'trixie'
-);
-my $lts_dist = '9';
-my $latest_dist = '11';
+my %dists = (10, 'buster', 11, 'bullseye', 12, 'bookworm', 13, 'trixie');
+my $lts_dist = '10';
+my $latest_dist = '12';
# dist guessed from backports, SRU, security uploads...
my $guessed_dist = '';
my $CHANGES = '';
diff -Nru devscripts-2.23.4/test/test_debchange devscripts-2.23.4+deb12u1/test/test_debchange
--- devscripts-2.23.4/test/test_debchange 2022-06-18 18:14:17.000000000 +0200
+++ devscripts-2.23.4+deb12u1/test/test_debchange 2023-10-20 18:54:42.000000000 +0200
@@ -95,16 +95,15 @@
}
testDebianDistributions() {
+ checkDebianDistribution "trixie"
+ checkDebianDistribution "trixie-security"
+ checkDebianDistribution "bookworm"
+ checkDebianDistribution "bookworm-proposed-updates"
+ checkDebianDistribution "bookworm-security"
checkDebianDistribution "bullseye"
checkDebianDistribution "bullseye-security"
checkDebianDistribution "buster"
checkDebianDistribution "buster-security"
- checkDebianDistribution "stretch"
- checkDebianDistribution "stretch-security"
- checkDebianDistribution "jessie"
- checkDebianDistribution "jessie-proposed-updates"
- checkDebianDistribution "jessie-security"
- checkDebianDistribution "wheezy-security"
checkDebianDistribution "experimental"
checkDebianDistribution "oldstable"
checkDebianDistribution "oldstable-proposed-updates"
@@ -236,10 +235,10 @@
testGuessedDistribution() {
verifyGuessedDistribution unstable -i unstable
verifyGuessedDistribution experimental -i experimental
- verifyGuessedDistribution buster-backports -i buster-backports
- verifyGuessedDistribution stretch -i stretch
- verifyGuessedDistribution unstable --bpo bullseye-backports
- verifyGuessedDistribution unstable --stable bullseye
+ verifyGuessedDistribution bookworm-backports -i bookworm-backports
+ verifyGuessedDistribution trixie -i trixie
+ verifyGuessedDistribution unstable --bpo bookworm-backports
+ verifyGuessedDistribution unstable --stable bookworm
}
testSpecialCharacterMaintainer() {
Reply to: