This is an automated email from the git hooks/post-receive script. mattia pushed a commit to branch master in repository devscripts.
commit 6d74c41f6763249fa1b7b7112bc00767db7b62de Author: Mattia Rizzolo <[email protected]> Date: Mon Jun 26 12:07:24 2017 +0200 debchange: Support $codename{,-{proposed-updates,security}} as well as (old)stable-foo, etc That whole code should probably be changed to use data coming from distro-info-data exclusively (and it already does for backports), but it's not entirely possible until it supports oldoldstable (#782685) Signed-off-by: Mattia Rizzolo <[email protected]> --- debian/changelog | 1 + scripts/debchange.pl | 11 +++++++---- test/test_debchange | 7 +++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 71522a7..44c9781 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ devscripts (2.17.7) UNRELEASED; urgency=medium [ Mattia Rizzolo ] * debchange: + Target stretch-backports with --bpo. + + Support $codename{,-{proposed-updates,security}} as well. [ Hilko Bengen ] * debchange: diff --git a/scripts/debchange.pl b/scripts/debchange.pl index a5346fe..0c59d0e 100755 --- a/scripts/debchange.pl +++ b/scripts/debchange.pl @@ -472,7 +472,7 @@ if ($vendor eq 'Ubuntu' and ($opt_n or $opt_bn or $opt_qa or $opt_bpo)) { # Check the distro name given. if (defined $opt_D) { if ($vendor eq 'Debian') { - unless ($opt_D =~ /^(experimental|unstable|UNRELEASED|((old)?stable|testing)(-proposed-updates)?|proposed-updates|(wheezy|jessie|stretch|buster|bullseye)-security)$/) { + unless ($opt_D =~ /^(experimental|unstable|sid|UNRELEASED|((old){0,2}stable|testing|wheezy|jessie|stretch|buster|bullseye)(-proposed-updates|-security)?|proposed-updates)$/) { my $deb_info = get_debian_distro_info(); my ($oldstable_backports, $stable_backports) = ("", ""); if ($deb_info == 0) { @@ -487,9 +487,12 @@ if (defined $opt_D) { if ($deb_info == 0 || $opt_D !~ m/^(\Q$stable_backports\E|\Q$oldstable_backports\E)$/) { $stable_backports = ", " . $stable_backports if $stable_backports; $oldstable_backports = ", " . $oldstable_backports if $oldstable_backports; - warn "$progname warning: Recognised distributions are: unstable, testing, stable,\n" - . "oldstable, experimental, {testing-,stable-,oldstable-,}proposed-updates,\n" - . "{testing,stable,oldstable}-security$oldstable_backports$stable_backports and UNRELEASED.\n" + warn "$progname warning: Recognised distributions are: \n" + . "experimental, unstable, testing, stable, oldstable, oldoldstable,\n" + . "{bullseye,buster,stretch,jessie,wheezy}-proposed-updates,\n" + . "{testing,stable,oldstable,oldoldstable}-proposed-updates,\n" + . "{bullseye,buster,stretch,jessie,wheezy}-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; } diff --git a/test/test_debchange b/test/test_debchange index 503764e..04b96a6 100755 --- a/test/test_debchange +++ b/test/test_debchange @@ -82,14 +82,21 @@ checkUbuntuVersion() { } testDebianDistributions() { + 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" + checkDebianDistribution "oldoldstable" + checkDebianDistribution "oldoldstable-proposed-updates" checkDebianDistribution "proposed-updates" checkDebianDistribution "stable" checkDebianDistribution "stable-proposed-updates" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
