Version in base suite: 2.19.5 Base version: devscripts_2.19.5 Target version: devscripts_2.19.5+deb10u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/d/devscripts/devscripts_2.19.5.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/d/devscripts/devscripts_2.19.5+deb10u1.dsc debian/changelog | 8 ++++++++ po4a/po/de.po | 6 +++--- po4a/po/devscripts.pot | 4 ++-- po4a/po/fr.po | 6 +++--- scripts/debchange.1 | 2 +- scripts/debchange.pl | 6 +++--- test/test_debchange | 8 ++++---- 7 files changed, 24 insertions(+), 16 deletions(-) diff -Nru devscripts-2.19.5/debian/changelog devscripts-2.19.5+deb10u1/debian/changelog --- devscripts-2.19.5/debian/changelog 2019-05-09 15:01:29.000000000 +0000 +++ devscripts-2.19.5+deb10u1/debian/changelog 2019-08-04 21:15:44.000000000 +0000 @@ -1,3 +1,11 @@ +devscripts (2.19.5+deb10u1) buster; urgency=medium + + [ Thomas Goirand ] + * debchange: + + Target buster-backports with --bpo. Closes: #931614 + + -- Mattia Rizzolo Sun, 04 Aug 2019 23:15:44 +0200 + devscripts (2.19.5) unstable; urgency=medium [ Topi Miettinen ] diff -Nru devscripts-2.19.5/po4a/po/de.po devscripts-2.19.5+deb10u1/po4a/po/de.po --- devscripts-2.19.5/po4a/po/de.po 2019-05-09 14:52:23.000000000 +0000 +++ devscripts-2.19.5+deb10u1/po4a/po/de.po 2019-08-04 21:15:42.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: devscripts 2.18.9\n" "Report-Msgid-Bugs-To: devscripts@packages.debian.org\n" -"POT-Creation-Date: 2019-04-28 16:23+0200\n" +"POT-Creation-Date: 2019-07-09 11:23+0200\n" "PO-Revision-Date: 2019-01-27 10:18+0200\n" "Last-Translator: Chris Leick \n" "Language-Team: de \n" @@ -7368,10 +7368,10 @@ #. type: Plain text #: ../scripts/debchange.1:264 msgid "" -"Increment the Debian release number for an upload to stretch-backports, and " +"Increment the Debian release number for an upload to buster-backports, and " "add a backport upload changelog comment." msgstr "" -"erhöht die Debian-Veröffentlichungsnummer für ein Hochladen nach stretch-" +"erhöht die Debian-Veröffentlichungsnummer für ein Hochladen nach buster-" "backports und fügt einen Changelog-Kommentar »backport upload« hinzu." #. type: TP diff -Nru devscripts-2.19.5/po4a/po/devscripts.pot devscripts-2.19.5+deb10u1/po4a/po/devscripts.pot --- devscripts-2.19.5/po4a/po/devscripts.pot 2019-05-09 15:01:29.000000000 +0000 +++ devscripts-2.19.5+deb10u1/po4a/po/devscripts.pot 2019-08-04 21:15:44.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-04-28 16:23+0200\n" +"POT-Creation-Date: 2019-07-09 11:23+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -5590,7 +5590,7 @@ #. type: Plain text #: ../scripts/debchange.1:264 msgid "" -"Increment the Debian release number for an upload to stretch-backports, and " +"Increment the Debian release number for an upload to buster-backports, and " "add a backport upload changelog comment." msgstr "" diff -Nru devscripts-2.19.5/po4a/po/fr.po devscripts-2.19.5+deb10u1/po4a/po/fr.po --- devscripts-2.19.5/po4a/po/fr.po 2019-05-09 14:52:23.000000000 +0000 +++ devscripts-2.19.5+deb10u1/po4a/po/fr.po 2019-08-04 21:15:42.000000000 +0000 @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: devscripts\n" -"POT-Creation-Date: 2019-04-28 16:23+0200\n" +"POT-Creation-Date: 2019-07-09 11:23+0200\n" "PO-Revision-Date: 2019-04-28 16:32+0200\n" "Last-Translator: Xavier Guimard \n" "Language-Team: French \n" @@ -7386,10 +7386,10 @@ #. type: Plain text #: ../scripts/debchange.1:264 msgid "" -"Increment the Debian release number for an upload to stretch-backports, and " +"Increment the Debian release number for an upload to buster-backports, and " "add a backport upload changelog comment." msgstr "" -"Incrémenter le numéro de publication de Debian pour un envoi dans stretch-" +"Incrémenter le numéro de publication de Debian pour un envoi dans buster-" "backports, et ajouter un commentaire pour l'envoi du rétroportage dans le " "journal des modifications." diff -Nru devscripts-2.19.5/scripts/debchange.1 devscripts-2.19.5+deb10u1/scripts/debchange.1 --- devscripts-2.19.5/scripts/debchange.1 2019-03-01 09:39:51.000000000 +0000 +++ devscripts-2.19.5+deb10u1/scripts/debchange.1 2019-07-09 12:20:55.000000000 +0000 @@ -259,7 +259,7 @@ 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 -Nru devscripts-2.19.5/scripts/debchange.pl devscripts-2.19.5+deb10u1/scripts/debchange.pl --- devscripts-2.19.5/scripts/debchange.pl 2019-03-01 11:04:49.000000000 +0000 +++ devscripts-2.19.5+deb10u1/scripts/debchange.pl 2019-08-04 21:15:42.000000000 +0000 @@ -162,7 +162,7 @@ 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 @@ -668,9 +668,9 @@ 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 -Nru devscripts-2.19.5/test/test_debchange devscripts-2.19.5+deb10u1/test/test_debchange --- devscripts-2.19.5/test/test_debchange 2019-03-01 09:39:51.000000000 +0000 +++ devscripts-2.19.5+deb10u1/test/test_debchange 2019-08-04 21:15:42.000000000 +0000 @@ -218,10 +218,10 @@ 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