[SCM] Git repository for devscripts branch, master, updated. v2.11.7-26-g131dd94

[Benjamin Drung]

The following commit has been merged in the master branch:
commit 131dd94b6537d277547b3e272eaaba9b03b098d0
Author: Benjamin Drung <bdrung at debian.org>
Date:   Mon May 28 20:53:36 2012 +0200

    debchange: Adjust --security template for Ubuntu.

diff --git a/debian/changelog b/debian/changelog
index 84bcf44..9bac70f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ devscripts (2.11.8) UNRELEASED; urgency=low
     + Always perform Vendor check.
     + Fall back to Debian vendor when a Debian-specific command-line option
       has been supplied (--nmu, --qa, --bin-nmu, --bpo).
+    + Adjust --security template for Ubuntu.
 
   [ Stefano Rivera ]
   * devscripts.Logger Don't substitute arguments into logged strings unless
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index d5b0622..30e1df9 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -1150,7 +1150,12 @@ if (($opt_i || $opt_n || $opt_bn || $opt_qa || $opt_s || $opt_team || $opt_bpo |
 	    print O "  * QA upload.\n";
 	    $line = 1;
 	} elsif ($opt_s && ! $opt_news) {
-	    print O "  * Non-maintainer upload by the Security Team.\n";
+	    if ($vendor eq 'Ubuntu') {
+		print O "  * SECURITY UPDATE:\n";
+		print O "  * References\n";
+	    } else {
+		print O "  * Non-maintainer upload by the Security Team.\n";
+	    }
 	    $line = 1;
 	} elsif ($opt_team && ! $opt_news) {
 	    print O "  * Team upload.\n";

-- 
Git repository for devscripts