[SCM] libbluray/master: Disable JAR builds if not required

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Wed May 18 00:35:21 UTC 2016


The following commit has been merged in the master branch:
commit 2342b72ecd8e44d9a441f200cb867c585471a2c1
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed May 18 02:14:11 2016 +0200

    Disable JAR builds if not required

diff --git a/debian/changelog b/debian/changelog
index ef9798b..fc0f86d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libbluray (1:0.9.3-2) unstable; urgency=medium
+
+  * debian/rules: Explicitly disable JAR builds if not required.
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Wed, 18 May 2016 02:13:39 +0200
+
 libbluray (1:0.9.3-1) unstable; urgency=medium
 
   [ Alessio Treglia ]
diff --git a/debian/rules b/debian/rules
index f9d917b..dd34467 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@ confflags = --with-libxml2 --with-freetype \
 	--enable-udf \
 	--disable-silent-rules
 confflags_java = --enable-bdjava-jar
+confflags_nojava = --disable-bdjava-jar
 
 # Use default java implementation
 export JDK_HOME=/usr/lib/jvm/default-java
@@ -19,7 +20,7 @@ override_dh_auto_configure:
 ifneq (,$(findstring libbluray-bdj,$(shell dh_listpackages)))
 	dh_auto_configure -- $(confflags) $(confflags_java)
 else
-	dh_auto_configure -- $(confflags)
+	dh_auto_configure -- $(confflags) $(confflags_nojava)
 endif
 
 override_dh_auto_build-indep:

-- 
libbluray packaging



More information about the pkg-multimedia-commits mailing list