[libreoffice] 02/11: Revert "use system libetonyek (LP: #1277152)"
This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-trusty-4.2
in repository libreoffice.
commit 4819e72033f79d08c59bbd86d53a48c4b022d137
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon Feb 10 16:58:53 2014 +0100
Revert "use system libetonyek (LP: #1277152)"
This reverts commit 2e18be99ffbcc4d60f38805ee94e813886bfa232.
Unfortunately libetonyek doesnt yet cleanly export symbols in this release.
see: https://bugs.launchpad.net/ubuntu/+source/libetonyek/+bug/1277152/comments/5
for the whole story
---
changelog | 3 +--
rules | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/changelog b/changelog
index 3c3590b..20caafb 100644
--- a/changelog
+++ b/changelog
@@ -4,9 +4,8 @@ libreoffice (1:4.2.0-0ubuntu1~trusty1) trusty; urgency=low
* there is no --with-system-xmlsec anymore
* suggest -style-sifr from -common
* use system mdds and libcmis again
- * use system libetonyek (LP: #1277152)
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 05 Feb 2014 15:50:13 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 10 Feb 2014 17:00:36 +0100
libreoffice (1:4.2.0~rc4-0ubuntu2~trusty1) trusty; urgency=low
diff --git a/rules b/rules
index b96475a..7b9917c 100755
--- a/rules
+++ b/rules
@@ -623,7 +623,7 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
USE_VLC:=n
#temp. hacks
ENABLE_EVO2:=n
- SYSTEM_STUFF := $(filter-out libodfgen libmwaw libfreehand libebook libeot, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libodfgen libmwaw libetonyek libfreehand libebook libeot, $(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: