[libreoffice] 34/152: lp#1524638: use bundled ucpp for now (would need MIR)

[Rene Engelhard]

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

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit 9e2b6e012c3469ee4c9c43c0d2538590aa3461c5
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Jan 26 17:40:31 2016 +0100

    lp#1524638: use bundled ucpp for now (would need MIR)
---
 rules | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rules b/rules
index aadac2c..cca2cf5 100755
--- a/rules
+++ b/rules
@@ -717,7 +717,6 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
   IMAGES+=human
   CONFIGURE_FLAGS_INDEP+= --with-theme="$(IMAGES)"
   ENABLE_FIREBIRD=n
-  USE_UCPP=n
   # lp#1034560: MIR troubles make it easier to use internal jfreereport
   SYSTEM_STUFF := $(filter-out jfreereport npapi-headers, $(SYSTEM_STUFF))
   ifeq ($(shell echo "$(DEB_VERSION)" | grep -c ppa),1)
@@ -739,7 +738,7 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
   #temp. hacks
   ENABLE_EVO2:=n
   #SYSTEM_STUFF := $(filter-out orcus, $(SYSTEM_STUFF))
-  SYSTEM_STUFF := $(filter-out libmwaw libwpd libwpg libwps lpsolve, $(SYSTEM_STUFF))
+  SYSTEM_STUFF := $(filter-out ucpp libmwaw libwpd libwpg libwps lpsolve, $(SYSTEM_STUFF))
 
   ENABLE_COLLADA := n
   ENABLE_GLTF := n

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