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

[libreoffice] 07/19: use system cdr wpd wpg wps visio mspub revenge glew glm



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

sweetshark-guest pushed a commit to branch ubuntu-utopic-4.3
in repository libreoffice.

commit 4f1bcb7cf13769a795c9d438b547f7f4db054733
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Mon Jul 28 00:24:17 2014 +0200

    use system cdr wpd wpg wps visio mspub revenge glew glm
---
 changelog | 7 +++++++
 rules     | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 5a40896..72ea628 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:4.3.0~rc4-0ubuntu1~utopic2) utopic; urgency=medium
+
+  *  use system cdr wpd wpg wps visio mspub revenge glew glm as they are now
+     available
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Tue, 29 Jul 2014 14:30:27 +0200
+
 libreoffice (1:4.3.0~rc4-0ubuntu1~utopic1) utopic; urgency=medium
 
   * new upstream rc
diff --git a/rules b/rules
index 94b326e..36048a2 100755
--- a/rules
+++ b/rules
@@ -659,8 +659,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 glew glm librevenge orcus, $(SYSTEM_STUFF))
-  SYSTEM_STUFF := $(filter-out libcdr libwpd libwpg libwps libvisio libmspub, $(SYSTEM_STUFF))
+  SYSTEM_STUFF := $(filter-out mdds orcus, $(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: