The following commit has been merged in the master branch:
commit 0caa62c351d358a8c4c0e4304dd84396f10e8416
Author: James Vega <[email protected]>
Date: Mon Apr 11 00:27:07 2011 -0400
licensecheck: Remove "(the License)" from check for Apache license.
Closes: #620902
Signed-off-by: James Vega <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index e39512e..ef00bbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,8 @@ devscripts (2.10.72) UNRELEASED; urgency=low
+ Remove experimental.debian.net, now that experimental logs show up on
the normal buildd site. (Closes: #621758)
+ Remove temp file if the script exits early.
+ * licensecheck: Remove "(the License)" from check for Apache license.
+ Thanks to Dmitry Kurochkin for the suggestion. (Closes: #620902)
[ Ron Lee ]
* cowpoke: add a --return option that copies the build results back to a
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 1f7f423..7d542e4 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -475,7 +475,7 @@ sub parselicense($) {
$license = "Perl $license";
}
- if ($licensetext =~ /under the Apache License, Version ([^ ]+) \(the
License\)/) {
+ if ($licensetext =~ /under the Apache License, Version ([^ ]+)/) {
$license = "Apache (v$1) $license";
}
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
