diff -Nru gdcm-2.8.4/debian/changelog gdcm-2.8.4/debian/changelog
--- gdcm-2.8.4/debian/changelog	2017-11-19 07:56:15.000000000 +0000
+++ gdcm-2.8.4/debian/changelog	2018-04-27 13:15:31.000000000 +0000
@@ -1,3 +1,12 @@
+gdcm (2.8.4-1+rpi1) buster-staging; urgency=medium
+
+  * Set up build-depends/conflicts to force openjdk 8 since building with
+    openjdk 9 is currently broken (works around debian bug 894371)
+  * Disable use_system_findjni.patch the system FindJNI.cmake can't
+    find non-default java.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 27 Apr 2018 13:15:31 +0000
+
 gdcm (2.8.4-1) unstable; urgency=medium
 
   * New upstream version 2.8.4
diff -Nru gdcm-2.8.4/debian/control gdcm-2.8.4/debian/control
--- gdcm-2.8.4/debian/control	2017-11-19 07:56:15.000000000 +0000
+++ gdcm-2.8.4/debian/control	2018-04-27 13:15:19.000000000 +0000
@@ -8,7 +8,7 @@
  Gert Wollny <gewo@debian.org> 
 Build-Depends: cmake (>= 2.8.9),
                debhelper (>= 9),
-	       default-jdk, 
+	       openjdk-8-jdk,
                dh-strip-nondeterminism, 
                dh-python, 
 	       python-all-dev,
@@ -39,7 +39,8 @@
 	       doxygen-latex,
 	       ghostscript, 
                graphviz
-Build-Conflicts: libopenjpeg-dev
+Build-Conflicts: libopenjpeg-dev,
+	         openjdk-9-jre-headless
 Standards-Version: 4.1.1
 X-Python-Version: 2.7
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/gdcm.git
diff -Nru gdcm-2.8.4/debian/patches/series gdcm-2.8.4/debian/patches/series
--- gdcm-2.8.4/debian/patches/series	2017-11-19 07:56:15.000000000 +0000
+++ gdcm-2.8.4/debian/patches/series	2018-04-27 13:15:31.000000000 +0000
@@ -1,5 +1,5 @@
 02_fixhurd.patch
 03_linkvtkdoc.patch
 04_multiarch.patch
-use_system_findjni.patch
+#use_system_findjni.patch
 unforce_cxx98.patch
diff -Nru gdcm-2.8.4/debian/rules gdcm-2.8.4/debian/rules
--- gdcm-2.8.4/debian/rules	2017-11-19 07:56:15.000000000 +0000
+++ gdcm-2.8.4/debian/rules	2018-04-27 13:15:31.000000000 +0000
@@ -8,6 +8,7 @@
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 # to please dpkg-shlibdeps and java private libs in /usr/lib/jni
 LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):/usr/lib/jni
@@ -159,3 +160,4 @@
 
 get-orig-source:
 	uscan --verbose --force-download --rename
+