[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 05/06: use system cmis and mdds again



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 5dcc5d2b743234aa20bd1d91de3becd86695484a
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Wed Feb 5 15:50:54 2014 +0100

    use system cmis and mdds again
---
 changelog | 3 ++-
 rules     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 3598245..97404d4 100644
--- a/changelog
+++ b/changelog
@@ -3,8 +3,9 @@ libreoffice (1:4.2.0-0ubuntu1~trusty1) trusty; urgency=low
   * upstream final release, recreate tarballs
   * there is no --with-system-xmlsec anymore
   * suggest -style-sifr from -common
+  * use system mdds and libcmis again
 
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Wed, 05 Feb 2014 13:44:59 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Wed, 05 Feb 2014 15:50:13 +0100
 
 libreoffice (1:4.2.0~rc4-0ubuntu2~trusty1) trusty; urgency=low
 
diff --git a/rules b/rules
index 2be1063..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 libcmis mdds libodfgen libmwaw libetonyek 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: