The following commit has been merged in the master branch:
commit 1c2016c6bf8dcff271b732bf649ab59e04e89790
Author: Gerfried Fuchs <[email protected]>
Date: Fri Aug 26 21:14:29 2011 +0200
Remove the word "of" from the BSD 3 clause check
diff --git a/debian/changelog b/debian/changelog
index 12037d3..9ef8f2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+devscripts (2.11.2) UNRELEASED; urgency=low
+
+ [ Gerfried Fuchs ]
+ * Remove the word "of" from the BSD 3 clause check, it might not be in
+ there.
+
+ -- Gerfried Fuchs <[email protected]> Fri, 26 Aug 2011 21:09:51 +0200
+
devscripts (2.11.1) unstable; urgency=low
[ David Prévot ]
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 5224f69..8f9caf8 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -450,7 +450,7 @@ sub parselicense($) {
if ($licensetext =~ /THIS SOFTWARE IS PROVIDED .*AS IS AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY/) {
if ($licensetext =~ /All advertising materials mentioning features or
use of this software must display the following acknowledge?ment.*This product
includes software developed by/i) {
$license = "BSD (4 clause) $license";
- } elsif ($licensetext =~ /(The name of .*? may not|Neither the names?
of .*? nor the names of (its|their) contributors may) be used to endorse or
promote products derived from this software/i) {
+ } elsif ($licensetext =~ /(The name .*? may not|Neither the names? .*?
nor the names of (its|their) contributors may) be used to endorse or promote
products derived from this software/i) {
$license = "BSD (3 clause) $license";
} elsif ($licensetext =~ /Redistributions of source code must retain
the above copyright notice/i) {
$license = "BSD (2 clause) $license";
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
