[libreoffice] 02/06: fix SYSTEM_GCC_VERSION for gcc 5
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.0
in repository libreoffice.
commit 12d37d16a4e8c3d7949a3600175113cdb1fa68b3
Author: Rene Engelhard <rene@debian.org>
Date: Sun Aug 2 17:18:09 2015 +0200
fix SYSTEM_GCC_VERSION for gcc 5
---
changelog | 9 ++++++++-
rules | 8 +++-----
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/changelog b/changelog
index f9aa732..9b9bc2d 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,12 @@
-libreoffice (1:5.0.0~rc5-2) experimental; urgency=medium
+libreoffice (1:5.0.0~rc5-2) UNRELEASED; urgency=medium
+ * debian/rules:
+ - bump build-depends on libgltf, *collada* to build-depend on their
+ gcc 5 rebuilds
+ - fix SYSTEM_GCC_CHECK for gcc 5; remove obsolete >= 4.7 check for Qt to get
+ correct build-dep
+ * debian/patches/series: disable liborcus-0.9.1,diff
+
* debian/control.in: suggest breeze-icon-theme in -style-breeze (like the other
ones do for oxygen/tango)
diff --git a/rules b/rules
index 5761621..bc6f577 100755
--- a/rules
+++ b/rules
@@ -35,7 +35,9 @@ include /usr/share/dpkg/vendor.mk
SHELL:=/bin/bash
export gb_SHELL:=$(SHELL)
-SYSTEM_GCC_VERSION = $(shell gcc --version | sed -n '/^gcc/s/.*\(.\..\)\..$$/\1/p')
+#SYSTEM_GCC_VERSION = $(shell gcc --version | sed -n '/^gcc/s/.*\(.\..\)\..$$/\1/p')
+#FIXME
+SYSTEM_GCC_VERSION = $(shell gcc --version | sed -n '/^gcc/s/.*\(.\..\)\../\1/p' | cut -d" " -f1)
SYSTEM_GCJ_VERSION = $(shell basename `readlink /usr/lib/jvm/java-gcj/bin/gcj` | sed -e s/gcj-//)
PKGDIR:=debian/libreoffice
@@ -190,12 +192,8 @@ CAIRO_FONTS_PATCH=y
BUILD_KDE=y
# not ported to KDE 4
ENABLE_KDEAB=n
-ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 4.7 && echo true)" "true"
# < 4.8 fails with gcc 4.7, see #667911
QT_MINVER= (>= 4:4.8)
-else
-QT_MINVER= (>= 4:4.5)
-endif
KDELIBS_MINVER= (>= 4:4.3.4)
BUILD_DBG_PACKAGE=y
ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: