[SCM] libbluray/master: Add build-dep on libfreetype6-dev and pass more explicit confflags

[ricotz-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f996e489c43307bab87b5a530dcc38a06a70ef73
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Thu May 23 21:08:01 2013 +0200

    Add build-dep on libfreetype6-dev and pass more explicit confflags

diff --git a/debian/changelog b/debian/changelog
index a760f9b..0c37a8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,8 +27,10 @@ libbluray (1:0.3.0+git20130511.8c321835-1) unstable; urgency=low
   * debian/control,libbluray-bin:
     - Install /usr/bin/bd_info
     - Add explicit build-dep on pkg-config (Closes: #688578)
+    - Add build-dep on libfreetype6-dev
   * debian/rules:
     - Use --fail-missing
+    - Pass --with-libxml2, --with-bdj-type=j2se and --with-freetype
 
  -- Rico Tzschichholz <ricotz at ubuntu.com>  Sat, 11 May 2013 08:57:25 +0200
 
diff --git a/debian/control b/debian/control
index af972af..ad85214 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 8.1.3~),
                javahelper,
                default-jdk [linux-any],
                ant,
+               libfreetype6-dev,
                libxml2-dev,
                doxygen,
                texlive-latex-base,
diff --git a/debian/rules b/debian/rules
index 3d39c86..ccbf3a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-confflags := --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) --enable-doxygen-doc
+confflags := --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) --enable-doxygen-doc --with-libxml2
 
 # enable bdjava on linux hosts only
 ifneq (,$(findstring linux,$(DEB_BUILD_ARCH_OS)))
@@ -16,7 +16,7 @@ ifeq (,$(wildcard $(JAVA_HOME)))
 endif
 
 $(info Located java at $(JAVA_HOME))
-confflags += --enable-bdjava --with-jdk=$(JAVA_HOME)
+confflags += --enable-bdjava --with-bdj-type=j2se --with-jdk=$(JAVA_HOME) --with-freetype
 endif
 
 # Set CFLAGS to DEB_CFLAGS

-- 
libbluray packaging