[libreoffice] 01/01: we need the gcc5 rebuilds of the coin stuff
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 2ba19429ea30604d1b76e325e61f6923d864d8ae
Author: Rene Engelhard <rene@debian.org>
Date: Fri Sep 18 17:32:37 2015 +0200
we need the gcc5 rebuilds of the coin stuff
---
changelog | 5 +++--
control | 8 ++++----
rules | 9 ++++++++-
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/changelog b/changelog
index 3b76ce4..7c7ecc3 100644
--- a/changelog
+++ b/changelog
@@ -20,9 +20,10 @@ libreoffice (1:5.0.2~rc2-1) UNRELEASED; urgency=medium
if idebian/tests/control exists
+ move dh_fixperms after gdb helper install to fix permissions of the
gdb stuff
- - re-enable coinmp; build-dependencies now installable again
+ - re-enable coinmp; build-dependencies now installable again; bump
+ build-dependencies to the gcc 5 versions
- -- Rene Engelhard <rene@rene-engelhard.de> Thu, 17 Sep 2015 20:24:38 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 17 Sep 2015 20:24:38 +0200
libreoffice (1:5.0.1-2) unstable; urgency=medium
diff --git a/control b/control
index 94d1d96..7add20d 100644
--- a/control
+++ b/control
@@ -11,8 +11,8 @@ Build-Depends: ant (>= 1.7.0),
binutils (>= 2.23) [mips mipsel],
bison,
bzip2,
- coinor-libcoinmp-dev,
- coinor-libcoinutils-dev,
+ coinor-libcoinmp-dev (>= 1.7.6+dfsg1-2),
+ coinor-libcoinutils-dev (>= 2.9.15-3.1),
debhelper (>= 7.2.3~),
default-jdk,
default-jdk (>= 1:1.7-48) [ia64],
@@ -4358,8 +4358,8 @@ Depends: ant (>= 1.7.0),
bison,
build-essential,
bzip2,
- coinor-libcoinmp-dev,
- coinor-libcoinutils-dev,
+ coinor-libcoinmp-dev (>= 1.7.6+dfsg1-2),
+ coinor-libcoinutils-dev (>= 2.9.15-3.1),
debhelper (>= 7.2.3~),
default-jdk,
dh-python,
diff --git a/rules b/rules
index 0ac7175..624980b 100755
--- a/rules
+++ b/rules
@@ -225,6 +225,13 @@ USE_SHARED_LPSOLVE=y
LPSOLVE_MIN_VERSION= (>= 5.5.0.13-5+b1)
ENABLE_COINMP=y
SYSTEM_STUFF += coinmp
+ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 5 && echo true)" "true"
+COINMP_MINVER=(>= 1.7.6+dfsg1-2)
+COINUTILS_MINVER=(>= 2.9.15-3.1)
+else
+COINMP_MINVER=
+COINUTILS_MINVER=
+endif
USE_DBUS=y
ifeq "$(USE_DBUS)" "y"
ifneq (,$(findstring kfreebsd,$(DEB_HOST_ARCH)))
@@ -805,7 +812,7 @@ endif
ifneq ($(ENABLE_COINMP),y)
CONFIGURE_FLAGS += --disable-coinmp
else
- BUILD_DEPS += , coinor-libcoinmp-dev, coinor-libcoinutils-dev
+ BUILD_DEPS += , coinor-libcoinmp-dev $(COINMP_MINVER), coinor-libcoinutils-dev $(COINUTILS_MINVER)
endif
ifneq (,$(filter openssl, $(SYSTEM_STUFF)))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: