Andreas Tille pushed to branch master at Debian Med / libsis-jhdf5-java
Commits: 45dfaad8 by Andreas Tille at 2018-09-26T11:18:38Z DEP3 - - - - - 44f5238d by Andreas Tille at 2018-09-26T11:18:50Z Fix installation - - - - - 4bbc9063 by Andreas Tille at 2018-09-26T11:22:52Z Fix JAR version number - - - - - 61e43b7c by Andreas Tille at 2018-09-26T11:27:40Z Fix copyright - - - - - 3a498af7 by Andreas Tille at 2018-09-26T11:28:10Z Standards-Version: 4.2.1 - - - - - 9 changed files: - debian/changelog - debian/control - debian/copyright - + debian/libsis-jhdf5-java.install - debian/libsis-jhdf5-java.jlibs - debian/libsis-jhdf5-java.manifest - debian/libsis-jhdf5-jni.install - debian/patches/use_debian_packaged_libs.patch - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -7,6 +7,7 @@ libsis-jhdf5-java (18.09.0~pre1+git20180925.eb8733c+dfsg-1) UNRELEASED; urgency= * Use gradle build system * Build-Depends: ant * Versioned Build-Depends: libsis-base-java (>= 18.08.0~) + * Standards-Version: 4.2.1 -- Andreas Tille <[email protected]> Mon, 13 Aug 2018 14:30:28 +0200 ===================================== debian/control ===================================== @@ -22,7 +22,7 @@ Build-Depends: debhelper (>= 11~), libhamcrest-java, libjmock2-java, libobjenesis-java -Standards-Version: 4.1.4 +Standards-Version: 4.2.1 Vcs-Browser: https://salsa.debian.org/med-team/libsis-jhdf5-java Vcs-Git: https://salsa.debian.org/med-team/libsis-jhdf5-java.git Homepage: https://sissource.ethz.ch/sispub/jhdf5 ===================================== debian/copyright ===================================== @@ -6,18 +6,11 @@ Source: http://svnsis.ethz.ch/repos/cisd/jhdf5/tags/release/ Files-Excluded: */native */*.jar -Files: * -Copyright: Copyright (C) The HDF Group. - Copyright (C) the Board of Trustees of the University of Illinois -License: Apache - -Files: source/java/ch/* - sourceTest/* -Copyright: Copyright (C) Copyright 2007-2016 ETH Zuerich, CISD +Files: * +Copyright: 2007-2018 ETH Zuerich, CISD License: Apache -Files: source/c/hdf-java/* - source/java/ncsa/hdf/hdf5lib/* +Files: source/java/hdf/hdf5lib/* Copyright: Copyright (C) The HDF Group. Copyright (C) the Board of Trustees of the University of Illinois License: HDF @@ -89,7 +82,7 @@ License: Apache Files: debian/* Copyright: 2015 Tim Booth <[email protected]> 2015 Olivier Sallou <[email protected]> - 2016 Andreas Tille <[email protected]> + 2016-2018 Andreas Tille <[email protected]> License: GPL-3 On Debian systems, the full text of the GNU General Public License version 3 can be found in the file ===================================== debian/libsis-jhdf5-java.install ===================================== @@ -0,0 +1 @@ +dist/bin/h5ar usr/bin ===================================== debian/libsis-jhdf5-java.jlibs ===================================== @@ -1 +1 @@ -sis-jhdf5.jar +targets/gradle/libs/sis-jhdf5.jar ===================================== debian/libsis-jhdf5-java.manifest ===================================== @@ -1,2 +1,2 @@ usr/share/java/sis-jhdf5.jar: - Class-Path: commons-lang.jar commons-io.jar sis-base.jar + Class-Path: commons-lang3.jar commons-io.jar sis-base.jar args4j.jar ===================================== debian/libsis-jhdf5-jni.install ===================================== @@ -1 +1 @@ -source/c/*.so /usr/lib/jni +# source/c/*.so /usr/lib/jni ===================================== debian/patches/use_debian_packaged_libs.patch ===================================== @@ -1,3 +1,7 @@ +Author: Andreas Tille <[email protected]> +Last-Update: Mon, 13 Aug 2018 14:30:28 +0200 +Description: Use Debian packaged jars + --- a/.classpath +++ b/.classpath @@ -4,18 +4,18 @@ ===================================== debian/rules ===================================== @@ -18,6 +18,10 @@ TESTIGNORE = sourceTest/java/ch/systemsx/cisd/hdf5/HDF5RoundtripTest.java \ %: dh $@ --with javahelper --buildsystem=gradle +override_jh_installlibs: + mv targets/gradle/libs/sis-jhdf5-1.jar targets/gradle/libs/sis-jhdf5.jar + jh_installlibs --version-strip='[~pre1]*[+]git[.0-9a-f]*[+]dfsg[.0-9]*' + _override_dh_auto_clean: rm -rf build *.jar rm -rf source/c/*.log @@ -65,7 +69,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) #ln -s test/hdf5lib/h5ex_g_iterate.hdf . && \ #java -Xmx2048M -Djava.library.path="$$JNIPATH" org.junit.runner.JUnitCore test.hdf5lib.TestAll - # FIXME: Second part of hacking around bug #842815 + # Second part of hacking around bug #842815 mv debian/tmptestignore/* sourceTest/java/test/hdf5lib rmdir debian/tmptestignore endif View it on GitLab: https://salsa.debian.org/med-team/libsis-jhdf5-java/compare/d62cb20a48a694840d4c2313fc1c88420ab26639...3a498af724ed02eab695c14d414a9f461c2ec466 -- View it on GitLab: https://salsa.debian.org/med-team/libsis-jhdf5-java/compare/d62cb20a48a694840d4c2313fc1c88420ab26639...3a498af724ed02eab695c14d414a9f461c2ec466 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
