[med-svn] [Git][med-team/pixelmed][master] 2 commits: Build-Depends: libjaxb-api-java

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / pixelmed


Commits:
3a32a645 by Andreas Tille at 2018-12-19T09:57:04Z
Build-Depends: libjaxb-api-java

- - - - -
7e0c7ad0 by Andreas Tille at 2018-12-19T10:25:14Z
Add /usr/share/java/jaxb-api.jar to classpath

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/patches/fixdoc.patch
- + debian/patches/jaxb-api.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,11 +1,14 @@
 pixelmed (20150917+git20151209.36f3174+dfsg-1) UNRELEASED; urgency=medium
 
+  * New Github commit
+    Closes: #893409
   * Point watch file to saved code copy on Github since upstream seems to
     be dead
   * debhelper 11
   * Point Vcs fields to salsa.debian.org
   * Standards-Version: 4.2.1
   * Remove trailing whitespace in debian/rules
+  * Build-Depends: libjaxb-api-java
 
  -- Andreas Tille <tille at debian.org>  Wed, 19 Dec 2018 08:53:43 +0100
 


=====================================
debian/control
=====================================
@@ -14,7 +14,8 @@ Build-Depends-Indep: default-jdk,
                      libjmdns-java,
                      libvecmath-java,
                      libpixelmed-codec-java,
-                     libjsonp-java
+                     libjsonp-java,
+                     libjaxb-api-java
 Standards-Version: 4.2.1
 Vcs-Browser: https://salsa.debian.org/med-team/pixelmed
 Vcs-Git: https://salsa.debian.org/med-team/pixelmed.git


=====================================
debian/patches/fixdoc.patch
=====================================
@@ -11,7 +11,7 @@ Index: pixelmed-20140326/Makefile
  	rm -rf docs/javadoc
  	javadoc \
 -		-classpath .:lib/additional/excalibur-bzip2-1.0.jar:lib/additional/hsqldb.jar:lib/additional/vecmath1.2-1.14.jar:lib/additional/commons-codec-1.3.jar:lib/additional/commons-net2.jar:lib/additional/jmdns.jar:lib/additional/jpedalSTD.jar:lib/junit/junit-4.8.1.jar \
-+		-classpath .:/usr/share/java/excalibur-bzip2-1.0.jar:/usr/share/java/hsqldb.jar:/usr/share/java/vecmath.jar:/usr/share/java/commons-codec.jar:/usr/share/java/commons-net2.jar:/usr/share/java/jmdns.jar:/usr/share/java/jpedalSTD.jar:/usr/share/java/junit4.jar \
++		-classpath .:/usr/share/java/excalibur-bzip2-1.0.jar:/usr/share/java/hsqldb.jar:/usr/share/java/vecmath.jar:/usr/share/java/commons-codec.jar:/usr/share/java/commons-net2.jar:/usr/share/java/jmdns.jar:/usr/share/java/jpedalSTD.jar:/usr/share/java/junit4.jar:/usr/share/java/jaxb-api.jar \
  		-link http://download.oracle.com/javase/1.5.0/docs/api/ \
  		-link http://jpedal.org/javadoc/ \
  		-link http://www.hsqldb.org/doc/src/ \


=====================================
debian/patches/jaxb-api.patch
=====================================
@@ -0,0 +1,16 @@
+Description: For OpenJDK 11 jaxb needs to be in classpath
+Bug-Debian: https://bugs.debian.org/893409
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Wed, 19 Dec 2018 08:53:43 +0100
+
+--- a/Makefile.common.mk
++++ b/Makefile.common.mk
+@@ -65,7 +65,7 @@ JAVACOPTIONS = -O ${JAVACTARGETOPTIONS}
+ 
+ .java.class:
+ 	export JAVAVERSIONTARGETJARFILE=${JAVA_HOME}/jre/lib/rt.jar; javac ${JAVACOPTIONS} \
+-		-classpath ${PATHTOROOT}:${DICOMADDITIONALJARS}:${VIEWERADDITIONALJARS}:${FTPADDITIONALJARS}:${JUNITJAR} \
++		-classpath ${PATHTOROOT}:${DICOMADDITIONALJARS}:${VIEWERADDITIONALJARS}:${FTPADDITIONALJARS}:${JUNITJAR}:/usr/share/java/jaxb-api.jar \
+ 		-sourcepath ${PATHTOROOT} $<
+ 
+ .png.ico:


=====================================
debian/patches/series
=====================================
@@ -16,3 +16,4 @@ set_java_home.patch
 imageio.patch
 no_Xdiags_verbose.patch
 do_not_set_bootclasspath.patch
+jaxb-api.patch



View it on GitLab: https://salsa.debian.org/med-team/pixelmed/compare/dbc052680d4b1d318f34caa60792bd29a21a2e89...7e0c7ad0d907aaa45465cf535732c019c80b9802

-- 
View it on GitLab: https://salsa.debian.org/med-team/pixelmed/compare/dbc052680d4b1d318f34caa60792bd29a21a2e89...7e0c7ad0d907aaa45465cf535732c019c80b9802
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20181219/193ec8d0/attachment-0001.html>