[devscripts] 02/02: licensecheck: support eclipse public license (Closes: #587892)

[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 831e09b70299ff41128f1a9d06a50ac049912917
Author: Dominique Dumont <dod at debian.org>
Date:   Fri May 15 15:16:45 2015 +0200

    licensecheck: support eclipse public license (Closes: #587892)
---
 debian/changelog        |  1 +
 scripts/licensecheck.pl |  4 ++++
 test/licensecheck/epl.h | 11 +++++++++++
 test/test_licensecheck  |  3 +++
 4 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a88c361..9e3a1cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ devscripts (2.15.5) UNRELEASED; urgency=medium
     * fix BSL parser (Closes: #690375)
     * support academic free license (Closes: #534987)
     * allow © owner to mention "and others"
+    * support eclipse public license (Closes: #587892)
 
  -- Cyril Brulebois <kibi at debian.org>  Tue, 28 Apr 2015 16:58:36 +0200
 
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 33095e7..63c627e 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -601,6 +601,10 @@ sub parselicense {
         $license = $1 ? "AFL-$1" : "AFL";
     }
 
+    if ($licensetext =~ /This program and the accompanying materials are made available under the terms of the Eclipse Public License v?([\d.]+)/) {
+        $license = $1 ? "EPL-$1" : "EPL";
+    }
+
     # 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/epl.h b/test/licensecheck/epl.h
new file mode 100644
index 0000000..c8ef293
--- /dev/null
+++ b/test/licensecheck/epl.h
@@ -0,0 +1,11 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+
+*******************************************************************************/
diff --git a/test/test_licensecheck b/test/test_licensecheck
index 3c96a8e..0a18fbc 100755
--- a/test/test_licensecheck
+++ b/test/test_licensecheck
@@ -47,6 +47,9 @@ testAcademic() {
     license "academic.h" "AFL-3.0"
 }
 
+testEclipse() {
+    license2 "-m --copyright" "epl.h" "EPL-1.0	2004, 2006 IBM Corporation and others"
+}
 
 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