[med-svn] [ncbi-vdb] 03/05: Remove oracle licensed files

[Andreas Tille]

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

tille pushed a commit to branch master
in repository ncbi-vdb.

commit 42cd5161399aa1b73f2a9adf71dfc954e91ddd09
Author: Andreas Tille <tille at debian.org>
Date:   Thu Aug 4 14:55:45 2016 +0200

    Remove oracle licensed files
---
 debian/control   | 3 ++-
 debian/copyright | 2 ++
 debian/rules     | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index bdd7e42..6c87f1b 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Build-Depends: debhelper (>= 9),
                libmagic-dev,
                libngs-sdk-dev (>= 1.2.4),
                libngs-java,
-               zlib1g-dev
+               zlib1g-dev,
+               default-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/copyright b/debian/copyright
index a740ccc..2c2dacd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,6 +12,8 @@ Files-Excluded: */ext
                 */mac/*
                 */sun/*
                 */win/*
+                */jni.h
+                */jni_md.h
 
 Files: *
 Copyright: © 2010-2016 National Center for Biotechnology Information
diff --git a/debian/rules b/debian/rules
index decc490..bef6471 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,6 +31,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
 	./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