[SCM] Git repository for devscripts branch, master, updated. v2.11.7-43-g34e4249

[Benjamin Drung]

The following commit has been merged in the master branch:
commit 34e424949edc29a5dbebd00e5a61c1f6bcccfa90
Author: Benjamin Drung <bdrung at debian.org>
Date:   Thu May 31 03:36:14 2012 +0200

    debchange: Prefer UBUMAIL over DEBEMAIL on Ubuntu.
    
    LP: #929846

diff --git a/debian/changelog b/debian/changelog
index 1c8bbb4..c8c78ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,7 @@ devscripts (2.11.8) UNRELEASED; urgency=low
     + Don't use NMU versioning for NMUs / Security uploads on Ubuntu.
     + dch --increment changes XbuildY to Xubuntu1 on Ubuntu (LP: #690230).
     + Try to guess the vendor based on the given distribution name (LP: #723715)
+    + Prefer UBUMAIL over DEBEMAIL on Ubuntu (LP: #929846).
 
   [ Stefano Rivera ]
   * devscripts.Logger Don't substitute arguments into logged strings unless
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index ed8a08c..17a4d3d 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -755,6 +755,7 @@ check_env_utf8('DEBFULLNAME');
 check_env_utf8('NAME');
 check_env_utf8('DEBEMAIL');
 check_env_utf8('EMAIL');
+check_env_utf8('UBUMAIL');
 
 if (exists $env{'DEBEMAIL'} and $env{'DEBEMAIL'} =~ /^(.*)\s+<(.*)>$/) {
     $env{'DEBFULLNAME'} = $1 unless exists $env{'DEBFULLNAME'};
@@ -766,6 +767,10 @@ if (! exists $env{'DEBEMAIL'} or ! exists $env{'DEBFULLNAME'}) {
 	$env{'EMAIL'} = $2;
     }
 }
+if (exists $env{'UBUMAIL'} and $env{'UBUMAIL'} =~ /^(.*)\s+<(.*)>$/) {
+    $env{'DEBFULLNAME'} = $1 unless exists $env{'DEBFULLNAME'};
+    $env{'UBUMAIL'} = $2;
+}
 
 # Now use the gleaned values to detemine our MAINTAINER and EMAIL values
 if (! $opt_m and ! $opt_M) {
@@ -789,7 +794,8 @@ if (! $opt_m and ! $opt_M) {
     # changelog entry
 
     # Email is easier
-    if (exists $env{'DEBEMAIL'}) { $EMAIL = $env{'DEBEMAIL'}; }
+    if ($vendor eq 'Ubuntu' and exists $env{'UBUMAIL'}) { $EMAIL = $env{'UBUMAIL'}; }
+    elsif (exists $env{'DEBEMAIL'}) { $EMAIL = $env{'DEBEMAIL'}; }
     elsif (exists $env{'EMAIL'}) { $EMAIL = $env{'EMAIL'}; }
     else {
 	my $addr;

-- 
Git repository for devscripts