[libreoffice] 01/02: remove libbz2-dev from Build-Depends, coinutils got fixed

[Rene Engelhard]

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

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit bcd1bc95a08c80cc20e3795bf789fadadb6eb370
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu Aug 24 21:15:57 2017 +0200

    remove libbz2-dev from Build-Depends, coinutils got fixed
---
 changelog |  1 +
 control   |  3 +--
 rules     | 12 ++++++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/changelog b/changelog
index 09a3e52..4c312ce 100644
--- a/changelog
+++ b/changelog
@@ -14,6 +14,7 @@ libreoffice (1:5.4.1~rc1-1) UNRELEASED; urgency=medium
       https://lists.debian.org/debian-devel-announce/2017/08/msg00006.html
     - set locale to en-US.UTF-8 also for make check, the dbaccess tests
       fail in some frenchy locale...
+    - remove libbz2-dev from Build-Depends, coinutils got fixed
 
  -- Rene Engelhard <rene at debian.org>  Sat, 12 Aug 2017 10:36:57 +0200
 
diff --git a/control b/control
index 53dad15..57dc625 100644
--- a/control
+++ b/control
@@ -13,7 +13,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                bzip2,
                chromium (>= 39.0.2171.71-1) [amd64 arm64 armhf i386],
                coinor-libcoinmp-dev (>= 1.7.6+dfsg1-2),
-               coinor-libcoinutils-dev (>= 2.9.15-3.1),
+               coinor-libcoinutils-dev (>= 2.10.14+repack1-1),
                debhelper (>= 10),
                default-jdk (>= 1:1.6) [!hppa !mips64 !s390 !sparc],
                default-jdk (>= 2:1.7-52.1) [kfreebsd-any],
@@ -51,7 +51,6 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                libboost-iostreams-dev (>= 1.58),
                libboost-locale-dev (>= 1.58),
                libboost-system-dev (>= 1.58),
-               libbz2-dev,
                libc0.1 (>= 2.10.2-7) [kfreebsd-any],
                libc6 (>= 2.17-6) [mips mipsel],
                libcairo2-dev,
diff --git a/rules b/rules
index 7c114bf..53408f8 100755
--- a/rules
+++ b/rules
@@ -224,7 +224,11 @@ ENABLE_COINMP=y
 SYSTEM_STUFF += coinmp
 ifeq "$(GCC_VERSION_5_OR_GREATER)" "y"
 COINMP_MINVER=(>= 1.7.6+dfsg1-2)
-COINUTILS_MINVER=(>= 2.9.15-3.1)
+  ifeq "$(STRETCH_BACKPORT)" "y"
+	COINUTILS_MINVER=(>= 2.9.15-3.1)
+  else
+	COINUTILS_MINVER=(>= 2.10.14+repack1-1)
+  endif
 else
 COINMP_MINVER=
 COINUTILS_MINVER=
@@ -868,7 +872,11 @@ endif
 ifneq ($(ENABLE_COINMP),y)
 	CONFIGURE_FLAGS += --disable-coinmp
 else
-	BUILD_DEPS += , coinor-libcoinmp-dev $(COINMP_MINVER), coinor-libcoinutils-dev $(COINUTILS_MINVER), libbz2-dev
+	BUILD_DEPS += , coinor-libcoinmp-dev $(COINMP_MINVER), coinor-libcoinutils-dev $(COINUTILS_MINVER)
+  # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=838620
+  ifeq "$(STRETCH_BACKPORT)" "y"
+	BUILD_DEPS += , libbz2-dev
+  endif
 endif
 
 ifneq (,$(findstring i386,$(DEB_HOST_ARCH)))

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