the mozilla trilicense was not properly identified in the GPLv2+ or LGPLv2.1+

4 files changed, 45 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index a783a0b..07b193b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2013-07-02  dmg  <dmg@uvic.ca>
 
+	* the mozilla trilicense was not properly identified in the GPLv2+ or LGPLv2.1+
+
 	* matcher/matcher.pl: Added GPL2orOpenIB to the rules. Allowed
 	spaces in the defintion of the rules
 
diff --git a/README.TXT b/README.TXT
index f5a016a..0783cab 100644
--- a/README.TXT
+++ b/README.TXT
@@ -174,3 +174,41 @@ intermediary files, and writes to the stdout the licenses found.
 
 ------
 
+How to read the output:
+
+Assume, for example, this output:
+
+eq.c;MITX11noNotice;1;2;2;6;0;Copyright,-1,-1,DualLicenseIntention,GPLorOpenBSDTypeVer2,BSDpre,BSDcondSource,BSDcondBinary
+
+
+So Ninka detects all the sentences, including the MIT variant, it
+finds the GPL bsd intention. But the license is not really BSD.
+
+The disclaimers are not what you expect. Now, in all fairness, maybe
+this is another lience.
+
+
+Let me translate the output for you:
+
+file: eq.c;
+License(s) found: MITX11noNotice
+
+
+;1;2;2;6;0;
+Found 1 license
+Composed of 2 lines (tokens)
+2 tokens were ignored
+6 tokens were not mached: Copyright,-1,-1,DualLicenseIntention,GPLorOpenBSDTypeVer2,BSDpre,BSDcondSource,BSDcondBinary (-1 indicates where a match happened)
+0 tokens were unknown
+
+
+Another example:
+
+nsAccessibilityUtils.cpp;MPLv1_1;1;1;3;7;2;UNKNOWN,MPL1_1_GPL2_LGPL2_1intentionVer0,1,-1,-1,MPLsee,Copyright,-1,Altern,UNKNOWN,MPLoptionNOTGPLVer0,MPLoptionIfNotDelete3licsVer0,licenseBlockEnd
+
+License matched:MPLv1_1;
+One license: 1;
+Composed of one token: 1;
+3 token were ignored 3;
+7 tokens were matched but not recognized as a license: UNKNOWN,MPL1_1_GPL2_LGPL2_1intentionVer0,1,-1,-1,MPLsee,Copyright,-1,Altern,UNKNOWN,MPLoptionNOTGPLVer0,MPLoptionIfNotDelete3licsVer0,licenseBlockEnd
+2 of those tokens were unknown
diff --git a/matcher/rules.dict b/matcher/rules.dict
index 838d71b..c49443e 100644
--- a/matcher/rules.dict
+++ b/matcher/rules.dict
@@ -156,6 +156,8 @@ CDDLv1orGPLv2:CDDLorGPLv2ifYouWish,CDDLorGPLv2IfYouAdd
 #----------------------------------------------------------------------
 MPL-MIT-dual:MPL-MIT-dual1,MPL-MIT-dual2
 #MPL1_1_GPL2_LGPL2:MPL1_1_GPL2_LGPL2_1intention,MPLv1_1,ApacheLicWherePart1,MPLwarranty,MPLsee,AllRights,MPLGPL2orLGPLv2_1,MPLorNPLandGPLandLPGLonlyGPLorLGPL,MPLoptionIfNotDelete3lics
+orGPLv2+orGPLv2.1+:Altern,GPLv2orLGPLv2\.1Ver2\+,MPLoptionNOTGPLVer0,MPLoptionIfNotDelete3licsVer0
+
 MPLGPL2orLGPLv2_1:MPLGPL2orLGPLv2_1
 MPL1_1andLGPLv2_1:MPL1_1andLGPLv2_1
 #,MPLoptionIfNotDelete2lics,GPLcopypart2,MPLv1_1,ApacheLicWherePart1,MPLwarrantyVar,MPL_LGPLsee
diff --git a/senttok/licensesentence.dict b/senttok/licensesentence.dict
index 614a5a2..9728dd4 100644
--- a/senttok/licensesentence.dict
+++ b/senttok/licensesentence.dict
@@ -162,6 +162,7 @@ XXXGPLEntertainingNoWarranty:52:1:^This program is distributed in the hope that
 ############ These ones need to be fixed
 GPLv2orLGPLv2.1:17:0:The contents of this file may be used under the terms of either the GNU General Public License Version 2 or later \(the <quotes>GPL<quotes>\), or the GNU Lesser General Public License Version 2\.1 or later \(the <quotes>LGPL<quotes>\), in which case the provisions of the GPL or the LGPL are applicable instead of those above:
 GPLv2orLGPLv2.1:18:0:the contents of this file may be used under the terms of either of the GNU General Public License Version 2 or later \(the <quotes>GPL<quotes>\), or the GNU Lesser General Public License Version 2\.1 or later \(the <quotes>LGPL<quotes>\), in which case the provisions of the GPL or the LGPL are applicable instead of those above:
+GPLv2orLGPLv2.1:18:0:the contents of this file can be used under the terms of either of the GPL <VERSION> \(the <quotes>GPL<quotes>\), or the Lesser GPL Version 2.1 \(the <quotes>LGPL<quotes>\), in which case the provisions of the GPL or the LGPL are applicable instead of those above:
 ##############################################
 ########### GPL and BSD
 ############
@@ -531,8 +532,8 @@ conditionsPre:10:0:^The free distribution and use of this software in both sourc
 conditionsPre:11:0:^distributions of this source code include the above copyright notice, this list of conditions and the following disclaimer$
 conditionsPre:12:0:^distributions in binary form include the above copyright notice, this list of conditions and the following disclaimer in the documentation and\/or other associated materials$
 licenseBlockEnd:10:0:^END LICENSE BLOCK$:
-licenseBlockBegin:10:0:^BEGIN LICENSE BLOCK<colon>$:
-licenseBlockBegin:20:0:^BEGIN LICENSE BLOCK Version<colon>$:
+licenseBlockBegin:10:0:BEGIN LICENSE BLOCK<colon>$:
+licenseBlockBegin:20:0:BEGIN LICENSE BLOCK Version<colon>$:
 useOnlyInCompliance:10:0:^You may not use this file except in compliance with the License$:
 listContributors:10:0:^See the copyright.txt file in the distribution for a full listing of individual contributors$:
 listContributors:11:0:^See the copyright.txt in the distribution for a full listing of individual contributors$:x