[med-svn] [Git][med-team/libsis-jhdf5-java][master] 4 commits: Fix homepage

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / libsis-jhdf5-java


Commits:
f6758315 by Andreas Tille at 2018-08-14T05:21:03Z
Fix homepage

- - - - -
13a053fd by Andreas Tille at 2018-08-14T06:54:54Z
Do not make wrong assumptions about directory name

- - - - -
273b90aa by Andreas Tille at 2018-08-14T07:15:04Z
Deactivate old overrides in favour of gradle build

- - - - -
c6a5fb6b by Andreas Tille at 2018-08-14T07:15:17Z
Build-Depends: ant

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/fix_build_dir.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ libsis-jhdf5-java (18.08~pre+git20180805.da55947+dfsg-1) UNRELEASED; urgency=med
   * Pre-release to adapt to HDF5 1.10.3-pre1
   * Use git mode in watch file
   * Drop now unneeded get-orig-source target
+  * Fix homepage
+  * Use gradle build system
+  * Build-Depends: ant
 
  -- Andreas Tille <tille at debian.org>  Mon, 13 Aug 2018 14:30:28 +0200
 


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,8 @@ Priority: optional
 Build-Depends: debhelper (>= 11~),
                default-jdk,
                javahelper,
+               gradle-debian-helper,
+               ant,
                libcommons-lang-java,
                libcommons-io-java,
                libsis-base-java,
@@ -18,7 +20,7 @@ Build-Depends: debhelper (>= 11~),
 Standards-Version: 4.1.4
 Vcs-Browser: https://salsa.debian.org/med-team/libsis-jhdf5-java
 Vcs-Git: https://salsa.debian.org/med-team/libsis-jhdf5-java.git
-Homepage: http://svnsis.ethz.ch/repos/cisd/jhdf5/tags/release/14.12.x/14.12.6/jhdf5/
+Homepage: https://sissource.ethz.ch/sispub/jhdf5
 
 Package: libsis-jhdf5-java
 Architecture: all


=====================================
debian/patches/fix_build_dir.patch
=====================================
--- /dev/null
+++ b/debian/patches/fix_build_dir.patch
@@ -0,0 +1,15 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Mon, 13 Aug 2018 14:30:28 +0200
+Description: Do not make wrong assumptions about directory name
+
+--- a/javaproject.gradle
++++ b/javaproject.gradle
+@@ -50,7 +50,7 @@ sourceSets {
+ buildDir = 'targets/gradle'
+ 
+ buildscript {
+-    apply from: '../jhdf5/repository.gradle'
++    apply from: 'repository.gradle'
+     
+     repositories repositoryConfig
+     


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
-fix_dodgy_cast.patch
-remove_ch_rinn_imports.patch
-load_native_debian.patch
+# fix_dodgy_cast.patch
+# remove_ch_rinn_imports.patch
+# load_native_debian.patch
+fix_build_dir.patch


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -17,9 +17,9 @@ TESTIGNORE = sourceTest/java/ch/systemsx/cisd/hdf5/HDF5RoundtripTest.java \
              sourceTest/java/ch/systemsx/cisd/hdf5/io/HDF5DataSetRandomAccessFileTest.java
 
 %:
-	dh $@ --with javahelper
+	dh $@ --buildsystem=gradle --with javahelper
 
-override_dh_auto_clean:
+_override_dh_auto_clean:
 	rm -rf build *.jar
 	rm -rf source/c/*.log
 	rm -rf source/c/*.so
@@ -31,7 +31,7 @@ override_dh_auto_clean:
 	#Things that we'd probably exclude from the orig.tar.gz anyway
 	rm -rf jsrc lib ./sourceTest/java/jni
 
-override_dh_auto_build:
+_override_dh_auto_build:
 	# C build
 	cd source/c && \
 		$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)  -shared -fPIC -Wl,--exclude-libs,ALL \
@@ -43,7 +43,7 @@ override_dh_auto_build:
 	# This line is still needed on Ubuntu 14.04
 	jh_build sis-jhdf5.jar jsrc
 
-override_dh_auto_test:
+_override_dh_auto_test:
 	# FIXME
 	# Due to bug #842815 several tests are failing
 	# To get at least some installable package these tests are ignored here



View it on GitLab: https://salsa.debian.org/med-team/libsis-jhdf5-java/compare/bcddec730da48579c6f5aabe8e8e0d90abc25fa2...c6a5fb6bddecaa02f5cec6159817ac28e085e9da

-- 
View it on GitLab: https://salsa.debian.org/med-team/libsis-jhdf5-java/compare/bcddec730da48579c6f5aabe8e8e0d90abc25fa2...c6a5fb6bddecaa02f5cec6159817ac28e085e9da
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/20180814/7eaf196f/attachment-0001.html>