[med-svn] [ncbi-vdb] 02/02: s/default-jdk-headless/openjdk-8-jdk-headless/ since there is no default-jdk-headless in Jessie

[Andreas Tille]

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

tille pushed a commit to branch debian/jessie-backports
in repository ncbi-vdb.

commit dd29988d1a6f72d601179b5c39ded0708a7bdc14
Author: Andreas Tille <tille at debian.org>
Date:   Fri Sep 9 08:52:38 2016 +0200

    s/default-jdk-headless/openjdk-8-jdk-headless/ since there is no default-jdk-headless in Jessie
---
 debian/changelog | 2 ++
 debian/control   | 2 +-
 debian/rules     | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fbf8d51..d00ae22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ncbi-vdb (2.7.0+dfsg-4~bpo8+1) jessie-backports; urgency=medium
 
   * Rebuild for jessie-backports.
+  * s/default-jdk-headless/openjdk-8-jdk-headless/ since there is no
+    default-jdk-headless in Jessie
 
  -- Andreas Tille <tille at debian.org>  Fri, 09 Sep 2016 08:49:08 +0200
 
diff --git a/debian/control b/debian/control
index 6c87f1b..29f04fd 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 9),
                libngs-sdk-dev (>= 1.2.4),
                libngs-java,
                zlib1g-dev,
-               default-jdk-headless
+               openjdk-8-jdk-headless
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/ncbi-vdb.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/ncbi-vdb.git
diff --git a/debian/rules b/debian/rules
index 3e2f46d..8cb9544 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,8 +32,8 @@ override_dh_auto_configure:
 	# The build system shamelessly ignores those options like
 	#    --with-ngs-java-prefix=/usr/share/java
 	# so we need to go with patches.  The options are specified anyway.
-	ln -s /usr/lib/jvm/default-java/include/jni.h		libs/ngs-jni
-	ln -s /usr/lib/jvm/default-java/include/linux/jni_md.h	libs/ngs-jni
+	ln -s /usr/lib/jvm/java-8-openjdk-*/include/jni.h		libs/ngs-jni
+	ln -s /usr/lib/jvm/java-8-openjdk-*/include/linux/jni_md.h	libs/ngs-jni
 	./configure --build=$(BUILDTYPE) --prefix=/usr --build-prefix=$(CURDIR)/debian/tmp/usr --with-ngs-sdk-prefix=/usr --with-debug --with-ngs-java-prefix=/usr/share/java
 	# no idea how to convince configure script to use the correct include dir so patching result afterwards
 	sed -i 's?HDF5_INCDIR = /usr/include?&/hdf5/serial?' build/Makefile.config*

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