[devscripts] 01/01: licensecheck: support academic free license (Closes: #534987)

[dod at debian.org]

This is an automated email from the git hooks/post-receive script.

dod pushed a commit to branch master
in repository devscripts.

commit deff427a4f22caf49188489024cc929dfda72ada
Author: Dominique Dumont <dod at debian.org>
Date:   Fri May 15 14:25:02 2015 +0200

    licensecheck: support academic free license (Closes: #534987)
---
 scripts/licensecheck.pl      | 4 ++++
 test/licensecheck/academic.h | 4 ++++
 test/test_licensecheck       | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 2c4c05c..21c6715 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -597,6 +597,10 @@ sub parselicense {
         $license = "Ms-PL $license";
     }
 
+    if ($licensetext =~ /Licensed under the Academic Free License version ([\d.]+)/) {
+        $license = $1 ? "AFL-$1" : "AFL";
+    }
+
     # quotes were removed by clean_comments function
     if ($licensetext =~ /Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by this license \(the Software\)/ or
 	$licensetext =~ /Boost Software License([ ,-]+Version ([^ ]+)?(\.))/i) {
diff --git a/test/licensecheck/academic.h b/test/licensecheck/academic.h
new file mode 100644
index 0000000..369330a
--- /dev/null
+++ b/test/licensecheck/academic.h
@@ -0,0 +1,4 @@
+/*
+ Copyright 2004-2008 Paul R. Holser, Jr.  All rights reserved.
+ Licensed under the Academic Free License version 3.0
+ */
diff --git a/test/test_licensecheck b/test/test_licensecheck
index 708e31a..3c96a8e 100755
--- a/test/test_licensecheck
+++ b/test/test_licensecheck
@@ -43,6 +43,10 @@ testBoost() {
     license "boost.h" "BSL"
 }
 
+testAcademic() {
+    license "academic.h" "AFL-3.0"
+}
+
 
 testBSD() {
     license "bsd-3-clause.cpp" "BSD (3 clause)"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git