summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordmg <dmg@uvic.ca>2013-07-07 10:23:32 -0400
committerdmg <dmg@uvic.ca>2013-07-07 10:23:32 -0400
commit3edf6beb98fa54778ef7e7058be30d11ef42db60 (patch)
treef52654929537bd04236a927df7178579e1e270a0
parentf8d2e04f6997dddc8064e9b9f1cdca3affb8bdd9 (diff)
downloadninka-3edf6beb98fa54778ef7e7058be30d11ef42db60.tar.gz
version 1.1
-rwxr-xr-xmatcher/matcher.pl2
-rwxr-xr-xninka.pl2
2 files changed, 3 insertions, 1 deletions
diff --git a/matcher/matcher.pl b/matcher/matcher.pl
index 5ca7770..c1a46ae 100755
--- a/matcher/matcher.pl
+++ b/matcher/matcher.pl
@@ -76,6 +76,8 @@ $NonCriticalRules{"AGPLv3+"} = [@gplNonCritical, 'AGPLreceivedVer0','AGPLseeVer0
$NonCriticalRules{"GPLnoVersion"} = [@gplNonCritical];
$NonCriticalRules{"Apachev1.1"} = ['ApacheLic1_1'];
+$NonCriticalRules{"Apachev2"} = ['ApachePre','ApacheSee'];
+
$NonCriticalRules{"LibGCJLic"} = ['LibGCJSee'];
$NonCriticalRules{"CDDLicV1"} = ['Compliance','CDDLicWhere','ApachesPermLim','CDDLicIncludeFile','UseSubjectToTerm', 'useOnlyInCompliance'];
$NonCriticalRules{"CDDLic"} = ['Compliance','CDDLicWhere','ApachesPermLim','CDDLicIncludeFile','UseSubjectToTerm', 'useOnlyInCompliance'];
diff --git a/ninka.pl b/ninka.pl
index cd15ebc..a74dc83 100755
--- a/ninka.pl
+++ b/ninka.pl
@@ -21,7 +21,7 @@ use Getopt::Std;
my %opts = ();
if (!getopts ("vfCcSsGgTtLd",\%opts) or scalar(@ARGV) == 0) {
-print STDERR "Ninka version 1.1 RC2
+print STDERR "Ninka version 1.1
Usage $0 -fCtTvcgsGd <filename>