Re: Fix for debchange/dch --bpo [was: Just a short reminder about oldstable-backports]
On 7/15/19 12:14 PM, Bas Couwenberg wrote:
> On 2019-07-15 11:20, Alexander Wirt wrote:
>> I had to reject some packages today. Please rememember that stretch is
>> now
>> oldstable-backports. That means that you can only upload packages from
>> stable
>> to it. For everything else we will have -sloppy (hopefully opening
>> tomorrow).
>
> And be aware that `dch --bpo` on buster still uses stretch-backports.
>
> Kind Regards,
>
> Bas
I patched it, and the fix hopefully will be on our next point release.
I've attached the patch, if this may help...
Thomas
From 3f612a0ded4622412528330143fcbd0bf6837ef6 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Mon, 8 Jul 2019 10:43:49 +0200
Subject: [PATCH] Fixed release name to Buster when doing dch --bpo.
---
debian/changelog | 7 +++++++
scripts/debchange.1 | 2 +-
scripts/debchange.pl | 6 +++---
test/test_debchange | 8 ++++----
4 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 28e02c64..a0069ffb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+devscripts (2.19.5+deb10u1) buster; urgency=medium
+
+ * Team upload.
+ * Fixed release name to Buster when doing dch --bpo.
+
+ -- Thomas Goirand <zigo@debian.org> Mon, 08 Jul 2019 10:43:09 +0200
+
devscripts (2.19.5) unstable; urgency=medium
[ Topi Miettinen ]
diff --git a/scripts/debchange.1 b/scripts/debchange.1
index f29d6816..95c73f45 100644
--- a/scripts/debchange.1
+++ b/scripts/debchange.1
@@ -259,7 +259,7 @@ Don't append \fBdistro-name1\fR to the version on a derived
distribution. Increment the Debian version.
.TP
.B \-\-bpo
-Increment the Debian release number for an upload to stretch-backports,
+Increment the Debian release number for an upload to buster-backports,
and add a backport upload changelog comment.
.TP
.B \-\-stable
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index 089cef18..8a8b7500 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -162,7 +162,7 @@ Options:
distribution name
--bpo
Increment the Debian release number for a backports upload
- to "stretch-backports"
+ to "buster-backports"
--stable
Increment the Debian release number for a stable upload.
-l, --local <suffix>
@@ -668,9 +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
- = (60, 'squeeze', 70, 'wheezy', 7, 'wheezy', 8, 'jessie', 9, 'stretch');
+ = (70, 'wheezy', 7, 'wheezy', 8, 'jessie', 9, 'stretch', 10, 'buster');
my $lts_dist = '8';
-my $latest_dist = '9';
+my $latest_dist = '10';
# dist guessed from backports, SRU, security uploads...
my $guessed_dist = '';
my $CHANGES = '';
diff --git a/test/test_debchange b/test/test_debchange
index 75101bb0..38ec4b05 100755
--- a/test/test_debchange
+++ b/test/test_debchange
@@ -218,10 +218,10 @@ verifyGuessedDistribution() {
testGuessedDistribution() {
verifyGuessedDistribution unstable -i unstable
verifyGuessedDistribution experimental -i experimental
- verifyGuessedDistribution jessie-backports -i jessie-backports
- verifyGuessedDistribution jessie -i jessie
- verifyGuessedDistribution unstable --bpo stretch-backports
- verifyGuessedDistribution unstable --stable stretch
+ verifyGuessedDistribution stretch-backports -i stretch-backports
+ verifyGuessedDistribution stretch -i stretch
+ verifyGuessedDistribution unstable --bpo buster-backports
+ verifyGuessedDistribution unstable --stable buster
}
. shunit2
--
2.20.1
Reply to: