[libreoffice] 25/25: walk through bundled deps
This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-wily-5.0
in repository libreoffice.
commit 97dc4883e21f9dfb44875f2d902c673ed9723280
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Jun 19 11:28:44 2015 +0200
walk through bundled deps
---
rules | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/rules b/rules
index 056004d..294e38a 100755
--- a/rules
+++ b/rules
@@ -672,12 +672,23 @@ 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))
+
+ # 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 orcus libgltf coinmp, $(SYSTEM_STUFF))
- SYSTEM_STUFF := $(filter-out libmwaw libwps mdds glm, $(SYSTEM_STUFF))
- # libetonyek 0.1.1 is in vivid/universe, needs MIR, was shipped with LibreOffice in utopic/main
- # libgltf-dev (0.0.2-2) is in vivid/universe, needs MIR, new with LibreOffice 4.4
- # libcoinor-libcoinmp-dev is in vivid/universe, needs MIR, new with LibreOffice 4.4
+
+ # 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))
+
+ # libglm 0.9.6.3 is already in wily/main, we should use system lib now
+ # libmwaw 0.3.5 is already in wily/main, we should use system lib now
+ # mdds 0.12.0 is already in wily/main, we should use system lib now
+ SYSTEM_STUFF := $(filter-out libmwaw mdds glm, $(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: