[SCM] Git repository for devscripts branch, master, updated. v2.11.9-1-g010dc59

[Benjamin Drung]

The following commit has been merged in the master branch:
commit 010dc59ea116acffec9ac2b551822287e77ce42e
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sun Jun 17 23:34:43 2012 +0200

    debchange: Query name for stable-backport from distro-info.

diff --git a/debian/changelog b/debian/changelog
index 1cfb4ac..6a2edd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+devscripts (2.11.10) UNRELEASED; urgency=low
+
+  * debchange: Query name for stable-backport from distro-info.
+
+ -- Benjamin Drung <bdrung at debian.org>  Sun, 17 Jun 2012 23:33:41 +0200
+
 devscripts (2.11.9) unstable; urgency=low
 
   [ David Prévot ]
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index 6ede84c..86fdcc5 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -473,8 +473,9 @@ 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 =~ /^(unstable|((old)?stable|testing)(-security)?|experimental|UNRELEASED|squeeze-backports|((oldstable|testing)-)?proposed-updates)$/) {
-	    warn "$progname warning: Recognised distributions are: unstable, testing, stable,\noldstable, experimental, UNRELEASED, squeeze-backports,\n{oldstable-,testing-,}proposed-updates and {testing,stable,oldstable}-security.\nUsing your request anyway.\n";
+	my $stable = get_debian_distro_info()->stable();
+	unless ($opt_D =~ /^(unstable|((old)?stable|testing)(-security)?|experimental|UNRELEASED|$stable-backports|((oldstable|testing)-)?proposed-updates)$/) {
+	    warn "$progname warning: Recognised distributions are: unstable, testing, stable,\noldstable, experimental, UNRELEASED, $stable-backports,\n{oldstable-,testing-,}proposed-updates and {testing,stable,oldstable}-security.\nUsing your request anyway.\n";
 	    $warnings++ if not $opt_force_dist;
 	}
     } elsif ($vendor eq 'Ubuntu') {

-- 
Git repository for devscripts