diff -Nru libsis-jhdf5-java-14.12.1/debian/changelog libsis-jhdf5-java-14.12.1/debian/changelog
--- libsis-jhdf5-java-14.12.1/debian/changelog	2015-11-04 12:43:45.000000000 +0000
+++ libsis-jhdf5-java-14.12.1/debian/changelog	2016-02-18 08:22:51.000000000 +0000
@@ -1,3 +1,12 @@
+libsis-jhdf5-java (14.12.1-2) unstable; urgency=medium
+
+  * Use /usr/share/java/java_defaults.mk to adapt to correct include options
+    for new default-jdk (openjdk-8-jdk)
+    Closes: #814875
+  * cme fix dpkg-control
+
+ -- Andreas Tille <tille@debian.org>  Tue, 16 Feb 2016 13:31:21 +0100
+
 libsis-jhdf5-java (14.12.1-1) unstable; urgency=medium
 
   * [ Team upload ]
diff -Nru libsis-jhdf5-java-14.12.1/debian/control libsis-jhdf5-java-14.12.1/debian/control
--- libsis-jhdf5-java-14.12.1/debian/control	2015-11-23 10:28:59.000000000 +0000
+++ libsis-jhdf5-java-14.12.1/debian/control	2016-02-18 08:22:51.000000000 +0000
@@ -1,27 +1,31 @@
 Source: libsis-jhdf5-java
-Section: java
-Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
 Uploaders: Tim Booth <tbooth@ceh.ac.uk>,
-           Olivier Sallou <osallou@debian.org>
-Build-Depends: debhelper (>= 9), default-jdk, javahelper,
+           Olivier Sallou <osallou@debian.org>,
+           Andreas Tille <tille@debian.org>
+Section: java
+Priority: optional
+Build-Depends: debhelper (>= 9),
+               default-jdk,
+               javahelper,
                libcommons-lang-java,
                libcommons-io-java,
                libsis-base-java,
-               libhdf5-dev ( >> 1.8.13),
+               libhdf5-dev (>> 1.8.13),
                junit4,
                testng,
                libjmock2-java
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/libsis-jhdf5-java.git
+Vcs-Git: https://anonscm.debian.org/git/debian-med/libsis-jhdf5-java.git
 Homepage: http://svncisd.ethz.ch/repos/cisd/jhdf5/tags/release/14.12.x/14.12.1/jhdf5
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-med/libsis-jhdf5-java.git
-Vcs-Git: git://anonscm.debian.org/debian-med/libsis-jhdf5-java.git
-
 
 Package: libsis-jhdf5-java
 Architecture: all
-Depends: ${misc:Depends}, ${java:Depends},
-         libsis-jhdf5-jni (>= ${binary:Version}), libsis-jhdf5-jni (<< ${source:Version}.1~)
+Depends: ${misc:Depends},
+         ${java:Depends},
+         libsis-jhdf5-jni (>= ${binary:Version}),
+         libsis-jhdf5-jni (<< ${source:Version}.1~)
 Description: easy-to-use HDF library for Java
  JHDF5 is a Java binding to the HDF Group library for HDF5 focusing on
  ease-of-use, which was developed by CISD and is now maintained by ETH SIS.
@@ -30,6 +34,7 @@
 
 Package: libsis-jhdf5-jni
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
 Description: native libs used by libsis-jhdf5-java package
  This package is only useful with libsis-jhdf5-java.
diff -Nru libsis-jhdf5-java-14.12.1/debian/rules libsis-jhdf5-java-14.12.1/debian/rules
--- libsis-jhdf5-java-14.12.1/debian/rules	2015-08-21 16:19:50.000000000 +0000
+++ libsis-jhdf5-java-14.12.1/debian/rules	2016-02-18 08:22:51.000000000 +0000
@@ -8,7 +8,9 @@
 
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
+include /usr/share/java/java_defaults.mk
 
+CPPFLAGS += ${jvm_includes}
 
 %:
 	dh $@ --with javahelper