Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (2)
Add runtime dep on jaxb and update wrapper script for openjdk 11
· d2a43a7c
Tony Mancill
authored
Oct 30, 2018
(Closes: #912221)
d2a43a7c
interim changelog
· 74fb5b3b
Tony Mancill
authored
Oct 30, 2018
74fb5b3b
Show whitespace changes
Inline
Side-by-side
debian/changelog
View file @
74fb5b3b
jabref (3.8.2+ds-8) UNRELEASED; urgency=medium
* Add runtime dep on jaxb and update wrapper script for openjdk 11
(Closes: #912221)
-- tony mancill <tmancill@debian.org> Tue, 30 Oct 2018 20:54:56 -0700
jabref (3.8.2+ds-7) unstable; urgency=medium
* Add build-dep on libjsonp-java to builds against antlr4 version 4.6
...
...
debian/control
View file @
74fb5b3b
...
...
@@ -61,6 +61,7 @@ Depends: ${misc:Depends},
libhttpclient-java,
libhttpmime-java,
libjava-string-similarity-java,
libjaxb-java,
libjempbox-java,
libjgoodies-common-java (>= 1.8.1),
libjgoodies-forms-java (>= 1.9.0),
...
...
debian/jabref-wrapper
View file @
74fb5b3b
...
...
@@ -6,11 +6,16 @@
# We need a java8 runtime (at least)
find_java_runtime java8
JAVA_VERSION
=
$(
run_java
-version
2>&1 |
grep
' version '
|
awk
'{print $3}'
)
if
!
(
echo
"
$JAVA_VERSION
"
|
grep
-q
'1.8.0'
)
;
then
MAJOR_
JAVA_VERSION
=
$(
run_java
-version
2>&1 |
grep
' version '
|
awk
'{print $3}'
|
cut
-f1
-d
'.'
|
cut
-c2-
)
if
(
test
$MAJOR_JAVA_VERSION
-ge
9
)
;
then
# 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"
}
JABREF_JAVA_OPTS
=
${
JABREF_JAVA_OPTS
-
"--add-opens=java.desktop/java.awt=ALL-UNNAMED"
}
# But java.se.ee only works for Java 9 and Java 10
if
(
test
$MAJOR_JAVA_VERSION
-lt
11
)
;
then
JABREF_JAVA_OPTS
=
"
${
JABREF_JAVA_OPTS
}
--add-modules=java.se.ee"
fi
fi
find_jars
\
...
...
@@ -32,6 +37,7 @@ find_jars \
httpcore-nio
\
httpmime
\
java-string-similarity
\
jaxb-runtime
\
jempbox
\
jgoodies-common
\
jgoodies-forms
\
...
...