[libreoffice] 01/02: graphite isn't optional anymore

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.

commit d73e29213c6806271353f83962b1cb87096d6d7d
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Oct 19 23:31:26 2016 +0200

    graphite isn't optional anymore
---
 changelog | 2 +-
 rules     | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/changelog b/changelog
index c8f9e68..32ff3b2 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.3.0~alpha0~git20161016-1) UNRELEASED; urgency=medium
+libreoffice (1:5.3.0~alpha0~git20161018-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot 
     - fixes typo in VCL.xcu; s/Tino/Tinos/ (closes: #834580)
diff --git a/rules b/rules
index 8cd18a5..6c4339e 100755
--- a/rules
+++ b/rules
@@ -396,7 +396,6 @@ ENABLE_GIO=y
 ENABLE_DCONF=y
 ENABLE_RANDR=y
 PACKAGE_BASE=y
-ENABLE_GRAPHITE=y
 SYSTEM_STUFF += graphite
 SYSTEM_STUFF += harfbuzz
 ALLOC=system
@@ -763,12 +762,8 @@ endif
 
 	BUILD_DEPS += , libpoppler-dev (>= 0.12.0), libpoppler-private-dev, libpoppler-cpp-dev
 
-ifeq "$(ENABLE_GRAPHITE)" "y"
-  ifneq (,$(filter graphite, $(SYSTEM_STUFF)))
+ifneq (,$(filter graphite, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libgraphite2-dev (>= 0.9.3)
-  endif
-else
-	CONFIGURE_FLAGS += --disable-graphite
 endif
 
 ifneq (,$(filter harfbuzz, $(SYSTEM_STUFF)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git