[libreoffice] 10/12: tweak deps for beta: coinmp ucpp
This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-vivid-4.4
in repository libreoffice.
commit 0ba44e8fb720db8e63a289edf3b997d9445c7abd
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Nov 25 13:15:29 2014 +0100
tweak deps for beta: coinmp ucpp
---
rules | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/rules b/rules
index bbdfecf..64b7620 100755
--- a/rules
+++ b/rules
@@ -647,6 +647,7 @@ 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)
@@ -668,7 +669,7 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
#temp. hacks
ENABLE_EVO2:=n
SYSTEM_STUFF := $(filter-out libodfgen libmwaw libetonyek libfreehand libebook libeot libabw, $(SYSTEM_STUFF))
- SYSTEM_STUFF := $(filter-out mdds orcus libgltf, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out mdds orcus libgltf coinmp, $(SYSTEM_STUFF))
ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
ENABLE_HELP=n
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: