[SCM] Git repository for devscripts branch, jessie, updated. v2.12.4-35-gf0f6663
Benjamin Drung
bdrung at debian.org
Sun Oct 21 16:55:05 UTC 2012
The following commit has been merged in the jessie branch:
commit 9b3371c4e4ec19ea9188b6d8a93b946a650861bf
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date: Thu Oct 11 04:34:16 2012 +1100
fix BSD-3-clause detection
#688843
Signed-off-by: Benjamin Drung <bdrung at debian.org>
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 57e4234..31d3ac2 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -492,7 +492,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 .*? 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) {
+ } elsif ($licensetext =~ /(The name .*? may not|Neither the names? .*? nor the names of (its|their|other) 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
More information about the devscripts-devel
mailing list