[jpathwatch] 02/03: Fixed the build failure with OpenJDK 8 (Closes: #814146)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository jpathwatch.

commit 9b116003e98fb5a42273ad6b55ca9d8a73a2f2c9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Feb 8 22:28:25 2016 +0100

    Fixed the build failure with OpenJDK 8 (Closes: #814146)
---
 debian/Makefile.jni | 4 +++-
 debian/changelog    | 1 +
 debian/control      | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/Makefile.jni b/debian/Makefile.jni
index 11ba1b9..783c29d 100644
--- a/debian/Makefile.jni
+++ b/debian/Makefile.jni
@@ -1,6 +1,8 @@
 JNI_LIB = libjpathwatch-native.so
 
-CPPFLAGS += -fPIC -I/usr/lib/jvm/default-java/include
+include /usr/share/java/java_defaults.mk
+
+CPPFLAGS += -fPIC ${jvm_includes}
 
 # Object Files
 OBJECTFILES= \
diff --git a/debian/changelog b/debian/changelog
index 17badfa..6c2a11e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jpathwatch (0.95-4) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Fixed the build failure with OpenJDK 8 (Closes: #814146)
   * Standards-Version updated to 3.9.7 (no changes)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 08 Feb 2016 21:37:34 +0100
diff --git a/debian/control b/debian/control
index 1edf68d..8411c87 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: extra
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Jakub Adam <jakub.adam at ktknet.cz>
-Build-Depends: debhelper (>=9), javahelper, default-jdk, bnd (>= 2.1.0), maven-repo-helper
+Build-Depends: debhelper (>=9), javahelper, default-jdk (>= 2:1.8), bnd (>= 2.1.0), maven-repo-helper
 Standards-Version: 3.9.7
 Homepage: http://jpathwatch.wordpress.com
 Vcs-Git: git://anonscm.debian.org/pkg-java/jpathwatch.git

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jpathwatch.git