Pierre Gruet pushed to branch master at Debian Med / libjloda-java
Commits:
5f9a030e by Pierre Gruet at 2020-11-18T17:50:34+01:00
Adding missing dependencies
- - - - -
f3c3899a by Pierre Gruet at 2020-11-18T17:54:36+01:00
Specifying the classpath by selecting only the useful jars
- - - - -
3 changed files:
- debian/control
- debian/patches/fix_build_xml.patch
- debian/rules
Changes:
=====================================
debian/control
=====================================
@@ -9,7 +9,9 @@ Build-Depends: debhelper-compat (= 13),
ant,
libbatik-java,
libjama-java,
- libopenjfx-java
+ libopenjfx-java,
+ libvectorgraphics2d-java,
+ libcontrolsfx-java
Standards-Version: 4.5.1
Vcs-Browser: https://salsa.debian.org/med-team/libjloda-java
Vcs-Git: https://salsa.debian.org/med-team/libjloda-java.git
=====================================
debian/patches/fix_build_xml.patch
=====================================
@@ -1,30 +1,49 @@
Author: Andreas Tille <[email protected]>
-Last-Update: Tue, 11 Oct 2016 20:08:16 +0200
+Last-Update: Wed, 18 Nov 2020 17:51:16 +0100
Description: Fix classpath
+ We provide the extensive list of the needed jars instead of using the joker
+ character, as several installed jars in /usr/share/java may provide the same
+ package, which leads to errors.
--- a/antbuild/build.xml
+++ b/antbuild/build.xml
-@@ -19,16 +19,16 @@
+@@ -19,17 +19,31 @@
<project name="JLODA" default="jar" basedir=".">
- <property name="jfxDir" value="../../javafx/lib"/>
-+ <property name="jfxDir" value="/usr/share/java"/>
<property name="buildSrcDir" value="../antbuild/src"/>
<property name="buildModulesDir" value="../antbuild/modules"/>
<path id="build.classpath">
- <fileset dir="../../jloda/jars" includes="*.jar"/>
-+ <fileset dir="../jars" includes="*.jar"/>
++ <fileset dir="/usr/share/java"
includes="batik-all.jar"/>
++ <fileset dir="/usr/share/java"
includes="controlsfx.jar"/>
++ <fileset dir="/usr/share/java"
includes="javafx-base.jar"/>
++ <fileset dir="/usr/share/java"
includes="javafx-controls.jar"/>
++ <fileset dir="/usr/share/java"
includes="javafx-fxml.jar"/>
++ <fileset dir="/usr/share/java"
includes="javafx-graphics.jar"/>
++ <fileset dir="/usr/share/java"
includes="javafx-media.jar"/>
++ <fileset dir="/usr/share/java"
includes="javafx-web.jar"/>
++ <fileset dir="/usr/share/java"
includes="VectorGraphics2D.jar"/>
</path>
<path id="build.modulepath">
- <fileset dir="../../jloda/jars" includes="*.jar"/>
-+ <fileset dir="../jars" includes="*.jar"/>
- <fileset dir="${jfxDir}" includes="*.jar"/>
+- <fileset dir="${jfxDir}" includes="*.jar"/>
++ <fileset dir="/usr/share/java"
includes="batik-all.jar"/>
++ <fileset dir="/usr/share/java"
includes="controlsfx.jar"/>
++ <fileset dir="/usr/share/java"
includes="javafx-base.jar"/>
++ <fileset dir="/usr/share/java"
includes="javafx-controls.jar"/>
++ <fileset dir="/usr/share/java"
includes="javafx-fxml.jar"/>
++ <fileset dir="/usr/share/java"
includes="javafx-graphics.jar"/>
++ <fileset dir="/usr/share/java"
includes="javafx-media.jar"/>
++ <fileset dir="/usr/share/java"
includes="javafx-web.jar"/>
++ <fileset dir="/usr/share/java"
includes="VectorGraphics2D.jar"/>
</path>
-@@ -40,13 +40,13 @@
+ <target name="init">
+@@ -40,13 +54,13 @@
<target name="copy_sources" depends="init">
<copy todir="${buildSrcDir}/jloda" >
=====================================
debian/rules
=====================================
@@ -3,6 +3,8 @@
# DH_VERBOSE := 1
export LC_ALL=C.UTF-8
+export
CLASSPATH=/usr/share/java/batik-all.jar:/usr/share/java/controlsfx.jar:/usr/share/java/javafx-base.jar:/usr/share/java/javafx-controls.jar:/usr/share/java/javafx-fxml.jar:/usr/share/java/javafx-graphics.jar:/usr/share/java/javafx-media.jar:/usr/share/java/javafx-web.jar:/usr/share/java/VectorGraphics2D.jar
+
%:
dh $@ --with javahelper
View it on GitLab:
https://salsa.debian.org/med-team/libjloda-java/-/compare/d5fcaaa5fbf18944b82a0b2c354749cb04ba12a1...f3c3899a097513a07976a7d436be5fc22e6ee0c7
--
View it on GitLab:
https://salsa.debian.org/med-team/libjloda-java/-/compare/d5fcaaa5fbf18944b82a0b2c354749cb04ba12a1...f3c3899a097513a07976a7d436be5fc22e6ee0c7
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
debian-med-commit mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
