Jeremy Bícha pushed to branch bookworm at Debian Java Maintainers / libcommons-lang-java
Commits: 80fea55b by Emmanuel Bourg at 2022-05-23T10:34:26+02:00 Standards-Version updated to 4.6.1 - - - - - defc4f01 by Emmanuel Bourg at 2022-05-23T10:34:30+02:00 Switch to debhelper level 13 - - - - - 6cdeb2e6 by Emmanuel Bourg at 2022-05-23T10:41:52+02:00 No longer append on debian/.mh_clean during the build (Closes: #985648) - - - - - 75bf18f0 by Emmanuel Bourg at 2022-05-23T11:23:59+02:00 Fixed the build failure with Java 17 (Closes: #1011120) - - - - - b36f66f0 by Emmanuel Bourg at 2022-05-23T11:24:36+02:00 Upload to unstable - - - - - 7 changed files: - debian/changelog - + debian/clean - − debian/compat - debian/control - + debian/patches/02-java17-compatibility.patch - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +libcommons-lang-java (2.6-10) unstable; urgency=medium + + * Fixed the build failure with Java 17 (Closes: #1011120) + * No longer append on debian/.mh_clean during the build (Closes: #985648) + * Standards-Version updated to 4.6.1 + * Switch to debhelper level 13 + + -- Emmanuel Bourg <[email protected]> Mon, 23 May 2022 11:24:24 +0200 + libcommons-lang-java (2.6-9) unstable; urgency=medium * No longer install the javadoc jar in the doc package ===================================== debian/clean ===================================== @@ -0,0 +1 @@ +debian/.commons-lang-versioned.bnd ===================================== debian/compat deleted ===================================== @@ -1 +0,0 @@ -11 ===================================== debian/control ===================================== @@ -6,13 +6,13 @@ Uploaders: Emmanuel Bourg <[email protected]> Build-Depends: ant, bnd (>= 2.1.0), - debhelper (>= 11), + debhelper-compat (= 13), default-jdk, default-jdk-doc, junit (>= 3.8.1), libcommons-parent-java (>= 12), maven-repo-helper (>= 1.7) -Standards-Version: 4.4.0 +Standards-Version: 4.6.1 Vcs-Git: https://salsa.debian.org/java-team/libcommons-lang-java.git Vcs-Browser: https://salsa.debian.org/java-team/libcommons-lang-java Homepage: http://commons.apache.org/lang/ ===================================== debian/patches/02-java17-compatibility.patch ===================================== @@ -0,0 +1,14 @@ +Description: Fixes the compatibility with Java 17 +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/src/main/java/org/apache/commons/lang/math/JVMRandom.java ++++ b/src/main/java/org/apache/commons/lang/math/JVMRandom.java +@@ -141,7 +141,7 @@ + * @return the random long + * @throws IllegalArgumentException when <code>n <= 0</code> + */ +- public static long nextLong(long n) { ++ public long nextLong(long n) { + if (n <= 0) { + throw new IllegalArgumentException( + "Upper bound for nextInt must be positive" ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ 01-source-encoding.patch +02-java17-compatibility.patch ===================================== debian/rules ===================================== @@ -11,5 +11,4 @@ export CLASSPATH=$(shell for jar in `cat debian/build-classpath`; do if [ -f "$$ override_dh_auto_build: ANT_ARGS="-Dbasedir=$(realpath .) -Dcompile.excludes='**/enum/*' -Djavadoc.excludepackagenames='org/apache/commons/lang/enum/*' -Djdk.javadoc=file:///usr/share/doc/default-jdk-doc/api/ jar javadoc javadoc-jar" dh_auto_build cat debian/commons-lang.bnd | sed s/VERSION/$(DEB_VERSION_UPSTREAM)/ > debian/.commons-lang-versioned.bnd - echo debian/.commons-lang-versioned.bnd >> debian/.mh_clean bnd wrap --properties debian/.commons-lang-versioned.bnd --output target/commons-lang.bnd.jar target/commons-lang-$(DEB_VERSION_UPSTREAM).jar View it on GitLab: https://salsa.debian.org/java-team/libcommons-lang-java/-/compare/bf3a9ab65dd688241871348067e4efeb239ad0d7...b36f66f09d66f6271b624cf620ad2414c7876e42 -- View it on GitLab: https://salsa.debian.org/java-team/libcommons-lang-java/-/compare/bf3a9ab65dd688241871348067e4efeb239ad0d7...b36f66f09d66f6271b624cf620ad2414c7876e42 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
