[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 4f679a0cc2c2419ff53ecdf672e59ffe4b571e5e
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue May 29 16:00:33 2012 +0200

    debchange: On Ubuntu, don't copy the previous distribution name for a new changelog entry. Use the Ubuntu devel release.

diff --git a/debian/changelog b/debian/changelog
index fa7445c..0cbf660 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ devscripts (2.11.8) UNRELEASED; urgency=low
     + Add -R/--rebuild flag for Ubuntu's no-change rebuilds.
     + Append ubuntu1 to version when incrementing on Ubuntu, unless a
       -U/--upstream option is given.
+    + On Ubuntu, don't copy the previous distribution name for a new changelog
+      entry. Use the Ubuntu devel release.
 
   [ Stefano Rivera ]
   * devscripts.Logger Don't substitute arguments into logged strings unless
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index f3892f1..98e3e69 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -575,7 +575,13 @@ if (! $opt_create || ($opt_create && $opt_news)) {
     ($MAINTAINER,$EMAIL) = ($changelog{'Maintainer'} =~ /^([^<]+) <(.*)>/);
     fatal "No distribution in changelog!"
 	unless exists $changelog{'Distribution'};
-    $DISTRIBUTION=$changelog{'Distribution'};
+    if ($vendor eq 'Ubuntu') {
+	# In Ubuntu the development release regularly changes, don't just copy
+	# the previous name.
+	$DISTRIBUTION = 'quantal';
+    } else {
+	$DISTRIBUTION=$changelog{'Distribution'};
+    }
     fatal "No changes in changelog!"
 	unless exists $changelog{'Changes'};
 
@@ -1302,6 +1308,8 @@ if (($opt_r || $opt_a || $merge) && ! $opt_create) {
 	    if ($distribution eq "UNRELEASED") {
 		if ($dist_indicator and not $opt_D) {
 		    $distribution = $dist_indicator;
+		} elsif ($vendor eq 'Ubuntu') {
+		    $distribution = $opt_D || "quantal";
 		} else {
 		    $distribution = $opt_D || $lastdist || "unstable";
 		}

-- 
Git repository for devscripts