[libreoffice] 01/16: use system libwps, libcmis, cppunit
This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to tag libreoffice_5.0.2-0ubuntu1
in repository libreoffice.
commit 8978b7a54b0ac4078e7842bc694800e63e271ecc
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Sep 10 01:56:52 2015 +0200
use system libwps, libcmis, cppunit
- libcmis-dev 0.5.0-2ubuntu2 should do for us
---
changelog | 6 ++++++
rules | 7 ++-----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/changelog b/changelog
index 3ffe3df..3a23351 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.0.1-0ubuntu2~wily1~ppa1) wily; urgency=medium
+
+ * use system libwps, libcmis, cppunit
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 10 Sep 2015 01:54:38 +0200
+
libreoffice (1:5.0.1-0ubuntu1) wily; urgency=medium
* new final upstream release
diff --git a/rules b/rules
index f9f6c18..011e952 100755
--- a/rules
+++ b/rules
@@ -412,7 +412,7 @@ HYPH_DIR=/usr/share/hyphen
THES_DIR=/usr/share/mythes
SYSTEM_STUFF += libcmis
ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 5 && echo true)" "true"
-LIBCMIS_MINVER=0.5.0-3
+LIBCMIS_MINVER=0.5.0-2ubuntu2
else
LIBCMIS_MINVER=0.5.0
endif
@@ -727,11 +727,8 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
# libetonyek 0.1.1 is in vivid/universe, needs MIR, was shipped with LibreOffice 4.3 in utopic
SYSTEM_STUFF := $(filter-out libetonyek, $(SYSTEM_STUFF))
- # libwps 0.4-4 is not yet in wily/main, no MIR needed, needs sync from debian experimental
- SYSTEM_STUFF := $(filter-out libwps, $(SYSTEM_STUFF))
-
SYSTEM_STUFF := $(filter-out opencollada collada2gltf, $(SYSTEM_STUFF))
- SYSTEM_STUFF := $(filter-out libcmis cppunit, $(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: