[libreoffice] 02/16: lp#1410883: use system libetonyek
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 e784e9eda2fd5ac9955bf734eb2276f2daf8dce2
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Sep 11 09:26:42 2015 +0200
lp#1410883: use system libetonyek
---
changelog | 3 ++-
rules | 3 ---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/changelog b/changelog
index 3a23351..2bc46b3 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,9 @@
libreoffice (1:5.0.1-0ubuntu2~wily1~ppa1) wily; urgency=medium
* use system libwps, libcmis, cppunit
+ * use system libetonyek, which is in main now (lp: #1410883)
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 10 Sep 2015 01:54:38 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 11 Sep 2015 09:21:37 +0200
libreoffice (1:5.0.1-0ubuntu1) wily; urgency=medium
diff --git a/rules b/rules
index 011e952..535d774 100755
--- a/rules
+++ b/rules
@@ -724,9 +724,6 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
# libcoinor-libcoinmp-dev is in vivid/universe, needs MIR, was shipped with LibreOffice 4.4 in vivid
SYSTEM_STUFF := $(filter-out libgltf coinmp, $(SYSTEM_STUFF))
- # 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))
-
SYSTEM_STUFF := $(filter-out opencollada collada2gltf, $(SYSTEM_STUFF))
ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: