verified new dictionary for regressions, added a couple of minor licenses

4 files changed, 42 insertions, 3 deletions

diff --git a/BUGS.org b/BUGS.org
new file mode 100644
index 0000000..0654707
--- /dev/null
+++ b/BUGS.org
@@ -0,0 +1,30 @@
+* This header has extra info in the output 
+
+MITpermission should not be in the output:
+
+MITX11;1;3;0;2;0;Copyright,MITpermission,3
+
+/*
+ * GLX Hardware Device Driver for Intel i810
+ * Copyright (C) 1999 Keith Whitwell
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * KEITH WHITWELL, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *
+ */
diff --git a/ChangeLog b/ChangeLog
index f04ac65..b277b9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-05-11  dmg  <dmg@uvic.ca>
+
+	* senttok/licensesentence.dict: 
+	  - added AlternTrolltechKDE-approved, 
+	  - in MITX11 liability, there might be commas between names. Regexp is greedy, so we are ok
+
 2015-01-10  dmg  <dmg@uvic.ca>
 
 	* Bumped to version 1.3 RC 1
diff --git a/matcher/rules.dict b/matcher/rules.dict
index 531df5f..3c5bf88 100644
--- a/matcher/rules.dict
+++ b/matcher/rules.dict
@@ -362,3 +362,4 @@ GPLv2orLGPLv2.1:GPLv2orLGPLv2\.1Ver2
 GPLv2+orLGPLv2.1:GPLv2orLGPLv2\.1Ver2\+
 
 FSFUnlimited:FSFUnlimited
+GPL-2or3,AlternTrolltechKDE-approved:GPLv2orv3Ver0,Altern,laterTrolltechKDE-approvedVer0
diff --git a/senttok/licensesentence.dict b/senttok/licensesentence.dict
index 0d7d287..a4181a7 100644
--- a/senttok/licensesentence.dict
+++ b/senttok/licensesentence.dict
@@ -60,6 +60,8 @@ GPLGen:81:1:^<LICENSED> under the GPL <VERSION>, see file ([^,;]+) in this ([^,;
 GPLGenVer2:90:0:^released under GNU GPL v2 or later license$
 GPLGenKDEor3+:10:1:^This program is free software; you can redistribute it and/or modify it under the terms of the GPL; either <VERSION>, or \(at your option\) version 3 or any later version accepted by the membership of KDE e\.V\. \(or its successor approved by the membership of KDE e\.V\.\), which shall act as a proxy defined in Section 14 of version 3 of the license$:
 
+laterTrolltechKDE-approved:10:0:you can \(at your option\) use any later version of the GPL if such license has been publicly approved by Trolltech ASA \(or its successors, if any\) and the KDE Free Qt Foundation$:
+
 LGPLGenKDEor3:10:1:^This library is free software; you can redistribute it and/or modify it under the terms of the Lesser GPL; either <VERSION>, or \(at your option\) version 3 accepted by the membership of KDE e\.V\. \(or its successor approved by the membership of KDE e\.V\.\), Nokia Corporation \(or its successors, if any\) and the KDE Free Qt Foundation, which shall act as a proxy defined in Section 6 of version 3 of the license$
 #
 GPLGenError:26:1:^You may use this ([^,;]+) under the GNU public license if you so wish$:
@@ -128,7 +130,7 @@ GNUurl:10:0:^If not, see <http://www.gnu.org/licenses/>$
 ################################
 # Special cases GPL
 #
-GPLv2orv3:10:0:^This file may be used under the terms of the GPL versions 2\.0 or 3\.0 as published by the Free Software Foundation and appearing in the files LICENSE\.GPL2 and LICENSE\.GPL3 included in the packaging of this file$
+GPLv2orv3:10:1:^This file (can|may) be used under the terms of the GPL versions 2\.0 or 3\.0 as published by the Free Software Foundation and appearing in the files LICENSE\.GPL2 and LICENSE\.GPL3 included in the packaging of this file$
 LGPLV2_1:11:0:^Lesser GPL 2\.1 applies:
 LGPLv2_1orv3:10:0:^([^,;]+) is free software; you can redistribute it and\/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2\.1 or 3 of the License$
 LGPLv2orv3:10:0:^([^,;]+) is free software; you can redistribute it and\/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or \(at your option\) version 3$
@@ -493,8 +495,8 @@ X11asIs:52:0:THE SOFTWARE IS PROVIDED <quotes>AS IS<quotes>, WITHOUT WARRANTY OF
 X11asIsLike:52:0:THIS SOFTWARE IS PROVIDED <quotes>AS IS<quotes> AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE:
 X11asIsLike:53:1:^THE SOFTWARE IS PROVIDED <quotes>AS IS<quotes> AND (.+) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS$
 X11asIsNoNonInfrig:52:0:THIS SOFTWARE IS PROVIDED <quotes>AS-IS<quotes> AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE:
-X11asLiable:52:1:IN NO EVENT SHALL ([^,;]+) BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE:
-X11asLiable:52:2:IN NO EVENT SHALL ([^,;]+) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS (IN|WITH) THE SOFTWARE:
+X11asLiable:52:1:IN NO EVENT SHALL ([^;]+) BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE:
+X11asLiable:52:2:IN NO EVENT SHALL ([^;]+) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS (IN|WITH) THE SOFTWARE:
 X11asLiableLcms:52:1:IN NO EVENT SHALL ([^,;]+) BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE:
 X11notice:52:0:The above copyright notice and this permission notice (\(including the next paragraph\) )?shall be included in all copies or substantial portions of the Software:
 X11per:52:0:Permission is hereby granted, free of charge, to any person obtaining a copy of this (software and associated documentation files|source file) \(the <quotes>Software<quotes>\), to deal (in|with) the Software without restriction, including without limitation (on )?the rights to use, copy, modify, merge, publish, distribute,( distribute with modifications,)? sub ?license, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: