[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 46de61fcc52186bb72fdb076043b84c7d97e0e37
Author: Benjamin Drung <bdrung at debian.org>
Date:   Mon May 28 20:48:44 2012 +0200

    debchange: Fall back to Debian vendor when a Debian-specific command-line option has been supplied (--nmu, --qa, --bin-nmu, --bpo).

diff --git a/debian/changelog b/debian/changelog
index c639274..84bcf44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ devscripts (2.11.8) UNRELEASED; urgency=low
     + Add --vendor= and DEBCHANGE_VENDOR to override the distributor ID
       returned by dpkg-vendor.
     + Always perform Vendor check.
+    + Fall back to Debian vendor when a Debian-specific command-line option
+      has been supplied (--nmu, --qa, --bin-nmu, --bpo).
 
   [ Stefano Rivera ]
   * devscripts.Logger Don't substitute arguments into logged strings unless
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index 4a9b11c..d5b0622 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -412,6 +412,9 @@ if (not $opt_vendor eq '') {
     chomp $vendor;
 }
 $vendor ||= 'Debian';
+if ($vendor eq 'Ubuntu' and ($opt_n or $opt_bn or $opt_qa or $opt_bpo)) {
+    $vendor = 'Debian';
+}
 
 # Check the distro name given.
 if (defined $opt_D) {

-- 
Git repository for devscripts