summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordmg <dmg@uvic.ca>2013-07-01 12:26:20 -0400
committerdmg <dmg@uvic.ca>2013-07-01 12:27:53 -0400
commitb68c20fc1930836b4e77c3a75efb69bf03bad7c2 (patch)
tree403bf36f76ae1266e6a53c4ffe2d24edcafedc86
parentb84eee21cb5510f18d07aca937c126f22ba76134 (diff)
downloadninka-b68c20fc1930836b4e77c3a75efb69bf03bad7c2.tar.gz
added a public domain, and a gpl
-rw-r--r--ChangeLog4
-rw-r--r--matcher/rules.dict1
-rw-r--r--senttok/licensesentence.dict3
-rwxr-xr-xsplitter/splitter.pl2
4 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d7fbc8..c58547b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-01 dmg <dmg@uvic.ca>
+
+ * senttok/licensesentence.dict (publicDomain): Added another public domain.
+
2011-02-08 <dmg@uvic.ca>
* senttok/licensesentence.dict: Renamed the GPLVer2+KDE to
diff --git a/matcher/rules.dict b/matcher/rules.dict
index 3ec7098..5559cc5 100644
--- a/matcher/rules.dict
+++ b/matcher/rules.dict
@@ -330,3 +330,4 @@ postgresqlRef:postgresqlRef
GPLVer2or3KDE+:GPLGenKDEor3\+Ver2,FSFwarranty,GPLseeDetailsVer0,GPLcopyVer0,GNUurl
+FSFUnlimited:FSFUnlimited
diff --git a/senttok/licensesentence.dict b/senttok/licensesentence.dict
index 887360c..614a5a2 100644
--- a/senttok/licensesentence.dict
+++ b/senttok/licensesentence.dict
@@ -25,6 +25,7 @@ AllRights:0:1:All rights reserved:
# GENERIC rules for GPL
GPLGen:00:1:^([^,;]+) is <licensed> under the terms of the GPL,? <version>$:2
GPLGen:01:1:^([^,;]+) is <LICENSED> under the GPL, <VERSION>:$
+GPLGen:02:0:^<LICENSED> under the GPL <VERSION>, see file LICENSE in this source tree$:
GPLGen:10:1:^([^,;]+) is free software; you can redistribute it and/or modify it under the terms of the GPL; either <VERSION>$:
GPLGen:14:1:^([^,;]+) is free software; you can distribute it and/or modify it under the terms of the GPL (<VERSION>) as published by the Free Software Foundation$:
GPLGen:20:1:^([^,;]+) is free software; you can redistribute it and/or modify it under the terms of the GPL(,|;)? <version>$:
@@ -494,6 +495,7 @@ publicDomain:09:0:^(.+) released to the public domain, as explained at http<colo
publicDomain:10:0:^This code is explicitly placed into the public domain$
publicDomain:11:0:^The author disclaims copyright to this source code$
publicDomain:12:0:^The author of this program disclaims copyright$
+publicDomain:13:0:^This file has been put into the public domain$
publicDomain:52:1:This ([^ ]+)is public domain software:
publicDomain:53:1:and placed in the public domain:
@@ -662,3 +664,4 @@ psqlLiab:10:2:^IN NO EVENT SHALL (.+) BE LIABLE TO ANY PARTY FOR DIRECT, INDIREC
psqlWarr:10:1:^THE (.+) SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE$
psqlWarr2:10:1:^THE SOFTWARE PROVIDED HEREUNDER IS ON AN <quotes>AS IS<quotes> BASIS, AND (.+) HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS$
postgresqlRef:10:0:^This code is released under the terms of the PostgreSQL License$
+FSFUnlimited:10:0:^This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it$
diff --git a/splitter/splitter.pl b/splitter/splitter.pl
index a51b2f4..5eab784 100755
--- a/splitter/splitter.pl
+++ b/splitter/splitter.pl
@@ -179,7 +179,7 @@ sub Clean_Sentence
# check for trailing bullets of different types
s/^o //;
- s/^\s*[0-9]+\s*[\-\)]//;
+ s/^\s*[0-9]{1-2}+\s*[\-\)]//;
s/^[ \t]+//;
s/[ \t]+$//;
# remove a trailing -