Author: adsb
Date: 2008-11-04 19:44:47 +0000 (Tue, 04 Nov 2008)
New Revision: 1699
Modified:
trunk/debian/changelog
trunk/scripts/licensecheck.pl
Log:
licensecheck: Match a couple more variants on the wording of a
3-clause BSD license. (Closes: #503378)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-11-04 19:03:54 UTC (rev 1698)
+++ trunk/debian/changelog 2008-11-04 19:44:47 UTC (rev 1699)
@@ -38,6 +38,8 @@
operations to extract the version and architecture from the logs.
+ Allow the logs for the build with the largest version number to be
easily retrieved. Based on a patch by Jörg Sommer.
+ * licensecheck: Match a couple more variants on the wording of a
+ 3-clause BSD license. (Closes: #503378)
* uscan:
+ Document the USCAN_TIMEOUT configuration file variable.
(Closes: #502517)
Modified: trunk/scripts/licensecheck.pl
===================================================================
--- trunk/scripts/licensecheck.pl 2008-11-04 19:03:54 UTC (rev 1698)
+++ trunk/scripts/licensecheck.pl 2008-11-04 19:44:47 UTC (rev 1699)
@@ -429,7 +429,7 @@
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 name of
.*? nor the names of its contributors may) be used to endorse or promote
products derived from this software/i) {
+ } 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) {
$license = "BSD (3 clause) $license";
} elsif ($licensetext =~ /Redistributions of source code must retain
the above copyright notice/i) {
$license = "BSD (2 clause) $license";
--
To unsubscribe, send mail to [EMAIL PROTECTED]
