[devscripts] 01/01: * debchange: + Allow the current prefered security upload targets (wheezy|jessie|stretch)-security instead of their changing counterparts (oldstable|stable|testing)-security (Closes: #797084)

[Gunnar Wolf]

This is an automated email from the git hooks/post-receive script.

gwolf pushed a commit to branch master
in repository devscripts.

commit 323181ce38c694a0f7507691bd77c98e9775646a
Author: Gunnar Wolf <gwolf at gwolf.org>
Date:   Thu Aug 27 13:42:52 2015 -0500

    * debchange:
      + Allow the current prefered security upload targets
        (wheezy|jessie|stretch)-security instead of their changing
        counterparts (oldstable|stable|testing)-security (Closes: #797084)
---
 debian/changelog     | 6 ++++++
 scripts/debchange.pl | 2 +-
 test/test_debchange  | 6 +++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 262a4ca..8db9c66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,12 @@ devscripts (2.15.9) UNRELEASED; urgency=medium
       "true" before using it in a comparison.  The enables the use of 0 as a
       value for the version.  (Closes: #796984)
 
+  [ Gunnar Wolf ]
+  * debchange:
+    + Allow the current prefered security upload targets
+      (wheezy|jessie|stretch)-security instead of their changing
+      counterparts (oldstable|stable|testing)-security (Closes: #797084)
+
  -- Joachim Breitner <nomeata at debian.org>  Tue, 11 Aug 2015 21:12:03 +0200
 
 devscripts (2.15.8) unstable; urgency=high
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index 28366d9..db52b60 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|-security)?|proposed-updates)$/) {
+	unless ($opt_D =~ /^(experimental|unstable|UNRELEASED|((old)?stable|testing)(-proposed-updates)?|proposed-updates|(wheezy|jessie|stretch)-security)$/) {
 	    my $deb_info = get_debian_distro_info();
 	    my ($oldstable_backports, $stable_backports) = ("", "");
 	    if ($deb_info == 0) {
diff --git a/test/test_debchange b/test/test_debchange
index 867a38c..30721e4 100755
--- a/test/test_debchange
+++ b/test/test_debchange
@@ -82,17 +82,17 @@ checkUbuntuVersion() {
 }
 
 testDebianDistributions() {
+    checkDebianDistribution "jessie-security"
+    checkDebianDistribution "wheezy-security"
+    checkDebianDistribution "stretch-security"
     checkDebianDistribution "experimental"
     checkDebianDistribution "oldstable"
     checkDebianDistribution "oldstable-proposed-updates"
-    checkDebianDistribution "oldstable-security"
     checkDebianDistribution "proposed-updates"
     checkDebianDistribution "stable"
     checkDebianDistribution "stable-proposed-updates"
-    checkDebianDistribution "stable-security"
     checkDebianDistribution "testing"
     checkDebianDistribution "testing-proposed-updates"
-    checkDebianDistribution "testing-security"
     checkDebianDistribution "UNRELEASED"
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git