[SCM] libbluray/master: Demote javahelper to B-D-I

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c1a2be2ebe0cd8f66512f10769618e153dddfefb
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Thu Nov 10 20:47:33 2016 +0100

    Demote javahelper to B-D-I
    
    Closes: #841711

diff --git a/debian/control b/debian/control
index 72b8173..048bb33 100644
--- a/debian/control
+++ b/debian/control
@@ -9,13 +9,13 @@ Uploaders:
 Build-Depends: debhelper (>= 10),
                pkg-config,
                default-jdk,
-               javahelper,
                libfreetype6-dev,
                libfontconfig-dev,
                libxml2-dev
 Build-Depends-Indep: ant,
                      doxygen,
                      graphviz,
+                     javahelper,
                      texlive-latex-base,
                      texlive-latex-recommended,
                      texlive-latex-extra,
diff --git a/debian/rules b/debian/rules
index 9de0160..cbe7488 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,12 @@ ifeq (,$(wildcard $(JDK_HOME)))
     $(info "warning: No suitable jni.h was found. Package will most probably FTBFS!")
 endif
 
+ifneq (,$(wildcard /usr/share/javahelper/java-vars.mk))
+DH_ADDONS = --with javahelper
+endif
+
 %:
-	dh $@ --with javahelper
+	dh $@ $(DH_ADDONS)
 
 override_dh_auto_configure:
 ifneq (,$(findstring libbluray-bdj,$(shell dh_listpackages)))

-- 
libbluray packaging