[libreoffice] 03/06: bump clucene build-dep to its gcc5 version
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit ee071d33426deca9f21b116b375b365a5ce44041
Author: Rene Engelhard <rene@debian.org>
Date: Thu Aug 20 10:34:15 2015 +0200
bump clucene build-dep to its gcc5 version
---
changelog | 3 ++-
control | 4 ++--
rules | 11 +++++++++--
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/changelog b/changelog
index d67a815..093fcbf 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,8 @@
libreoffice (1:5.0.1~rc1-3) UNRELEASED; urgency=medium
* debian/rules:
- - bump libmysqlcppconn-dev build-dep to its gcc 5 rebuild
+ - bump libmysqlcppconn-dev and libclucene-dev build-deps to their
+ gcc 5 versions
- add explicit dh-python build-dependency
- temporarily disable -kde (KDE uninstallable in sid right now
anyway)
diff --git a/control b/control
index c60483d..d01ba8c 100644
--- a/control
+++ b/control
@@ -46,7 +46,7 @@ Build-Depends: ant (>= 1.7.0),
libc6 (>= 2.17-6) [mips mipsel],
libcairo2-dev,
libcdr-dev (>= 0.1),
- libclucene-dev (>= 2.3.3.4-2),
+ libclucene-dev (>= 2.3.3.4-4.1),
libcmis-dev (>= 0.5.0-3),
libcollada2gltfconvert-dev (>= 20140924-2)[amd64 i386],
libcppunit-dev (>= 1.13.2-2.1),
@@ -4366,7 +4366,7 @@ Depends: ant (>= 1.7.0),
libbsh-java,
libcairo2-dev,
libcdr-dev (>= 0.1),
- libclucene-dev (>= 2.3.3.4-2),
+ libclucene-dev (>= 2.3.3.4-4.1),
libcmis-dev (>= 0.5.0-3),
libcollada2gltfconvert-dev (>= 20140924-2),
libcommons-codec-java,
diff --git a/rules b/rules
index d610e8a..83e1ac5 100755
--- a/rules
+++ b/rules
@@ -426,8 +426,15 @@ SYSTEM_STUFF += mesa-headers
SYSTEM_STUFF += poppler
SYSTEM_STUFF += libpng
SYSTEM_STUFF += nss
-SYSTEM_STUFF += clucene
ENABLE_HELP=y
+ifeq "$(ENABLE_HELP)" "y"
+ SYSTEM_STUFF += clucene
+ ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 5 && echo true)" "true"
+ CLUCENE_MINVER=2.3.3.4-4.1
+ else
+ CLUCENE_MINVER=2.3.3.4-2
+ endif
+endif
SYSTEM_STUFF += lcms2
SYSTEM_STUFF += openldap
PACKAGE_UNOWINREG_DLL=y
@@ -1117,7 +1124,7 @@ ifneq (,$(filter vigra, $(SYSTEM_STUFF)))
endif
ifneq (,$(filter clucene, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libclucene-dev (>= 2.3.3.4-2)
+ BUILD_DEPS += , libclucene-dev (>= $(CLUCENE_MINVER))
endif
ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: