Merge lp:~maxb/ubuntu/lucid/devscripts/509441 into lp:ubuntu/lucid/devscripts

[Max Bowsher]

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-06 09:11:35 +0000
+++ debian/changelog	2010-01-19 02:19:12 +0000
@@ -1,3 +1,11 @@
+devscripts (2.10.61ubuntu2) lucid; urgency=low
+
+  * Restore changes to scripts/debchange.pl erroneously dropped in the
+    2.10.55ubuntu1 merge, thereby fixing the --distributor option.
+    (LP: #509441)
+
+ -- Max Bowsher <[e-mail]>  Tue, 19 Jan 2010 02:16:10 +0000
+
 devscripts (2.10.61ubuntu1) lucid; urgency=low
 
   [ ﺄﺤﻣﺩ ﺎﻠﻤﺤﻣﻭﺪﻳ (Ahmed El-Mahmoudy) ]

=== modified file 'scripts/debchange.pl'
--- scripts/debchange.pl	2010-01-06 09:11:35 +0000
+++ scripts/debchange.pl	2010-01-19 02:19:12 +0000
@@ -402,11 +402,16 @@
 
 # See if we're Debian, Ubuntu or someone else, if we can
 my $distributor;
-if (system('command -v lsb_release >/dev/null 2>&1') >> 8 == 0) {
-	$distributor = `lsb_release -is 2>/dev/null`;
-	chomp $distributor;
+if (defined $opt_distributor) {
+    $distributor = $opt_distributor;
+} elsif (system('command -v lsb_release >/dev/null 2>&1') >> 8 == 0) {
+    $distributor = `lsb_release -is 2>/dev/null`;
+    chomp $distributor;
 }
 $distributor ||= 'Debian';
+if ($distributor eq 'Ubuntu' and ($opt_n or $opt_bn or $opt_qa or $opt_bpo)) {
+    $distributor = 'Debian';
+}
 
 # Check the distro name given.
 if (defined $opt_D) {