[med-svn] [Git][med-team/libsis-jhdf5-java][master] 3 commits: Activating build-time tests again

[Pierre Gruet]

Pierre Gruet pushed to branch master at Debian Med / libsis-jhdf5-java


Commits:
2d0be93b by Pierre Gruet at 2020-09-21T22:31:22+02:00
Activating build-time tests again

- - - - -
390b18a6 by Pierre Gruet at 2020-09-21T22:34:07+02:00
Deleting useless rm in override_dh_auto_clean

- - - - -
804e2213 by Pierre Gruet at 2020-09-21T23:04:28+02:00
Forwarding patches

- - - - -


9 changed files:

- debian/changelog
- debian/patches/adapting_h5ar_script_to_debian.patch
- debian/patches/avoid_using_private_hdf5_header.patch
- debian/patches/declaring_final_variables.patch
- debian/patches/loading_jni_in_java_file.patch
- debian/patches/use_debian_packaged_libs.patch
- debian/patches/use_jaxb.patch
- debian/patches/using_h5util_definitions.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+libsis-jhdf5-java (19.04.0+dfsg-3) unstable; urgency=medium
+
+  * Activating build-time tests again
+  * Deleting useless rm in override_dh_auto_clean
+  * Forwarding patches
+
+ -- Pierre Gruet <pgtdebian at free.fr>  Mon, 21 Sep 2020 23:03:34 +0200
+
 libsis-jhdf5-java (19.04.0+dfsg-2) unstable; urgency=medium
 
   [ Pierre Gruet ]


=====================================
debian/patches/adapting_h5ar_script_to_debian.patch
=====================================
@@ -1,6 +1,7 @@
 Description: Adapting bindings to the location of files on a Debian system
 Author: Pierre Gruet <pgtdebian at free.fr>
 Last-Update: 2020-05-12
+Forwarded: not-needed
 
 --- a/dist/bin/h5ar
 +++ b/dist/bin/h5ar


=====================================
debian/patches/avoid_using_private_hdf5_header.patch
=====================================
@@ -1,6 +1,9 @@
 Description: avoid using the header H5private.h of hdf5, which is not shipped
+ We do not mix the sources of hdf5 and sis-jhdf5, which upstream apparently
+ does.
 Author: Pierre Gruet <pgtdebian at free.fr>
 Last-Update: 2020-04-26
+Forwarded: not-needed
 
 --- a/source/c/jni/h5jni.h
 +++ b/source/c/jni/h5jni.h


=====================================
debian/patches/declaring_final_variables.patch
=====================================
@@ -1,6 +1,7 @@
 Description: Adding final qualifier for some variables used by an inner class
 Author: Pierre Gruet <pgtdebian at free.fr>
 Last-Update: 2020-05-12
+Forwarded: brinn at ethz.ch
 
 --- a/source/java/ch/systemsx/cisd/hdf5/HDF5BaseWriter.java
 +++ b/source/java/ch/systemsx/cisd/hdf5/HDF5BaseWriter.java


=====================================
debian/patches/loading_jni_in_java_file.patch
=====================================
@@ -3,6 +3,7 @@ Description: adding loading of jni part in Java code
  In two other ones, the library call has to be changed.
 Author: Pierre Gruet <pgtdebian at free.fr>
 Last-Update: 2020-05-07
+Forwarded: not-needed
 
 --- a/source/java/ch/systemsx/cisd/hdf5/io/HDF5DataSetRandomAccessFile.java
 +++ b/source/java/ch/systemsx/cisd/hdf5/io/HDF5DataSetRandomAccessFile.java


=====================================
debian/patches/use_debian_packaged_libs.patch
=====================================
@@ -1,6 +1,7 @@
 Author: Andreas Tille <tille at debian.org>
 Last-Update: Mon, 13 Aug 2018 14:30:28 +0200
 Description: Use Debian packaged jars
+Forwarded: not-needed
 
 --- a/.classpath
 +++ b/.classpath


=====================================
debian/patches/use_jaxb.patch
=====================================
@@ -1,6 +1,7 @@
 Author: Emmanuel Bourg <ebourg at apache.org>
 Date: Wed, 19 Sep 2018 23:29:20 +0200
 Origin: https://lists.debian.org/debian-java/2018/09/msg00061.html
+Forwarded: not-needed
 Description: It isn't missing, it's hidden by default to prepare its removal in the
  next Java release.
 .


=====================================
debian/patches/using_h5util_definitions.patch
=====================================
@@ -6,6 +6,7 @@ Description: using definitions of source/c/jni/h5util.h
  uses functions of which prototypes are in this file.
 Author: Pierre Gruet <pgtdebian at free.fr>
 Last-Update: 2020-04-26
+Forwarded: brinn at ethz.ch
 
 --- a/source/c/h5lHelperImp.c
 +++ b/source/c/h5lHelperImp.c


=====================================
debian/rules
=====================================
@@ -18,12 +18,7 @@ CPPFLAGS += ${jvm_includes} -Ijni
 
 override_dh_auto_clean:
 	dh_auto_clean
-	$(RM) -rf debian/libsis-jhdf5-java/ debian/libsis-jhdf5-jni/ debian/tmp/ debian/.debhelper/
-	$(RM) debian/*debhelper* debian/files debian/*.substvars
-	$(RM) -rf targets/ test-output/
 	$(RM) source/c/libsis-jhdf5.so
-	$(RM) -rf debian/_jh*
-	$(RM) -rf debian/h5ar/
 	$(RM) sis-jhdf5-h5ar-cli.jar
 
 override_dh_auto_build:
@@ -71,7 +66,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	       JNIPATH="`readlink -f source/c`:/usr/lib/jni" \
 	       TZ=Europe/Zurich LC_ALL=C ; \
 	    find $$TESTSOURCEDIR/sourceTest/java -name '*.java' | xargs javac && \
-	    java -Xmx2048M -Djava.library.path="$$JNIPATH" org.testng.TestNG -verbose 2 sourceTest/java/tests.xml || true # FIXME: todo: 8 test suite failures - should be left for source-only upload
+	    java -Xmx2048M -Djava.library.path="$$JNIPATH" org.testng.TestNG -verbose 2 sourceTest/java/tests.xml
 	# These other tests have 3 failures.  I don't think they are expected to pass.
 	#cd sourceTest/java && \
 	#ln -s test/hdf5lib/h5ex_g_iterate.hdf . && \



View it on GitLab: https://salsa.debian.org/med-team/libsis-jhdf5-java/-/compare/5fe15c8303535a026c4d6c98e797ba2a68af90fb...804e2213da150999f424213b80763cce40a58acf

-- 
View it on GitLab: https://salsa.debian.org/med-team/libsis-jhdf5-java/-/compare/5fe15c8303535a026c4d6c98e797ba2a68af90fb...804e2213da150999f424213b80763cce40a58acf
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/20200921/4c298cc1/attachment-0001.html>