[med-svn] [htsjdk] 06/06: Seems htsjdk needs Open JDK 8 ... trying - but failed. :-(

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository htsjdk.

commit cf96fea61b5e5a898dac692552023d27ddb0bcfc
Author: Andreas Tille <tille at debian.org>
Date:   Sat Dec 19 22:21:57 2015 +0100

    Seems htsjdk needs Open JDK 8 ... trying  - but failed. :-(
---
 debian/control | 6 ++++--
 debian/rules   | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 1e3c844..d01b179 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,8 @@ Uploaders: Charles Plessy <plessy at debian.org>,
 Section: science
 Priority: optional
 Build-Depends: ant,
-               default-jdk,
+               openjdk-8-jre-headless,
+               openjdk-8-jdk,
                javahelper,
                debhelper (>= 9),
                testng,
@@ -16,10 +17,11 @@ Build-Depends: ant,
                libcommons-jexl2-java,
                libcommons-compress-java,
 # required for correct dependencies for -doc
-               default-jdk-doc,
+               openjdk-8-doc,
 # required for tests:
                libjcommander-java,
                ant-optional,
+Build-Conflicts: openjdk-7-jre-headless
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-med/libhtsjdk-java.git
 Vcs-Git: git://anonscm.debian.org/debian-med/libhtsjdk-java.git
diff --git a/debian/rules b/debian/rules
index 6e18088..671b9db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,15 +15,15 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
 	dh_auto_build -- \
-		-Dant.build.javac.source=1.5 \
-		-Dant.build.javac.target=1.5 \
+		-Dant.build.javac.source=1.8 \
+		-Dant.build.javac.target=1.8 \
 		-Ddebug=true \
 		htsjdk-jar javadoc
 
 override_dh_auto_test:
 	dh_auto_build -- \
-		-Dant.build.javac.source=1.5 \
-		-Dant.build.javac.target=1.5 \
+		-Dant.build.javac.source=1.8 \
+		-Dant.build.javac.target=1.8 \
 		-Ddebug=true \
 		test
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/htsjdk.git