[Git][java-team/maven-debian-helper][master] 8 commits: mh_make now recognizes the EPL-2.0 license
Emmanuel Bourg
gitlab at salsa.debian.org
Thu Jan 21 14:39:36 GMT 2021
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / maven-debian-helper
Commits:
cf0105c0 by Emmanuel Bourg at 2021-01-21T15:09:54+01:00
mh_make now recognizes the EPL-2.0 license
- - - - -
39706379 by Emmanuel Bourg at 2021-01-21T15:10:02+01:00
Standards-Version updated to 4.5.1
- - - - -
906a638c by Emmanuel Bourg at 2021-01-21T15:10:02+01:00
The generated control file now specifies Standards-Version: 4.5.1
- - - - -
c05d40c5 by Emmanuel Bourg at 2021-01-21T15:10:02+01:00
Switch to debhelper level 13
- - - - -
ab62ccb5 by Emmanuel Bourg at 2021-01-21T15:10:02+01:00
Generate DH 13 compliant packages
- - - - -
65b143da by Emmanuel Bourg at 2021-01-21T15:19:09+01:00
Use the svn mode of uscan instead of generating debian/orig-tar.sh (Closes: #979478)
- - - - -
a945ee55 by Emmanuel Bourg at 2021-01-21T15:29:46+01:00
Move to version 2.5
- - - - -
a1065946 by Emmanuel Bourg at 2021-01-21T15:39:18+01:00
Upload to unstable
- - - - -
12 changed files:
- debian-maven-plugin/pom.xml
- debian/changelog
- debian/control
- maven-debian-helper/pom.xml
- maven-packager-utils/pom.xml
- maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
- maven-packager-utils/src/main/java/org/debian/maven/packager/util/LicensesScanner.java
- maven-packager-utils/src/main/resources/control.vm
- − maven-packager-utils/src/main/resources/orig-tar.svn.vm
- maven-packager-utils/src/main/resources/watch.svn.vm
- maven-packager-utils/src/test/java/org/debian/maven/packager/util/LicensesScannerTest.java
- pom.xml
Changes:
=====================================
debian-maven-plugin/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<artifactId>maven-debian</artifactId>
<groupId>org.debian.maven</groupId>
- <version>2.4</version>
+ <version>2.5</version>
</parent>
<artifactId>debian-maven-plugin</artifactId>
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+maven-debian-helper (2.5) unstable; urgency=medium
+
+ * Use the svn mode of uscan instead of generating a debian/orig-tar.sh
+ script checking out the upstream repository (Closes: #979478)
+ * mh_make now recognizes the EPL-2.0 license
+ * Standards-Version updated to 4.5.1
+ * The generated control file now specifies Standards-Version: 4.5.1
+ * Switch to debhelper level 13
+ * Generate DH 13 compliant packages
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 21 Jan 2021 15:30:31 +0100
+
maven-debian-helper (2.4) unstable; urgency=medium
* mh_make:
=====================================
debian/control
=====================================
@@ -8,7 +8,7 @@ Uploaders:
Emmanuel Bourg <ebourg at apache.org>
Build-Depends:
ant-optional,
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
default-jdk-headless | default-jdk,
help2man,
junit4,
@@ -18,7 +18,7 @@ Build-Depends:
libplexus-velocity-java,
maven-ant-helper,
maven-repo-helper (>= 1.9)
-Standards-Version: 4.4.1
+Standards-Version: 4.5.1
Vcs-Git: https://salsa.debian.org/java-team/maven-debian-helper.git
Vcs-Browser: https://salsa.debian.org/java-team/maven-debian-helper
Homepage: https://wiki.debian.org/Java/MavenBuilder
=====================================
maven-debian-helper/pom.xml
=====================================
@@ -5,7 +5,7 @@
<parent>
<groupId>org.debian.maven</groupId>
<artifactId>maven-debian</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</parent>
<artifactId>maven-debian-helper</artifactId>
=====================================
maven-packager-utils/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<artifactId>maven-debian</artifactId>
<groupId>org.debian.maven</groupId>
- <version>2.4</version>
+ <version>2.5</version>
</parent>
<artifactId>maven-packager-utils</artifactId>
=====================================
maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
=====================================
@@ -300,7 +300,6 @@ public class GenerateDebianFilesMojo extends AbstractMojo {
context.put("suffixUrl", suffixUrl);
generateFile(context, "watch.svn.vm", outputDirectory, "watch");
- generateFile(context, "orig-tar.svn.vm", outputDirectory, "orig-tar.sh", true);
} else {
getLog().warn("Cannot locate the version in the download url (" + downloadUrl + ").");
=====================================
maven-packager-utils/src/main/java/org/debian/maven/packager/util/LicensesScanner.java
=====================================
@@ -65,7 +65,7 @@ public class LicensesScanner {
private String getAvailableLicenses() {
return "Apache-2.0 Artistic BSD-2-clause BSD-3-clause BSD-4-clause ISC CC-BY CC-BY-SA\n"
- + "CC-BY-ND CC-BY-NC CC-BY-NC-SA CC-BY-NC-ND CC0 CDDL CDDL-1.1 CPL Eiffel EPL-1.0 Expat\n"
+ + "CC-BY-ND CC-BY-NC CC-BY-NC-SA CC-BY-NC-ND CC0 CDDL CDDL-1.1 CPL Eiffel EPL-1.0 EPL-2.0 Expat\n"
+ "GPL-2 GPL-3 LGPL-2 LGPL-2.1 LGPL-3 GFDL-1.2 GFDL-1.3 GFDL-NIV LPPL MPL-1.1\n"
+ "MPL-2.0 Perl PSF QPL W3C-Software ZLIB Zope";
}
@@ -103,10 +103,13 @@ public class LicensesScanner {
licenses.add("Apache-1.1");
recognized = true;
}
- } else if (licenseName.contains("epl") || licenseUrl.contains("epl")) {
+ } else if (licenseName.contains("eclipse") || 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("2.0") || licenseUrl.contains("2.0")) {
+ licenses.add("EPL-2.0");
+ recognized = true;
}
} else if (licenseName.contains("lgpl ") || licenseUrl.contains("lgpl")) {
if (licenseName.contains("2.1") || licenseUrl.contains("2.1")) {
=====================================
maven-packager-utils/src/main/resources/control.vm
=====================================
@@ -18,11 +18,11 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: ${packager} <${packagerEmail}>
-Build-Depends: debhelper-compat (= 12), default-jdk, maven-debian-helper (>= 2.1)
+Build-Depends: debhelper-compat (= 13), default-jdk, maven-debian-helper (>= 2.1)
#if(!$buildDependencies.isEmpty())
Build-Depends-Indep:#printDependencies($buildDependencies)$space
#end
-Standards-Version: 4.4.1
+Standards-Version: 4.5.1
Vcs-Git: https://salsa.debian.org/java-team/${package}.git
Vcs-Browser: https://salsa.debian.org/java-team/${package}
Homepage:#if(${project.Url}) ${project.Url}#else TODO #end
=====================================
maven-packager-utils/src/main/resources/orig-tar.svn.vm deleted
=====================================
@@ -1,20 +0,0 @@
-#!/bin/sh -e
-#
-# Removes unwanted content from the upstream sources.
-# Called by uscan with '--upstream-version' <version> <file>
-#
-
-VERSION=$2
-TAR=../${package}_$VERSION.orig.tar.xz
-DIR=${package}-$VERSION
-TAG=$(echo "${tagMarker}$VERSION" | sed -re's/~(alpha|beta|rc)/-\1-/')
-
-svn export ${baseUrl}/${TAG}${suffixUrl} $DIR
-XZ_OPT=--best tar -c -J -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
-rm -rf $DIR ../$TAG
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $TAR $origDir && echo "moved $TAR to $origDir"
-fi
=====================================
maven-packager-utils/src/main/resources/watch.svn.vm
=====================================
@@ -1,4 +1,4 @@
version=4
-opts="uversionmangle=s/-(alpha|beta|rc)(-)?/~$1$2/" \
+opts="mode=svn,uversionmangle=s/-(alpha|beta|rc)(-)?/~$1$2/" \
${baseUrl}/ \
- ${tagMarker}(\d.*)/ debian debian/orig-tar.sh
+ ${tagMarker}(\d.*)/
=====================================
maven-packager-utils/src/test/java/org/debian/maven/packager/util/LicensesScannerTest.java
=====================================
@@ -82,5 +82,13 @@ public class LicensesScannerTest extends TestCase {
assertTrue(scanner.recognizeLicense(licenses, "CDDL (v1.1)", ""));
assertEquals("CDDL-1.1", licenses.iterator().next());
licenses.clear();
+
+ assertTrue(scanner.recognizeLicense(licenses, "Eclipse Public License 2.0", ""));
+ assertEquals("EPL-2.0", licenses.iterator().next());
+ licenses.clear();
+
+ assertTrue(scanner.recognizeLicense(licenses, "", "http://www.eclipse.org/legal/epl-2.0"));
+ assertEquals("EPL-2.0", licenses.iterator().next());
+ licenses.clear();
}
}
=====================================
pom.xml
=====================================
@@ -4,7 +4,7 @@
<groupId>org.debian.maven</groupId>
<artifactId>maven-debian</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<packaging>pom</packaging>
<description>Helper tools for using Maven to build Debian packages</description>
View it on GitLab: https://salsa.debian.org/java-team/maven-debian-helper/-/compare/f249e9fcfa4d73a923915217883bcfff74a59c1f...a106594639b2546ad91e76c44b63ed2f17096333
--
View it on GitLab: https://salsa.debian.org/java-team/maven-debian-helper/-/compare/f249e9fcfa4d73a923915217883bcfff74a59c1f...a106594639b2546ad91e76c44b63ed2f17096333
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20210121/0b1edaab/attachment.html>
More information about the pkg-java-commits
mailing list