Andreas Tille pushed to branch use_gradle at Debian Med / libsis-jhdf5-java
Commits:
5f39af63 by Andreas Tille at 2018-09-19T15:06:14Z
Use libecj-java
- - - - -
2 changed files:
- debian/control
- debian/patches/use_debian_packaged_libs.patch
Changes:
=====================================
debian/control
=====================================
@@ -12,6 +12,7 @@ Build-Depends: debhelper (>= 11~),
ant,
libcommons-lang-java,
libcommons-io-java,
+ libecj-java,
libsis-base-java (>= 18.08.0~),
libhdf5-dev (>> 1.8.13),
libargs4j-java,
=====================================
debian/patches/use_debian_packaged_libs.patch
=====================================
@@ -1,6 +1,6 @@
--- a/.classpath
+++ b/.classpath
-@@ -4,18 +4,16 @@
+@@ -4,18 +4,17 @@
<classpathentry kind="src" path="sourceExamples/java"/>
<classpathentry kind="src" path="sourceTest/java"/>
<classpathentry kind="con"
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
@@ -17,6 +17,7 @@
- <classpathentry kind="lib" path="libs/prod/commons-lang3-3.7.jar"
sourcepath="libs/prod/commons-lang3-3.7-sources.jar"/>
- <classpathentry kind="lib" path="libs/prod/commons-io-2.6.jar"
sourcepath="libs/prod/commons-io-2.6-sources.jar"/>
- <classpathentry kind="lib" path="libs/prod/sis-base-18.08.0.jar"
sourcepath="libs/prod/sis-base-18.08.0-sources.jar"/>
++ <classpathentry kind="lib" path="/usr/share/java/ecj.jar"/>
+ <classpathentry kind="lib" path="/usr/share/java/hamcrest-core.jar"/>
+ <classpathentry kind="lib"
path="/usr/share/java/hamcrest-integration.jar"/>
+ <classpathentry kind="lib" path="/usr/share/java/hamcrest-library.jar"/>
@@ -29,3 +30,14 @@
+ <classpathentry kind="lib" path="/usr/share/java/sis-base.jar"/>
<classpathentry kind="output" path="targets/classes"/>
</classpath>
+--- a/javaproject.gradle
++++ b/javaproject.gradle
+@@ -180,7 +180,7 @@ test {
+ }
+
+ dependencies {
+- ecj files('libs/build/ecj-4.6.1.jar')
++ ecj files('/usr/share/java/ecj.jar')
+ }
+
+ compileJava {
View it on GitLab:
https://salsa.debian.org/med-team/libsis-jhdf5-java/commit/5f39af63b2199e37326d100a21f81a63cbfcb760
--
View it on GitLab:
https://salsa.debian.org/med-team/libsis-jhdf5-java/commit/5f39af63b2199e37326d100a21f81a63cbfcb760
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
