[libreoffice] 01/01: git update; we now need liborcus 0.11
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit 16b0069f4ec0d06bab4d7f6dbf3407d60b53bc3d
Author: Rene Engelhard <rene@debian.org>
Date: Tue Mar 8 08:08:04 2016 +0100
git update; we now need liborcus 0.11
---
changelog | 2 +-
control | 4 ++--
rules | 10 +++-------
shlibs.override.orcus | 4 ++--
4 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/changelog b/changelog
index 091aa57..f528ff2 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.2.0~alpha1~git20160303-1) UNRELEASED; urgency=medium
+libreoffice (1:5.2.0~alpha1~git20160308-1) UNRELEASED; urgency=medium
* New upstream snapshot
- fixes SVG t(ext s)pan import (closes: #665094)
diff --git a/control b/control
index 4782cd6..40075da 100644
--- a/control
+++ b/control
@@ -100,7 +100,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
libnss3-dev (>= 3.12.3),
libo3dgc-dev (>= 0~20131011-2) [amd64 i386],
libodfgen-dev (>= 0.1),
- liborcus-dev (>= 0.9.2-2),
+ liborcus-dev (>= 0.11.0),
libpagemaker-dev,
libpcre3-dev [amd64 i386],
libpng-dev,
@@ -4465,7 +4465,7 @@ Depends: ant (>= 1.7.0),
libnss3-dev (>= 3.12.3),
libo3dgc-dev (>= 0~20131011-2),
libodfgen-dev (>= 0.1),
- liborcus-dev (>= 0.9.2-2),
+ liborcus-dev (>= 0.11.0),
libpagemaker-dev,
libpcre3-dev,
libpng-dev,
diff --git a/rules b/rules
index 95e2c1d..bec53d6 100755
--- a/rules
+++ b/rules
@@ -492,11 +492,7 @@ ENABLE_LIBLANGTAG=y
SYSTEM_STUFF += liblangtag
ENABLE_ORCUS=y
SYSTEM_STUFF += orcus
-ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 5 && echo true)" "true"
-LIBORCUS_MINVER=0.9.2-2
-else
-LIBORCUS_MINVER=0.9.0
-endif
+LIBORCUS_MINVER=0.11.0
USE_UCPP=y
ifeq "$(USE_UCPP)" "y"
SYSTEM_STUFF += ucpp
@@ -1144,7 +1140,7 @@ ifneq (,$(filter boost, $(SYSTEM_STUFF)))
#BUILD_DEPS += , libboost-thread$(BOOST_VERSION)-dev, libboost-program-options$(BOOST_VERSION)-dev
ifeq "$(ENABLE_ORCUS)" "y"
ifeq (,$(filter orcus, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libboost-system$(BOOST_VERSION)-dev $(BOOST_MINVER), libboost-iostreams$(BOOST_VERSION)-dev $(BOOST_MINVER), libboost-program-options$(BOOST_VERSION)-dev $(BOOST_MINVER),
+ BUILD_DEPS += , libboost-system$(BOOST_VERSION)-dev $(BOOST_MINVER), libboost-iostreams$(BOOST_VERSION)-dev $(BOOST_MINVER), libboost-program-options$(BOOST_VERSION)-dev $(BOOST_MINVER), libboost-filesystem$(BOOST_VERSION)-dev $(BOOST_MINVER)
endif
endif
ifeq ($(USE_VLC),y)
@@ -1154,7 +1150,7 @@ ifneq (,$(filter boost, $(SYSTEM_STUFF)))
BUILD_DEPS += , libboost-dev $(BOOST_MINVER), libboost-date-time-dev $(BOOST_MINVER), libboost-iostreams-dev $(BOOST_MINVER)
#BUILD_DEPS += , libboost-thread-dev, libboost-program-options-dev
ifeq (,$(filter orcus, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libboost-system-dev $(BOOST_MINVER), libboost-iostreams-dev $(BOOST_MINVER), libboost-program-options-dev $(BOOST_MINVER)
+ BUILD_DEPS += , libboost-system-dev $(BOOST_MINVER), libboost-iostreams-dev $(BOOST_MINVER), libboost-program-options-dev $(BOOST_MINVER), libboost-filesystem-dev $(BOOST_MINVER)
endif
ifeq ($(USE_VLC),y)
BUILD_DEPS += , libboost-system-dev $(BOOST_MINVER)
diff --git a/shlibs.override.orcus b/shlibs.override.orcus
index 7bbac83..064168b 100644
--- a/shlibs.override.orcus
+++ b/shlibs.override.orcus
@@ -1,2 +1,2 @@
-liborcus-0.10 0
-liborcus-parser-0.10 0
+liborcus-0.11 0
+liborcus-parser-0.11 0
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: