[med-svn] [Git][med-team/libsbml][master] 2 commits: Work around javadoc issue with Java 9

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / libsbml


Commits:
94dca3c9 by Andreas Tille at 2018-03-18T19:47:37+01:00
Work around javadoc issue with Java 9

- - - - -
5cdf317e by Andreas Tille at 2018-03-18T21:26:45+01:00
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/javadoc_java9.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libsbml (5.16.0+dfsg-2) unstable; urgency=medium
+
+  * Work around javadoc issue with Java 9
+    Closes: #893298
+
+ -- Andreas Tille <tille at debian.org>  Sun, 18 Mar 2018 19:49:01 +0100
+
 libsbml (5.16.0+dfsg-1) unstable; urgency=medium
 
   * New upstream version


=====================================
debian/patches/javadoc_java9.patch
=====================================
--- /dev/null
+++ b/debian/patches/javadoc_java9.patch
@@ -0,0 +1,20 @@
+Description: Work around javadoc issue with Java 9
+  See https://lists.debian.org/debian-java/2018/03/msg00023.html
+Bug-Debian: https://bugs.debian.org/893298
+Author: Markus Koschany <apo at debian.org>
+        Andreas Tille <tille at debian.org>
+Last-Update: Sun, 18 Mar 2018 19:39:40 +0100
+
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -208,10 +208,6 @@ if (WITH_JAVA)
+ 	endif()
+ 	set(Java_JAVADOC_JAR ${Java_JAVADOC_JAR} CACHE FILEPATH "Location of javadoc jar")
+ 
+-	if (NOT EXISTS "${Java_JAVADOC_JAR}")
+-		message(FATAL_ERROR "Cannot generate java documentation, please specify the Java_JAVADOC_JAR.")
+-	endif()
+-
+ 	set(LIBSBML_JAVA_DIR "${CMAKE_CURRENT_BINARY_DIR}/../src/bindings/java/java-files")
+ 	set(LIBSBML_JAVADOC_DOCTITLE "${PACKAGE_NAME} ${PACKAGE_VERSION} Java API Reference")
+ 	set(LIBSBML_JAVADOC_HEADER "<B>${PACKAGE_NAME}<BR>${PACKAGE_VERSION}</B>")


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ spelling.patch
 swig-3.x.patch
 mips-compile-with-O1.patch
 # fix_cmake.patch # just warnings - ignore
+javadoc_java9.patch


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -21,9 +21,6 @@ endif
 JDK_PATH:=$(shell readlink -f /usr/bin/javac | sed "s:/bin/javac::")
 JAVA_INCLUDE_PATH:=$(JDK_PATH)/include
 
-# This is the path to the javadoc jar, which doc/CMakeLists.txt doesn't find
-CMAKE_OPTS += -DJava_JAVADOC_JAR=$(JDK_PATH)/lib/tools.jar -DJAVA_INCLUDE_PATH=$(JAVA_INCLUDE_PATH)
-
 ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel))
 CMAKE_OPTS += -D'WITH_01_COMPILE:BOOL=ON'
 endif



View it on GitLab: https://salsa.debian.org/med-team/libsbml/compare/877f56a8b19c6c2f35f279cb2d2235d92689dbcf...5cdf317e79882280eb998e5e66c52966d632107d

---
View it on GitLab: https://salsa.debian.org/med-team/libsbml/compare/877f56a8b19c6c2f35f279cb2d2235d92689dbcf...5cdf317e79882280eb998e5e66c52966d632107d
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-commit/attachments/20180318/b6bed830/attachment-0001.html>