[med-svn] [ngs-sdk] 02/02: use debian jni

[Olivier Sallou]

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

osallou pushed a commit to branch master
in repository ngs-sdk.

commit 66bcb34cc00befd7536c14925f703b47648770ca
Author: Olivier Sallou <olivier.sallou at debian.org>
Date:   Mon Feb 1 10:06:32 2016 +0100

    use debian jni
---
 debian/copyright             | 28 ++++++++++++++++++++++++++++
 debian/patches/fix_jni.patch | 38 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series        |  1 +
 3 files changed, 67 insertions(+)

diff --git a/debian/copyright b/debian/copyright
index 277576a..681b057 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,34 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ngs
 Source: https://github.com/ncbi/ngs/releases
 
+Files: ngs-sdk/language/java/jni.h
+       ngs-sdk/language/java/jni_md.h
+Copyright: 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+License: GPL-2
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.  Oracle designates this
+ particular file as subject to the "Classpath" exception as provided
+ by Oracle in the LICENSE file that accompanied this code.
+ .
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+ .
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+ .
+ We used part of Netscape's Java Runtime Interface (JRI) as the starting
+ point of our design and implementation.
+  
+
 Files: *
 Copyright: © 2010-2015 National Center for Biotechnology Information
 License: public_domain
diff --git a/debian/patches/fix_jni.patch b/debian/patches/fix_jni.patch
new file mode 100644
index 0000000..43b9125
--- /dev/null
+++ b/debian/patches/fix_jni.patch
@@ -0,0 +1,38 @@
+Subject: use jni from Debian
+Description: software embeds some jni code, use code from Debian
+Author: Olivier Sallou <osallou at debian.org>
+Last-Updated: 02/01/2016
+Forwarded: no
+--- a/ngs-sdk/language/java/jni.h
++++ b/ngs-sdk/language/java/jni.h
+@@ -24,7 +24,7 @@
+ /* jni_md.h contains the machine-dependent typedefs for jbyte, jint
+    and jlong */
+ 
+-#include "jni_md.h"
++#include <jni_md.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {
+--- a/ngs-sdk/language/java/jni_ErrorMsg.hpp
++++ b/ngs-sdk/language/java/jni_ErrorMsg.hpp
+@@ -31,7 +31,7 @@
+ #include <ngs/itf/ErrBlock.h>
+ #endif
+ 
+-#include "jni.h"
++#include <jni.h>
+ 
+ 
+ /*--------------------------------------------------------------------------
+--- a/ngs-sdk/language/java/jni_String.hpp
++++ b/ngs-sdk/language/java/jni_String.hpp
+@@ -31,7 +31,7 @@
+ #include <ngs/itf/defs.h>
+ #endif
+ 
+-#include "jni.h"
++#include <jni.h>
+ 
+ #include <stdarg.h>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..c4db467 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_jni.patch

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