[devscripts] 01/01: licensecheck: parse lisp files, added LLGPL license

[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 ce880b747dbcf5038fd7d32c1a38075a9f19cbd1
Author: Dominique Dumont <dod at debian.org>
Date:   Mon Nov 30 21:16:06 2015 +0100

    licensecheck: parse lisp files, added LLGPL license
---
 debian/changelog             |  2 ++
 scripts/licensecheck.pl      |  6 +++++-
 test/licensecheck/llgpl.lisp | 13 +++++++++++++
 test/test_licensecheck       |  6 ++++++
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8093452..7e348ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,8 @@ devscripts (2.15.10) UNRELEASED; urgency=medium
     * remove 'by' from copyright owners
     * remove whitespace from end of multi-line copyright statements
     * parse multi-line copyright blocks (Closes: #519080)
+    + parse .lisp file (part of #806424)
+    + added LLGPL license (part of #806424)
 
   [ Osamu Aoki ]
   * uscan:
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index f744abc..3a936b7 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -173,7 +173,7 @@ my $default_ignore_regex = qr!
 \.shelf|_MTN|\.bzr(?:\.backup|tags)?)(?:$|/.*$)
 !x;
 
-my $default_check_regex = '\.(c(c|pp|xx)?|h(h|pp|xx)?|S|f(77|90)?|go|groovy|scala|clj|p(l|m)|xs|sh|php|py(|x)|rb|java|js|vala|el|sc(i|e)|cs|pas|inc|dtd|xsl|mod|m|tex|mli?|(c|l)?hs)$';
+my $default_check_regex = '\.(c(c|pp|xx)?|h(h|pp|xx)?|S|f(77|90)?|go|groovy|lisp|scala|clj|p(l|m)|xs|sh|php|py(|x)|rb|java|js|vala|el|sc(i|e)|cs|pas|inc|dtd|xsl|mod|m|tex|mli?|(c|l)?hs)$';
 
 # also used to cleanup
 my $copyright_indicator_regex
@@ -566,6 +566,10 @@ sub parselicense {
         $license = "$1$v $license";
     }
 
+    if ($licensetext =~ /the rights to distribute and use this software as governed by the terms of the Lisp Lesser General Public License|\bLLGPL\b/ ) {
+        $license = "LLGPL $license";
+    }
+
     if ($licensetext =~ /This file is part of the .*Qt GUI Toolkit. This file may be distributed under the terms of the Q Public License as defined/) {
 	$license = "QPL (part of Qt) $license";
     } elsif ($licensetext =~ /may (be distributed|redistribute it) under the terms of the Q Public License/) {
diff --git a/test/licensecheck/llgpl.lisp b/test/licensecheck/llgpl.lisp
new file mode 100644
index 0000000..a559889
--- /dev/null
+++ b/test/licensecheck/llgpl.lisp
@@ -0,0 +1,13 @@
+;;;; -*- mode: lisp -*-
+;;;;
+;;;; $Id: base64.lisp,v 1.1.1.1 2004/06/09 09:02:39 scaekenberghe Exp $
+;;;;
+;;;; This is a Common Lisp implementation of Base64 encoding and decoding.
+;;;;
+;;;; Copyright (C) 2002, 2004 Sven Van Caekenberghe, Beta Nine BVBA.
+;;;;
+;;;; You are granted the rights to distribute and use this software
+;;;; as governed by the terms of the Lisp Lesser General Public License
+;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
+
+;;;; from http://anonscm.debian.org/cgit/debian-science/packages/ros/ros-roslisp.git/plain/s-xml-rpc/src/base64.lisp
diff --git a/test/test_licensecheck b/test/test_licensecheck
index 86a6420..ecea50f 100755
--- a/test/test_licensecheck
+++ b/test/test_licensecheck
@@ -82,6 +82,12 @@ testLGPL() {
     license2  "-m --copyright" "lgpl-digia.c" "LGPL (v2.1 or v3)	2014 Digia Plc and/or its subsidiary(-ies)"
 }
 
+# Lisp Lesser General Public License (BTS #806424) 
+# see http://opensource.franz.com/preamble.html
+testLLGPL() {
+    license2  "-m --copyright" "llgpl.lisp" "LLGPL	2002, 2004 Sven Van Caekenberghe, Beta Nine BVBA"
+}
+
 testGPL() {
     license "gpl-1" "GPL (v1 or later)"
     license "gpl-2" "GPL (v2)"

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