[libreoffice] 10/20: use internal libeot for now and ubuntufy version
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 9f42e9a26e7115a41a97df3d45ff3cee6facfd50
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Dec 19 19:26:01 2013 +0100
use internal libeot for now and ubuntufy version
---
changelog | 6 ++++++
rules | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index c29c89e..4925bdd 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:4.2.0~rc1-0ubuntu1) trusty; urgency=low
+
+ * first upstream rc
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 19 Dec 2013 18:27:23 +0100
+
libreoffice (1:4.2.0~rc1-1) UNRELEASED; urgency=low
* new upstream release candidate
diff --git a/rules b/rules
index 514a22a..bf9a0db 100755
--- a/rules
+++ b/rules
@@ -624,7 +624,7 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
USE_VLC:=n
#temp. hacks
ENABLE_EVO2:=n
- SYSTEM_STUFF := $(filter-out libcmis mdds libodfgen libmwaw libetonyek libfreehand libebook lpsolve, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libcmis mdds libodfgen libmwaw libetonyek libfreehand libebook lpsolve 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: