Markus Koschany pushed to branch master at Debian Java Maintainers / jajuk
Commits: 1cd1573b by Markus Koschany at 2019-02-26T23:30:46Z Declare compliance with Debian Policy 4.3.0. - - - - - 3bc5b6e1 by Markus Koschany at 2019-02-26T23:31:21Z Remove alternative dependency on java7-runtime. - - - - - 37dfc51d by Markus Koschany at 2019-02-26T23:31:44Z Use https for Format field. - - - - - f98d0ef9 by Markus Koschany at 2019-02-26T23:37:14Z Add isJavaVersionNotSupported.patch - - - - - efff94da by Markus Koschany at 2019-02-26T23:38:53Z Fix start error when using OpenJDK 11. Thanks: Werner Mahr for the report. Closes: #923330 - - - - - f638b926 by Markus Koschany at 2019-02-26T23:57:30Z Update changelog - - - - - 5 changed files: - debian/changelog - debian/control - debian/copyright - + debian/patches/isJavaVersionNotSupported.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,14 @@ +jajuk (1:1.10.9+dfsg2-5) UNRELEASED; urgency=medium + + * Team upload. + * Declare compliance with Debian Policy 4.3.0. + * Remove alternative dependency on java7-runtime. + * Use https for Format field. + * Add isJavaVersionNotSupported.patch and fix start error when using + OpenJDK 11. Thanks to Werner Mahr for the report. (Closes: #923330) + + -- Markus Koschany <[email protected]> Wed, 27 Feb 2019 00:39:54 +0100 + jajuk (1:1.10.9+dfsg2-4) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -42,14 +42,14 @@ Build-Depends-Indep: ant, mplayer, substance (>= 7.3), libqdwizard-java -Standards-Version: 4.1.1 +Standards-Version: 4.3.0 Vcs-Git: https://anonscm.debian.org/git/pkg-java/jajuk.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jajuk.git Homepage: http://jajuk.info Package: jajuk Architecture: all -Depends: default-jre | java7-runtime | java8-runtime, +Depends: default-jre | java8-runtime, entagged, java-wrappers, libbasicplayer-java, ===================================== debian/copyright ===================================== @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Jajuk Upstream-Contact: Bertrand Florat <[email protected]> and The Jajuk Team Source: http://www.jajuk.info/downloads.html ===================================== debian/patches/isJavaVersionNotSupported.patch ===================================== @@ -0,0 +1,51 @@ +From: Markus Koschany <[email protected]> +Date: Wed, 27 Feb 2019 00:36:43 +0100 +Subject: isJavaVersionNotSupported + +Fix start error because of incorrect check for JDK versions. + +Bug-Debian: https://bugs.debian.org/923330 +--- + src/main/java/org/jajuk/Main.java | 22 +++++++++++++++++----- + 1 file changed, 17 insertions(+), 5 deletions(-) + +diff --git a/src/main/java/org/jajuk/Main.java b/src/main/java/org/jajuk/Main.java +index d9248f2..26e484a 100644 +--- a/src/main/java/org/jajuk/Main.java ++++ b/src/main/java/org/jajuk/Main.java +@@ -74,11 +74,11 @@ public final class Main { + // non ui init + try { + // check JVM version +- if (!JVM.current().isOrLater(JVM.JDK1_7)) { +- System.out.println("[BOOT] Java Runtime Environment 1.7 minimum required." +- + " You use a JVM " + JVM.current()); +- System.exit(2); // error code 2 : wrong JVM +- } ++ if (isJavaVersionNotSupported()) { ++ System.out.println( ++ "[BOOT] Java Runtime Environment 1.8 minimum required." + " You use a JVM " + System.getProperty("java.version")); ++ System.exit(2); // error code 2 : wrong JVM ++ } + // set flags from command line options + SessionService.handleCommandline(args); + // Set System properties +@@ -203,6 +203,18 @@ public final class Main { + } + } + ++ /** ++ * ++ * Check java version. ++ * ++ * JVM version before 9 : "1.0","1.6"... then "9", "10" ++ * ++ * @return true whether Java version is correct ++ */ ++ private static boolean isJavaVersionNotSupported() { ++ String javaVersion = System.getProperty("java.version"); ++ return javaVersion.matches("1.[0-7]"); ++ } + /* + * Initialize some useful System properties For some reasons (at least with Apple JVM), this + * method must be in the Main class. Should be called ASAP in the startup process ===================================== debian/patches/series ===================================== @@ -6,3 +6,4 @@ 06_scrolling_stuff.patch jgoodies-animation-1.4.3.patch 08_java9_compatibility.patch +isJavaVersionNotSupported.patch View it on GitLab: https://salsa.debian.org/java-team/jajuk/compare/20dd46452d6b0afdd1e68c5860363496c10227d9...f638b9269634ffd6a8b0aa5dd0ba2d21abb6a177 -- View it on GitLab: https://salsa.debian.org/java-team/jajuk/compare/20dd46452d6b0afdd1e68c5860363496c10227d9...f638b9269634ffd6a8b0aa5dd0ba2d21abb6a177 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
