[SCM] libbluray/master: enable bdjava on linux hosts only, Closes: #638222

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 337e5832caec67703d925a34b0b244dbb7a453bd
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Aug 18 19:48:58 2011 +0200

    enable bdjava on linux hosts only, Closes: #638222

diff --git a/debian/control b/debian/control
index 7cf51fa..e925631 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Andres Mejia <amejia at debian.org>,
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~),
                javahelper,
-               default-jdk,
+               openjdk-6-jdk [linux-any],
                ant,
                libxml2-dev,
                doxygen,
@@ -56,7 +56,7 @@ Description: Blu-ray disc playback support library (shared library)
  This package provides the shared library.
 
 Package: libbluray-bdj
-Architecture: all
+Architecture: linux-any
 Depends: libbluray1 (>= ${source:Version}),
          libbluray1 (<< ${source:Version}.1~),
          default-jre-headless | java2-runtime-headless,
diff --git a/debian/rules b/debian/rules
index 26d9836..97b92ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,14 @@
 #!/usr/bin/make -f
 
-export JAVA_HOME=/usr/lib/jvm/default-java
+export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+export DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+
+confflags := --enable-doxygen-doc
+
+# enable bdjava on linux hosts only
+ifneq (,$(findstring linux,$(DEB_BUILD_ARCH_OS)))
+confflags += --enable-bdjava
+endif
 
 # Set CFLAGS to DEB_CFLAGS
 CFLAGS=$(DEB_CFLAGS)
@@ -9,7 +17,7 @@ CFLAGS=$(DEB_CFLAGS)
 	dh --with javahelper,autoreconf $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-bdjava --enable-doxygen-doc
+	dh_auto_configure -- $(confflags)
 
 override_dh_auto_build:
 	dh_auto_build

-- 
libbluray packaging