[libreoffice] 01/01: move STRETCH_BACKPORT conditional for coinmp lower in rules so it gets honoured...

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit b5f0f96f5a3f59101ee64dc035f90df8282bd67f
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat Sep 2 20:49:42 2017 +0200

    move STRETCH_BACKPORT conditional for coinmp lower in rules so it gets honoured...
---
 changelog |  8 ++++++++
 rules     | 26 +++++++++++++-------------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/changelog b/changelog
index 1d5a422..6308985 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:5.4.1-2) UNRELEASED; urgency=medium
+
+  * debian/rules:
+    - move STRETCH_BACKPORT conditional for coinmp lower in rules so it
+      gets honoured...
+
+ -- Rene Engelhard <rene at debian.org>  Thu, 31 Aug 2017 20:05:39 +0000
+
 libreoffice (1:5.4.1-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/rules b/rules
index 84a7682..4a26226 100755
--- a/rules
+++ b/rules
@@ -222,19 +222,6 @@ USE_SHARED_LPSOLVE=y
 LPSOLVE_MIN_VERSION= (>= 5.5.0.13-5+b1)
 ENABLE_COINMP=y
 SYSTEM_STUFF += coinmp
-ifeq "$(GCC_VERSION_5_OR_GREATER)" "y"
-COINMP_MINVER=(>= 1.7.6+dfsg1-2)
-  ifeq "$(STRETCH_BACKPORT)" "y"
-	COINUTILS_MINVER=(>= 2.9.15-3.1)
-  else
-	COINUTILS_MINVER=(>= 2.10.14+repack1-1)
-	# go sure given #873362
-	COINMP_MINVER=(>= 1.8.3-2)
-  endif
-else
-COINMP_MINVER=
-COINUTILS_MINVER=
-endif
 USE_DBUS=y
 ifeq "$(USE_DBUS)" "y"
   ifeq (,$(findstring linux,$(DEB_HOST_ARCH_OS)))
@@ -871,6 +858,19 @@ ifneq (,$(filter curl, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libcurl4-$(CURL_SECTYPE)-dev
 endif
 
+ifeq "$(GCC_VERSION_5_OR_GREATER)" "y"
+COINMP_MINVER=(>= 1.7.6+dfsg1-2)
+  ifeq "$(STRETCH_BACKPORT)" "y"
+	COINUTILS_MINVER=(>= 2.9.15-3.1)
+  else
+	COINUTILS_MINVER=(>= 2.10.14+repack1-1)
+	# go sure given #873362
+	COINMP_MINVER=(>= 1.8.3-2)
+  endif
+else
+COINMP_MINVER=
+COINUTILS_MINVER=
+endif
 ifneq ($(ENABLE_COINMP),y)
 	CONFIGURE_FLAGS += --disable-coinmp
 else

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git