[SCM] Git repository for devscripts branch, master, updated. v2.11.7-38-g430b060

[Benjamin Drung]

The following commit has been merged in the master branch:
commit 430b06093a9b15c2cd37410358cc3bc7100a09a7
Author: Benjamin Drung <bdrung at debian.org>
Date:   Thu May 31 02:38:34 2012 +0200

    debchange: dch --increment changes XbuildY to Xubuntu1 on Ubuntu
    
    LP: #690230

diff --git a/debian/changelog b/debian/changelog
index 29cf350..2bbbb67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ devscripts (2.11.8) UNRELEASED; urgency=low
     + 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.
+    + dch --increment changes XbuildY to Xubuntu1 on Ubuntu (LP: #690230).
 
   [ Stefano Rivera ]
   * devscripts.Logger Don't substitute arguments into logged strings unless
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index 1ded253..c8f7c91 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -1130,8 +1130,13 @@ if (($opt_i || $opt_n || $opt_bn || $opt_qa || $opt_R || $opt_s || $opt_team ||
 		# Don't bump the version of a NEWS file in this case as we're
 		# using the version from the changelog
 		if (($opt_i or $opt_s) and $vendor eq 'Ubuntu' and
-		     $start !~ /(build|ubuntu|~ppa)(\d+\.)*$/ and not $opt_U) {
+		     $start !~ /(ubuntu|~ppa)(\d+\.)*$/ and not $opt_U) {
 
+		    if ($start =~ /build/) {
+			# Drop buildX suffix in favor of ubuntu1
+			$start =~ s/build//;
+			$end = "";
+		    }
 		    $end .= "ubuntu1";
 		} else {
 		    $end++;
diff --git a/test/test_debchange b/test/test_debchange
index 8355f40..037a080 100755
--- a/test/test_debchange
+++ b/test/test_debchange
@@ -54,7 +54,7 @@ testUbuntuIncrement() {
     checkUbuntuVersion "-i" "5.6-7" "5.6-7ubuntu1"
     checkUbuntuVersion "-i" "5.6-7.1" "5.6-7.1ubuntu1"
     checkUbuntuVersion "-i" "5.6-7.1.8" "5.6-7.1.8ubuntu1"
-    checkUbuntuVersion "-i" "2.13-14build5" "2.13-14build6"
+    checkUbuntuVersion "-i" "2.13-14build5" "2.13-14ubuntu1"
     checkUbuntuVersion "-i" "0.45-2ubuntu3" "0.45-2ubuntu4"
     checkUbuntuVersion "-i" "0.45-2ubuntu3.1" "0.45-2ubuntu3.2"
     checkUbuntuVersion "-i" "0.45-2ubuntu3.1.0" "0.45-2ubuntu3.1.1"

-- 
Git repository for devscripts