[SCM] Git repository for devscripts branch, master, updated. v2.11.7-30-gad54453

[Benjamin Drung]

The following commit has been merged in the master branch:
commit ad54453fa293bb99f8d416ef9091b2e371da95e8
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue May 29 16:08:12 2012 +0200

    debchange: Don't use NMU versioning for NMUs / Security uploads on Ubuntu.

diff --git a/debian/changelog b/debian/changelog
index 0cbf660..4772cb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ devscripts (2.11.8) UNRELEASED; urgency=low
       -U/--upstream option is given.
     + On Ubuntu, don't copy the previous distribution name for a new changelog
       entry. Use the Ubuntu devel release.
+    + Don't use NMU versioning for NMUs / Security uploads on Ubuntu.
 
   [ Stefano Rivera ]
   * devscripts.Logger Don't substitute arguments into logged strings unless
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index 98e3e69..6db7010 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -1058,7 +1058,7 @@ if (($opt_i || $opt_n || $opt_bn || $opt_qa || $opt_R || $opt_s || $opt_team ||
 	    # If it's not already an NMU make it so
 	    # otherwise we can be safe if we behave like dch -i
 
-	    if (($opt_n or $opt_s) and (
+	    if (($opt_n or $opt_s) and $vendor ne 'Ubuntu' and (
 		($VERSION eq $UVERSION and not $start =~ /\+nmu/)
 		or ($VERSION ne $UVERSION and not $start =~ /\.$/))) {
 

-- 
Git repository for devscripts