[maven-debian-helper] 04/05: mh_make now recognizes the EPL-1.0 license (Closes: #814632)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository maven-debian-helper.

commit d50826edd7c0cb5b0fe158df9b2452c416dd60d0
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Feb 29 13:52:26 2016 +0100

    mh_make now recognizes the EPL-1.0 license (Closes: #814632)
---
 debian/changelog                                                   | 1 +
 .../main/java/org/debian/maven/packager/util/LicensesScanner.java  | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 667251f..b3b035b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ maven-debian-helper (2.0.6) UNRELEASED; urgency=medium
     of the plugins not defining a dependency on it already (Closes: #813287)
   * Build the plugin metadata for the com.thoughtworks.paranamer group
     when copying the Maven repository.
+  * mh_make now recognizes the EPL-1.0 license (Closes: #814632)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 29 Feb 2016 09:13:41 +0100
 
diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/util/LicensesScanner.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/util/LicensesScanner.java
index c7d2591..9a40358 100644
--- a/maven-packager-utils/src/main/java/org/debian/maven/packager/util/LicensesScanner.java
+++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/util/LicensesScanner.java
@@ -72,7 +72,7 @@ public class LicensesScanner {
 
     private String getAvailableLicenses() {
         return "Apache-2.0 Artistic BSD FreeBSD ISC CC-BY CC-BY-SA CC-BY-ND CC-BY-NC CC-BY-NC-SA\n"
-         + "CC-BY-NC-ND CC0 CDDL CPL Eiffel Expat GPL-2 GPL-3 LGPL-2 LGPL-2.1 LGPL-3"
+         + "CC-BY-NC-ND CC0 CDDL CPL Eiffel EPL-1.0 Expat GPL-2 GPL-3 LGPL-2 LGPL-2.1 LGPL-3"
          + "GFDL-1.2 GFDL-1.3 GFDL-NIV LPPL MPL Perl PSF QPL W3C-Software ZLIB Zope";
     }
 
@@ -100,6 +100,11 @@ public class LicensesScanner {
                 licenses.add("Apache-1.1");
                 recognized = true;
             }
+        } else if (licenseName.contains("epl") || licenseUrl.contains("epl")) {
+            if (licenseName.contains("1.0") || licenseUrl.contains("v10")) {
+                licenses.add("EPL-1.0");
+                recognized = true;
+            }
         } else if (licenseName.contains("lgpl ") || licenseUrl.contains("lgpl")) {
             if (licenseName.contains("2.1") || licenseUrl.contains("2.1")) {
                 licenses.add("LGPL-2.1");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-debian-helper.git