changed license to GPLv2+

Conflicts:
	README
	extComments/extComments.pl
	extComments/hashComments.pl
	filter/filter.pl
	lib/Ninka/criticalwords.dict
	matcher/matcher.pl
	ninka.pl
	senttok/senttok.pl
	splitter/splitter.pl

11 files changed, 91 insertions, 85 deletions

diff --git a/Changes b/Changes
index c80809f..4423561 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,9 @@
+2014-06-09  dmg  <dmg@uvic.ca>
+
+	* Version 1.2
+
+	* Changed license to GPLv2+
+
 2013-07-07  dmg  <dmg@uvic.ca>
 
 	* Version 1.1
diff --git a/README b/README
index 8c97fbc..5559ea6 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-* Contact information.
+* Contact information. 
 
 Any feedback will be appreciated. You can email us at Daniel M. German
 <dmg@uvic.ca> and Yuki Manabe <y-manabe@ist.osaka-u.ac.jp>
@@ -28,21 +28,21 @@ the above paper.
 * License
 
   Except for the directories comments and splitter, Ninka is licensed
-  under the AGPLv3+
+  under the GPLv2+
 
     Copyright (C) 2009-2010  Yuki Manabe and Daniel M. German
 
     This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
+    it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
     License, or (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
+    GNU General Public License for more details.
 
-    You should have received a copy of the GNU Affero General Public License
+    You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
   - splitter.pl is a derivative work of the Rule-based sentence
diff --git a/lib/Ninka.pm b/lib/Ninka.pm
index a6a23b5..8e42a7b 100644
--- a/lib/Ninka.pm
+++ b/lib/Ninka.pm
@@ -67,19 +67,19 @@ Scans a file and returns the found licenses.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2009-2010  Yuki Manabe and Daniel M. German
+    Copyright (C) 2009-2010  Yuki Manabe and Daniel M. German
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 =cut
diff --git a/lib/Ninka/CommentExtractor.pm b/lib/Ninka/CommentExtractor.pm
index 0dd0776..9a9abca 100644
--- a/lib/Ninka/CommentExtractor.pm
+++ b/lib/Ninka/CommentExtractor.pm
@@ -93,19 +93,19 @@ If no comment extractor is known for a language, then extracts top lines from so
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2009-2010  Yuki Manabe and Daniel M. German
+    Copyright (C) 2009-2010  Yuki Manabe and Daniel M. German
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-=cut
+=cut
\ No newline at end of file
diff --git a/lib/Ninka/FileCleaner.pm b/lib/Ninka/FileCleaner.pm
index 8903367..ec42623 100644
--- a/lib/Ninka/FileCleaner.pm
+++ b/lib/Ninka/FileCleaner.pm
@@ -49,19 +49,19 @@ Escapes apostrophes and other potentially disturbing characters
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2009-2010  Yuki Manabe and Daniel M. German, 2015 Johannes Najjar
+    Copyright (C) 2009-2010  Yuki Manabe and Daniel M. German, 2015 Daniele Fognini and Johannes Najjar
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 =cut
\ No newline at end of file
diff --git a/lib/Ninka/LicenseMatcher.pm b/lib/Ninka/LicenseMatcher.pm
index 158017d..9ae8fc9 100644
--- a/lib/Ninka/LicenseMatcher.pm
+++ b/lib/Ninka/LicenseMatcher.pm
@@ -261,19 +261,19 @@ Uses a set of license sentence names as input and outputs license names correspo
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2009-2010  Yuki Manabe and Daniel M. German
+    Copyright (C) 2009-2010  Yuki Manabe and Daniel M. German
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 =cut
diff --git a/lib/Ninka/LicenseRules.pm b/lib/Ninka/LicenseRules.pm
index 4cff395..4dc9dff 100644
--- a/lib/Ninka/LicenseRules.pm
+++ b/lib/Ninka/LicenseRules.pm
@@ -96,19 +96,19 @@ Contains rules used by Ninka::LicenseMatcher.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2009-2010  Yuki Manabe and Daniel M. German
+    Copyright (C) 2009-2010  Yuki Manabe and Daniel M. German
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 =cut
diff --git a/lib/Ninka/criticalwords.dict b/lib/Ninka/criticalwords.dict
index c5ee1c7..c696913 100644
--- a/lib/Ninka/criticalwords.dict
+++ b/lib/Ninka/criticalwords.dict
@@ -1,17 +1,17 @@
 #
-#    Copyright (C) 2009-2010  Yuki Manabe and Daniel M. German
+#    Copyright (C) 2009-2014  Yuki Manabe and Daniel M. German
 #
 #    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
+#    it under the terms of the GNU General Public License as
+#    published by the Free Software Foundation; either version 2 of the
 #    License, or (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
+#    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 as is
@@ -95,7 +95,7 @@ redistribute
 redistribution
 reexported
 reproduce
-#required #too common
+#required #too common also
 use this software
 restriction
 all rights
@@ -109,7 +109,7 @@ sale
 sell
 subject to
 terms
-#under #too common
+#under #too common to be useful
 warranties
 warranty
 licensing
diff --git a/lib/Ninka/interrules.dict b/lib/Ninka/interrules.dict
index 74b6820..5a79c59 100644
--- a/lib/Ninka/interrules.dict
+++ b/lib/Ninka/interrules.dict
@@ -1,17 +1,17 @@
 #
-#    Copyright (C) 2009-2010  Yuki Manabe and Daniel M. German
+#    Copyright (C) 2009-2014  Yuki Manabe and Daniel M. German
 #
 #    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
+#    it under the terms of the GNU General Public License as
+#    published by the Free Software Foundation; either version 2 of the
 #    License, or (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
+#    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # intermediate rules
diff --git a/lib/Ninka/licensesentence.dict b/lib/Ninka/licensesentence.dict
index 8eac3be..6b08721 100644
--- a/lib/Ninka/licensesentence.dict
+++ b/lib/Ninka/licensesentence.dict
@@ -1,17 +1,17 @@
 #
-#    Copyright (C) 2009-2010  Yuki Manabe and Daniel M. German
+#    Copyright (C) 2009-2014  Yuki Manabe and Daniel M. German
 #
 #    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
+#    it under the terms of the GNU General Public License as
+#    published by the Free Software Foundation; either version 2 of the
 #    License, or (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
+#    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Format
diff --git a/lib/Ninka/rules.dict b/lib/Ninka/rules.dict
index 1e38599..7168a32 100644
--- a/lib/Ninka/rules.dict
+++ b/lib/Ninka/rules.dict
@@ -1,17 +1,17 @@
 #
-#    Copyright (C) 2009-2010  Yuki Manabe and Daniel M. German
+#    Copyright (C) 2009-2014  Yuki Manabe and Daniel M. German
 #
 #    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
+#    it under the terms of the GNU General Public License as
+#    published by the Free Software Foundation; either version 2 of the
 #    License, or (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
+#    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # this ones are deprecated, I think