Package: release.debian.org User: release.debian....@packages.debian.org Usertags: pu Tags: bullseye
Hi,
attached an update to retarget `dch --bpo` (and `dch --stable`) from
buster to bullseye.
I kind of forgot to push it during the last days of the freeze.
I already uploaded the package.
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
More about me: https://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
diffstat for devscripts-2.21.3 devscripts-2.21.3+deb11u1
.gitlab-ci.yml | 16 ++--------------
debian/changelog | 8 ++++++++
po4a/po/de.po | 6 +++---
po4a/po/devscripts.pot | 4 ++--
po4a/po/fr.po | 6 +++---
po4a/po/pt.po | 6 +++---
scripts/debchange.1 | 2 +-
scripts/debchange.pl | 6 +++---
test/test_debchange | 6 +++---
9 files changed, 28 insertions(+), 32 deletions(-)
diff -Nru devscripts-2.21.3/debian/changelog devscripts-2.21.3+deb11u1/debian/changelog
--- devscripts-2.21.3/debian/changelog 2021-06-30 15:11:06.000000000 +0200
+++ devscripts-2.21.3+deb11u1/debian/changelog 2021-08-18 17:02:14.000000000 +0200
@@ -1,3 +1,11 @@
+devscripts (2.21.3+deb11u1) bullseye; urgency=medium
+
+ [ Mattia Rizzolo ]
+ * debchange:
+ + Target bullseye-backports with --bpo.
+
+ -- Mattia Rizzolo <mat...@debian.org> Wed, 18 Aug 2021 17:02:14 +0200
+
devscripts (2.21.3) unstable; urgency=medium
[ Johannes Schauer Marin Rodrigues ]
diff -Nru devscripts-2.21.3/.gitlab-ci.yml devscripts-2.21.3+deb11u1/.gitlab-ci.yml
--- devscripts-2.21.3/.gitlab-ci.yml 2021-03-16 14:16:39.000000000 +0100
+++ devscripts-2.21.3+deb11u1/.gitlab-ci.yml 2021-08-18 17:00:29.000000000 +0200
@@ -11,18 +11,6 @@
- make test
- make destructive-test
-unstable:
+bullseye:
<<: *test
- image: debian:unstable
-
-testing:
- <<: *test
- image: debian:testing
-
-stable-bpo:
- <<: *test
- image: debian:stable-backports
-
-ubuntu-devel:
- <<: *test
- image: ubuntu:devel
+ image: debian:bullseye
diff -Nru devscripts-2.21.3/po4a/po/de.po devscripts-2.21.3+deb11u1/po4a/po/de.po
--- devscripts-2.21.3/po4a/po/de.po 2021-05-02 20:54:46.000000000 +0200
+++ devscripts-2.21.3+deb11u1/po4a/po/de.po 2021-08-18 17:01:41.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: devscripts 2.18.9\n"
"Report-Msgid-Bugs-To: devscri...@packages.debian.org\n"
-"POT-Creation-Date: 2021-05-02 20:51+0200\n"
+"POT-Creation-Date: 2021-08-18 17:00+0200\n"
"PO-Revision-Date: 2020-04-25 23:04+0200\n"
"Last-Translator: Chris Leick <c.le...@vollbio.de>\n"
"Language-Team: de <debian-l10n-ger...@lists.debian.org>\n"
@@ -7222,10 +7222,10 @@
#. type: Plain text
#: ../scripts/debchange.1:265
msgid ""
-"Increment the Debian release number for an upload to buster-backports, and "
+"Increment the Debian release number for an upload to bullseye-backports, and "
"add a backport upload changelog comment."
msgstr ""
-"erhöht die Debian-Veröffentlichungsnummer für ein Hochladen nach buster-"
+"erhöht die Debian-Veröffentlichungsnummer für ein Hochladen nach bullseye-"
"backports und fügt einen Changelog-Kommentar »backport upload« hinzu."
#. type: TP
diff -Nru devscripts-2.21.3/po4a/po/devscripts.pot devscripts-2.21.3+deb11u1/po4a/po/devscripts.pot
--- devscripts-2.21.3/po4a/po/devscripts.pot 2021-06-30 15:11:06.000000000 +0200
+++ devscripts-2.21.3+deb11u1/po4a/po/devscripts.pot 2021-08-18 17:02:14.000000000 +0200
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-05-02 20:51+0200\n"
+"POT-Creation-Date: 2021-08-18 17:00+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <l...@li.org>\n"
@@ -5799,7 +5799,7 @@
#. type: Plain text
#: ../scripts/debchange.1:265
msgid ""
-"Increment the Debian release number for an upload to buster-backports, and "
+"Increment the Debian release number for an upload to bullseye-backports, and "
"add a backport upload changelog comment."
msgstr ""
diff -Nru devscripts-2.21.3/po4a/po/fr.po devscripts-2.21.3+deb11u1/po4a/po/fr.po
--- devscripts-2.21.3/po4a/po/fr.po 2021-05-02 20:54:46.000000000 +0200
+++ devscripts-2.21.3+deb11u1/po4a/po/fr.po 2021-08-18 17:01:05.000000000 +0200
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: devscripts\n"
-"POT-Creation-Date: 2021-05-02 20:51+0200\n"
+"POT-Creation-Date: 2021-08-18 17:00+0200\n"
"PO-Revision-Date: 2021-05-02 20:52+0200\n"
"Last-Translator: Xavier Guimard <y...@debian.org>\n"
"Language-Team: French <debian-l10n-fre...@lists.debian.org>\n"
@@ -7230,10 +7230,10 @@
#. type: Plain text
#: ../scripts/debchange.1:265
msgid ""
-"Increment the Debian release number for an upload to buster-backports, and "
+"Increment the Debian release number for an upload to bullseye-backports, and "
"add a backport upload changelog comment."
msgstr ""
-"Incrémenter le numéro de publication de Debian pour un envoi dans buster-"
+"Incrémenter le numéro de publication de Debian pour un envoi dans bullseye-"
"backports, et ajouter un commentaire pour l'envoi du rétroportage dans le "
"journal des modifications."
diff -Nru devscripts-2.21.3/po4a/po/pt.po devscripts-2.21.3+deb11u1/po4a/po/pt.po
--- devscripts-2.21.3/po4a/po/pt.po 2021-05-02 20:54:46.000000000 +0200
+++ devscripts-2.21.3+deb11u1/po4a/po/pt.po 2021-08-18 17:00:54.000000000 +0200
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: devscripts 2.21.1\n"
-"POT-Creation-Date: 2021-05-02 20:51+0200\n"
+"POT-Creation-Date: 2021-08-18 17:00+0200\n"
"PO-Revision-Date: 2021-03-01 21:40+0000\n"
"Last-Translator: Américo Monteiro <a_monte...@gmx.com>\n"
"Language-Team: Portuguese <>\n"
@@ -7088,10 +7088,10 @@
#. type: Plain text
#: ../scripts/debchange.1:265
msgid ""
-"Increment the Debian release number for an upload to buster-backports, and "
+"Increment the Debian release number for an upload to bullseye-backports, and "
"add a backport upload changelog comment."
msgstr ""
-"Incrementa o número de lançamento Debian para um envio para buster-"
+"Incrementa o número de lançamento Debian para um envio para bullseye-"
"backports, e adiciona um comentário de envio backport ao registo de "
"alterações."
diff -Nru devscripts-2.21.3/scripts/debchange.1 devscripts-2.21.3+deb11u1/scripts/debchange.1
--- devscripts-2.21.3/scripts/debchange.1 2021-03-16 14:16:39.000000000 +0100
+++ devscripts-2.21.3+deb11u1/scripts/debchange.1 2021-08-17 11:42:14.000000000 +0200
@@ -260,7 +260,7 @@
distribution. Increment the Debian version.
.TP
.B \-\-bpo
-Increment the Debian release number for an upload to buster-backports,
+Increment the Debian release number for an upload to bullseye-backports,
and add a backport upload changelog comment.
.TP
.B \-\-stable
diff -Nru devscripts-2.21.3/scripts/debchange.pl devscripts-2.21.3+deb11u1/scripts/debchange.pl
--- devscripts-2.21.3/scripts/debchange.pl 2021-03-22 15:56:11.000000000 +0100
+++ devscripts-2.21.3+deb11u1/scripts/debchange.pl 2021-08-18 17:00:29.000000000 +0200
@@ -163,7 +163,7 @@
distribution name
--bpo
Increment the Debian release number for a backports upload
- to "buster-backports"
+ to "bullseye-backports"
--stable
Increment the Debian release number for a stable upload.
-l, --local <suffix>
@@ -669,9 +669,9 @@
my $DISTRIBUTION = 'UNRELEASED';
# when updating the lines below also update the help text, the manpage and the testcases.
my %dists
- = (70, 'wheezy', 7, 'wheezy', 8, 'jessie', 9, 'stretch', 10, 'buster');
+ = (8, 'jessie', 9, 'stretch', 10, 'buster', 11, 'bullseye', 12, 'bookworm');
my $lts_dist = '9';
-my $latest_dist = '10';
+my $latest_dist = '11';
# dist guessed from backports, SRU, security uploads...
my $guessed_dist = '';
my $CHANGES = '';
diff -Nru devscripts-2.21.3/test/test_debchange devscripts-2.21.3+deb11u1/test/test_debchange
--- devscripts-2.21.3/test/test_debchange 2021-03-16 14:16:39.000000000 +0100
+++ devscripts-2.21.3+deb11u1/test/test_debchange 2021-08-17 11:42:14.000000000 +0200
@@ -236,10 +236,10 @@
testGuessedDistribution() {
verifyGuessedDistribution unstable -i unstable
verifyGuessedDistribution experimental -i experimental
- verifyGuessedDistribution stretch-backports -i stretch-backports
+ verifyGuessedDistribution buster-backports -i buster-backports
verifyGuessedDistribution stretch -i stretch
- verifyGuessedDistribution unstable --bpo buster-backports
- verifyGuessedDistribution unstable --stable buster
+ verifyGuessedDistribution unstable --bpo bullseye-backports
+ verifyGuessedDistribution unstable --stable bullseye
}
testSpecialCharacterMaintainer() {
signature.asc
Description: PGP signature
