[sikuli] 01/01: Workaround for OpenJDK 8

[Gilles Filippini]

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

pini pushed a commit to branch master
in repository sikuli.

commit a9fab32e891115cda5e5d3dc83a00a0e63a5f916
Author: Gilles Filippini <pini at debian.org>
Date:   Fri Mar 18 22:49:57 2016 +0100

    Workaround for OpenJDK 8
---
 debian/changelog | 9 +++++++++
 debian/control   | 6 +++---
 debian/rules     | 2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c7cf8f3..750433a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sikulix (1.1.0-1~exp3) experimental; urgency=medium
+
+  * debian/control: drop versioned Build-Depends on default-jdk (<< 2:1.8~)
+    because it is now the default.
+  * debian/rules: add -I$(JAVA_HOME)/include/linux to CPP_FLAGS to
+    workaround #760301.
+
+ -- Gilles Filippini <pini at debian.org>  Fri, 18 Mar 2016 22:49:10 +0100
+
 sikulix (1.1.0-1~exp2) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 73949cb..4a9a0bb 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: Gilles Filippini <pini at debian.org>
-Build-Depends: debhelper (>= 9~), cdbs, default-jdk (>= 2:1.7), default-jdk (<< 2:1.8~)
+Build-Depends: debhelper (>= 9~), cdbs, default-jdk (>= 2:1.7)
  , maven-debian-helper, libmaven-exec-plugin-java, libmaven-source-plugin-java
  , libmaven-javadoc-plugin-java, jython, jruby, swig
  , libopencv-dev, libtesseract-dev, libjxgrabkey-java, libcommons-cli-java
@@ -27,7 +27,7 @@ Package: sikulix
 Architecture: all
 Replaces: sikuli-ide (<< 1.1.0~)
 Breaks: sikuli-ide (<< 1.1.0~)
-Depends: ${maven:Depends}, ${misc:Depends}, default-jre (>= 2:1.6) | java6-runtime, libsikulixapi-java (= ${binary:Version}), libmac-widgets-java
+Depends: ${maven:Depends}, ${misc:Depends}, default-jre (>= 2:1.7) | java6-runtime, libsikulixapi-java (= ${binary:Version}), libmac-widgets-java
  , libjxgrabkey-java
 Description: IDE to develop SikuliX scripts
  SikuliX mixes image recognition into Jython or JRuby scripting to automate
@@ -43,7 +43,7 @@ Package: libsikulixapi-java
 Architecture: all
 Replaces: libsikuli-script-java (<< 1.1.0~)
 Breaks: libsikuli-script-java (<< 1.1.0~)
-Depends: ${maven:Depends}, ${misc:Depends}, default-jre (>= 2:1.6) | java6-runtime, libsikulixapi-jni (>= ${binary:Version}), libsikulixapi-jni (<< ${source:Version}+), jython, wmctrl, xdotool, tesseract-ocr-eng
+Depends: ${maven:Depends}, ${misc:Depends}, default-jre (>= 2:1.7) | java6-runtime, libsikulixapi-jni (>= ${binary:Version}), libsikulixapi-jni (<< ${source:Version}+), jython, wmctrl, xdotool, tesseract-ocr-eng
 # These ones miss maven integration
  , libcommons-exec-java, libopencv2.4-java
 # Hard coded because of #796933
diff --git a/debian/rules b/debian/rules
index d59657c..0792b78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/maven.mk
 
 # Honor dpkg-buildflags
-export CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
+export CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS) -I$(JAVA_HOME)/include/linux
 export CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
 export LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 

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