[SCM] libbluray/master: Fix -arch/-indep rule split

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9b74ae598de116e417b5bc5f10f681f7cb77921d
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed May 18 02:28:01 2016 +0200

    Fix -arch/-indep rule split

diff --git a/debian/libbluray-bdj.install b/debian/libbluray-bdj.install
index 4d640f5..f1d0eef 100644
--- a/debian/libbluray-bdj.install
+++ b/debian/libbluray-bdj.install
@@ -1 +1 @@
-usr/share/java/libbluray-*.jar
+.libs/libbluray-*.jar usr/share/java
diff --git a/debian/rules b/debian/rules
index dd34467..25e617f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,7 @@
 
 confflags = --with-libxml2 --with-freetype \
 	--enable-bdjava --with-bdj-type=j2se \
-	--enable-udf \
-	--disable-silent-rules
+	--enable-udf
 confflags_java = --enable-bdjava-jar
 confflags_nojava = --disable-bdjava-jar
 
@@ -24,14 +23,15 @@ else
 endif
 
 override_dh_auto_build-indep:
-	make doxygen-doc
+	# all-local builds the JAR
+	$(MAKE) doxygen-doc all-local
+
+# no test/install for indep
+override_dh_auto_test-indep override_dh_auto_install-indep:
 
 override_dh_installdocs:
 	dh_installdocs --exclude=jquery.js
 
-override_dh_install:
-	dh_install -X.la --fail-missing
-
 override_dh_clean:
 	dh_clean
 	rm -rf src/libbluray/bdj/build

-- 
libbluray packaging