Tony Mancill pushed to branch master at Debian Java Maintainers / jabref
Commits: 922fd3ca by tony mancill at 2018-05-23T20:35:01-07:00 Use workaround to start with JREs newer than Java8 (Closes: #893138) - - - - - f01e46fa by tony mancill at 2018-05-23T20:35:01-07:00 Use debhelper 11 - - - - - bc06ddfd by tony mancill at 2018-05-23T20:35:01-07:00 prepare changelog for upload - - - - - 5e14d4c2 by tony mancill at 2018-05-23T20:56:53-07:00 Merge branch 'master' of salsa.debian.org:java-team/jabref - - - - - 4 changed files: - debian/changelog - debian/compat - debian/control - debian/jabref-wrapper Changes: ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +jabref (3.8.2+ds-5) unstable; urgency=medium + + * Use workaround to start with JREs newer than Java8 (Closes: #893138) + - Drop the runtime dependency on openjdk-8-jre + - Set JABREF_JAVA_OPTS as per workaround documented by upstream + (https://github.com/JabRef/jabref/issues/2594). + - If this causes problems on a particular JRE, unset using: + JABREF_JAVA_OPTS="" jabref ... + * Use debhelper 11 + + -- tony mancill <[email protected]> Wed, 23 May 2018 19:25:44 -0700 + jabref (3.8.2+ds-4) unstable; urgency=medium * Apply upstream patch for file perms (Closes: #857351) ===================================== debian/compat ===================================== --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +11 ===================================== debian/control ===================================== --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Uploaders: tony mancill <[email protected]>, gregor herrmann <[email protected]> Section: tex Priority: optional -Build-Depends: debhelper (>= 10), +Build-Depends: debhelper (>= 11), gradle-debian-helper Build-Depends-Indep: ant, antlr, @@ -73,8 +73,7 @@ Depends: ${misc:Depends}, libspin-java, libswing-layout-java, libswingx-java (<< 1:1.6.4), - libunirest-java-java, - openjdk-8-jre + libunirest-java-java Recommends: xdg-utils, libreoffice-writer, libmysql-java, ===================================== debian/jabref-wrapper ===================================== --- a/debian/jabref-wrapper +++ b/debian/jabref-wrapper @@ -3,9 +3,12 @@ # Include the wrappers utility script . /usr/lib/java-wrappers/java-wrappers.sh -# We need a java8 runtime -# as this is also provided by openjdk9, we hardcode openjdk8 here -find_java_runtime openjdk8 +# We need a java8 runtime (at least) +find_java_runtime java8 + +# We need some options to start this version on openjdk9 and later +# See http://discourse.jabref.org/t/cannot-start-jabref-3-7-3-6-using-java-9-on-ubuntu-16-04/361/8 +JABREF_JAVA_OPTS=${JABREF_JAVA_OPTS-"--add-modules=java.se.ee --add-opens=java.desktop/java.awt=ALL-UNNAMED"} find_jars \ jabref \ @@ -48,4 +51,4 @@ find_jars \ unirest-java \ unoil -run_java net.sf.jabref.JabRefMain "$@" +run_java ${JABREF_JAVA_OPTS} net.sf.jabref.JabRefMain "$@" View it on GitLab: https://salsa.debian.org/java-team/jabref/compare/9acd52cf0debdfd8e626357acb03f3acc3b8891d...5e14d4c2d2ba7eae7f6aa731701545f7ef84be1c -- View it on GitLab: https://salsa.debian.org/java-team/jabref/compare/9acd52cf0debdfd8e626357acb03f3acc3b8891d...5e14d4c2d2ba7eae7f6aa731701545f7ef84be1c 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
