diff options
| author | dmg <dmg@uvic.ca> | 2011-02-08 14:43:13 +0900 |
|---|---|---|
| committer | dmg <dmg@uvic.ca> | 2011-02-08 14:43:13 +0900 |
| commit | 7a9a5c48ede207eec881829382fbe4e63bc513a9 (patch) | |
| tree | 1c8d39bf5c6f15df97c4d514a0324e70be4ce595 | |
| parent | 0d3a16f25e7d7c657d8c050af0afa4ab2cae174f (diff) | |
| download | ninka-7a9a5c48ede207eec881829382fbe4e63bc513a9.tar.gz | |
Renamed GPLVer2KDE+ to GPLVer2or3KDE+
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | matcher/rules.dict | 2 | ||||
| -rw-r--r-- | senttok/licensesentence.dict | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2011-02-08 <dmg@uvic.ca> + + * senttok/licensesentence.dict: Renamed the GPLVer2+KDE to + GPLVer2or3KDE+, which I believe is more appropriate (license GPL + v2, v3 or any further version approved by the KDE e.v. + 2011-02-03 <dmg@uvic.ca> * extComments/extComments.pl (Determine_Comments_Extractor): Fixed diff --git a/matcher/rules.dict b/matcher/rules.dict index b06a4fe..37d9f85 100755 --- a/matcher/rules.dict +++ b/matcher/rules.dict @@ -292,7 +292,7 @@ kerberos:exportLicRequired,exportNoLia,exportMITper,exportMITmodify,MITnorep,MIT postgresql:psql,psqlLiab,psqlWarr,psqlWarr2 postgresqlRef:postgresqlRef # gplv2+ with kde option -GPLVer2+KDE+:GPLGenKDE\+Ver2,FSFwarranty,GPLseeDetailsVer0,GPLcopyVer0,GNUurl +GPLVer2or3KDE+:GPLGenKDEor3\+Ver2,FSFwarranty,GPLseeDetailsVer0,GPLcopyVer0,GNUurl diff --git a/senttok/licensesentence.dict b/senttok/licensesentence.dict index 0ff0d63..265cc79 100644 --- a/senttok/licensesentence.dict +++ b/senttok/licensesentence.dict @@ -53,7 +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$: +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$: # 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>\)$ |