update changes to previous changelog

4 files changed, 31 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 43ab3e6..b6eb8fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,4 +8,28 @@
 	GPLVer2+KDE (a variant of the GPLv2+ where the KDE has a say in
 	terms of which license it can be replaced with in the future).
 
+2010-11-19  dmg  <dmg@uvic.ca>
+
+	* ninka.pl: Uncommented a line that I left commented by mistake.
+
+2010-11-10  dmg  <dmg@uvic.ca>
+
+	* Released pre-release version 1.0-pre2
+	
+	* Added path to the files in the tar file.
+	
+	* README: Fixed errors (patch by Armijn Hemel)
+ 
+	* extComments/extComments.pl (Determine_Comments_Extractor): Added
+	the option to not use the comments extractor.
+
+	* Now that Paul has given us permission, remove patching process.
+
+	* Cleanup files
+
+2010-08-07  dmg  <dmg@uvic.ca>
+
+	* Prepared the release to the public.
+	
+
 
diff --git a/matcher/rules.dict b/matcher/rules.dict
index ee10b00..d87bbb4 100755
--- a/matcher/rules.dict
+++ b/matcher/rules.dict
@@ -291,3 +291,8 @@ kerberos:exportLicRequired,exportNoLia,exportMITper,exportMITmodify,MITnorep,MIT
 # postgresql
 postgresql:psql,psqlLiab,psqlWarr,psqlWarr2
 postgresqlRef:postgresqlRef
+# gplv2+ with kde option
+GPLVer2+KDE+:GPLGenKDE\+Ver2,FSFwarranty,GPLseeDetailsVer0,GPLcopyVer0,GNUurl
+
+
+
diff --git a/senttok/licensesentence.dict b/senttok/licensesentence.dict
index 1c0057b..0ff0d63 100644
--- a/senttok/licensesentence.dict
+++ b/senttok/licensesentence.dict
@@ -53,6 +53,7 @@ GPLGen:77:1:^The contents of this ([^,;]+) are subject to the terms of the GPL;
 GPLGen:80:1:^([^,;]+) provides this source code under the GPL <VERSION> License$:
 GPLGen:81:1:^<LICENSED> under the GPL <VERSION>, see file ([^,;]+) in this ([^,;]+) for details$
 GPLGenVer2:90:0:^released under GNU GPL v2 or later license$
+GPLGenKDE+: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$:
 #
 GPLGenError:26:1:^You may use this ([^,;]+) under the GNU public license if you so wish$:
 GPLGenError:20:0:^this software may be distributed under the terms of the GNU Public License \(<quotes>GPL<quotes>\)$
diff --git a/senttok/senttok.pl b/senttok/senttok.pl
index 7a20f59..a11adac 100755
--- a/senttok/senttok.pl
+++ b/senttok/senttok.pl
@@ -190,7 +190,7 @@ sub Normalize_GPL
     if ($line =~ s/GPL ?[v\-]([123\.0]+)/GPL <VERSION>/i) {
         $version = $1;
     }
-    if ($line =~ s/v\.?([123\.0]+)/<VERSION>/i) {
+    if ($line =~ s/v\.?([123\.0]+)( *[0-9]+)/<VERSION>$2/i) {
         $version = $1;
     }