[SCM] Git repository for devscripts branch, master, updated. v2.12.0-8-gf63f034

[Benjamin Drung]

The following commit has been merged in the master branch:
commit f63f0342c96d3cffbeef550a4d8743665c2c6489
Author: Benjamin Drung <bdrung at debian.org>
Date:   Thu Jul 26 15:52:28 2012 +0200

    licensecheck: Remove trailing spaces.

diff --git a/debian/changelog b/debian/changelog
index cda95c7..a901b06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 devscripts (2.12.2) UNRELEASED; urgency=low
 
-  * licensecheck: Don't truncate other licenses on Public domain or WTFPL
-    presence. Thanks to Garrett Holmstrom from Fedora for the patch.
+  * licensecheck:
+    - Don't truncate other licenses on Public domain or WTFPL presence.
+      Thanks to Garrett Holmstrom from Fedora for the patch.
+    - Remove trailing spaces.
 
  -- Benjamin Drung <bdrung at debian.org>  Thu, 26 Jul 2012 12:17:51 +0200
 
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 92892b0..324dcea 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -543,6 +543,9 @@ sub parselicense($) {
 
     $license = "UNKNOWN" if (!length($license));
 
+    # Remove trailing spaces.
+    $license =~ s/\s+$//;
+
     return $license;
 }
 
diff --git a/test/test_licensecheck b/test/test_licensecheck
index db652a8..1b89915 100755
--- a/test/test_licensecheck
+++ b/test/test_licensecheck
@@ -21,7 +21,7 @@ WORKDIR="$(readlink -f "${0%/*}")"
 
 license() {
     cd "$WORKDIR"
-    runCommand "licensecheck/$1" "licensecheck/$1: $2 " "" 0
+    runCommand "licensecheck/$1" "licensecheck/$1: $2" "" 0
 }
 
 testBeerware() {

-- 
Git repository for devscripts