[med-svn] [Git][med-team/libsis-jhdf5-java][master] Depend on libeclipse-jdt-core-java instead of libecj-java

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Med / libsis-jhdf5-java


Commits:
b80398f6 by Emmanuel Bourg at 2023-02-23T13:25:21+01:00
Depend on libeclipse-jdt-core-java instead of libecj-java

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/patches/use_debian_packaged_libs.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+libsis-jhdf5-java (19.04.1+dfsg-3) unstable; urgency=medium
+
+  * Team upload.
+  * Depend on libeclipse-jdt-core-java instead of libecj-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 23 Feb 2023 13:25:11 +0100
+
 libsis-jhdf5-java (19.04.1+dfsg-2) unstable; urgency=medium
 
   * Adding a missing directive from removed H5private.h file of hdf5


=====================================
debian/control
=====================================
@@ -13,7 +13,8 @@ Build-Depends: debhelper-compat (= 13),
                ant,
                libcommons-lang3-java,
                libcommons-io-java,
-               libecj-java,
+               libeclipse-jdt-core-java,
+               libeclipse-jdt-compiler-apt-java,
                libjaxb-java,
                libsis-base-java,
                libhdf5-dev,


=====================================
debian/patches/use_debian_packaged_libs.patch
=====================================
@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/.classpath
 +++ b/.classpath
-@@ -4,18 +4,18 @@
+@@ -4,18 +4,19 @@
  	<classpathentry kind="src" path="sourceExamples/java"/>
  	<classpathentry kind="src" path="sourceTest/java"/>
  	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
@@ -28,7 +28,8 @@ Forwarded: not-needed
 +	<classpathentry kind="lib" path="/usr/share/java/jmock2.jar"/>
 +	<classpathentry kind="lib" path="/usr/share/java/objenesis.jar"/>
 +	<classpathentry kind="lib" path="/usr/share/java/testng.jar"/>
-+	<classpathentry kind="lib" path="/usr/share/java/ecj.jar"/>
++	<classpathentry kind="lib" path="/usr/share/java/eclipse-jdt-core.jar"/>
++	<classpathentry kind="lib" path="/usr/share/java/eclipse-jdt-compiler-apt.jar"/>
 +	<classpathentry kind="lib" path="/usr/share/java/commons-lang3.jar"/>
 +	<classpathentry kind="lib" path="/usr/share/java/commons-io.jar"/>
 +	<classpathentry kind="lib" path="/usr/share/java/sis-base.jar"/>
@@ -38,7 +39,7 @@ Forwarded: not-needed
  </classpath>
 --- a/build.gradle
 +++ b/build.gradle
-@@ -3,8 +3,8 @@ apply from: 'javaproject.gradle'
+@@ -3,8 +3,8 @@
  group='sis'
  
  dependencies {
@@ -51,12 +52,13 @@ Forwarded: not-needed
  tasks.withType(Test) {
 --- a/javaproject.gradle
 +++ b/javaproject.gradle
-@@ -180,7 +180,7 @@ test {
+@@ -180,7 +180,8 @@
  }
  
  dependencies {
 -    ecj files('../jhdf5/libs/build/ecj-4.6.1.jar')
-+    ecj files('/usr/share/java/ecj.jar')
++    ecj files('/usr/share/java/eclipse-jdt-core.jar')
++    ecj files('/usr/share/java/eclipse-jdt-compiler-apt.jar')
  }
  
  compileJava {



View it on GitLab: https://salsa.debian.org/med-team/libsis-jhdf5-java/-/commit/b80398f6ba353f9c535b9bba7894debf48f2580a

-- 
View it on GitLab: https://salsa.debian.org/med-team/libsis-jhdf5-java/-/commit/b80398f6ba353f9c535b9bba7894debf48f2580a
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/20230223/ee0e8414/attachment-0001.htm>