[libreoffice] 07/16: Revert "use system orcus"
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 d1c8ac5fa74b94ea87c736a01b3e83d8a1fd9d31
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Sep 18 12:21:19 2015 +0200
Revert "use system orcus"
This reverts commit c787b288f5f2c45e15ddb8a2d28cd251dde39ee7.
---
changelog | 3 +--
rules | 2 ++
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/changelog b/changelog
index 76d3c22..efa8355 100644
--- a/changelog
+++ b/changelog
@@ -1,9 +1,8 @@
libreoffice (1:5.0.2~rc2-0ubuntu1~wily1~ppa1) wily; urgency=medium
* new upstream rc
- * use system orcus, thanks to Doko (related: lp#1349859)
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 18 Sep 2015 10:08:05 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 18 Sep 2015 08:36:29 +0200
libreoffice (1:5.0.1-0ubuntu2~wily1~ppa1) wily; urgency=medium
diff --git a/rules b/rules
index 384f540..d581cd5 100755
--- a/rules
+++ b/rules
@@ -718,6 +718,8 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
USE_VLC:=n
#temp. hacks
ENABLE_EVO2:=n
+ SYSTEM_STUFF := $(filter-out orcus, $(SYSTEM_STUFF))
+
# libgltf-dev (0.0.2-2) is in vivid/universe, needs MIR, was shipped with LibreOffice 4.4 in vivid
# 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))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: