[SCM] Git repository for devscripts branch, master, updated. v2.11.7-24-gccbdc4e

[Benjamin Drung]

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

    debchange: Rename distributor to vendor.

diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index 70d82f8..4a9b11c 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -404,29 +404,29 @@ if (defined $opt_u) {
 }
 
 # See if we're Debian, Ubuntu or someone else, if we can
-my $distributor;
+my $vendor;
 if (not $opt_vendor eq '') {
-    $distributor = $opt_vendor;
+    $vendor = $opt_vendor;
 } elsif (system('command -v dpkg-vendor >/dev/null 2>&1') >> 8 == 0) {
-    $distributor = `dpkg-vendor --query Vendor 2>/dev/null`;
-    chomp $distributor;
+    $vendor = `dpkg-vendor --query Vendor 2>/dev/null`;
+    chomp $vendor;
 }
-$distributor ||= 'Debian';
+$vendor ||= 'Debian';
 
 # Check the distro name given.
 if (defined $opt_D) {
-    if ($distributor eq 'Debian') {
+    if ($vendor eq 'Debian') {
 	unless ($opt_D =~ /^(unstable|((old)?stable|testing)(-security)?|experimental|UNRELEASED|squeeze-backports|((oldstable|testing)-)?proposed-updates)$/) {
 	    warn "$progname warning: Recognised distributions are: unstable, testing, stable,\noldstable, experimental, UNRELEASED, squeeze-backports,\n{oldstable-,testing-,}proposed-updates and {testing,stable,oldstable}-security.\nUsing your request anyway.\n";
 	    $warnings++ if not $opt_force_dist;
 	}
-    } elsif ($distributor eq 'Ubuntu') {
+    } elsif ($vendor eq 'Ubuntu') {
 	unless ($opt_D =~ /^((hardy|lucid|natty|oneiric|precise|quantal)(-updates|-security|-proposed|-backports)?|UNRELEASED)$/) {
 	    warn "$progname warning: Recognised distributions are:\n{hardy,lucid,natty,oneiric,precise,quantal}{,-updates,-security,-proposed,-backports} and UNRELEASED.\nUsing your request anyway.\n";
 	    $warnings++ if not $opt_force_dist;
 	}
     } else {
-	# Unknown distributor, skip check
+	# Unknown vendor, skip check
     }
 }
 

-- 
Git repository for devscripts