[libreoffice] 01/01: work around libcoinutils-dev pulling in -lbz2 without depending on it by Build-Depending on it here (temporarily)

[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 6a8dcf9a866b327c3284a98fd2d6f04d030fb05d
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Sep 23 07:25:54 2016 +0200

    work around libcoinutils-dev pulling in -lbz2 without depending on it by Build-Depending on it here (temporarily)
---
 changelog     | 7 +++++++
 control       | 1 +
 rules         | 2 +-
 tests/control | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 7432f73..ada7394 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:5.2.2~rc2-2) unstable; urgency=medium
+
+  * work around libcoinutils-dev pulling in -lbz2 without depending on it
+    by Build-Depending on it here (temporarily) 
+
+ -- Rene Engelhard <rene at debian.org>  Fri, 23 Sep 2016 07:24:37 +0200
+
 libreoffice (1:5.2.2~rc2-1) unstable; urgency=medium
 
   * New upstream release candidate
diff --git a/control b/control
index 9445434..540114a 100644
--- a/control
+++ b/control
@@ -48,6 +48,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
                libboost-filesystem-dev (>= 1.58),
                libboost-iostreams-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 9cb97f0..7118121 100755
--- a/rules
+++ b/rules
@@ -862,7 +862,7 @@ endif
 ifneq ($(ENABLE_COINMP),y)
 	CONFIGURE_FLAGS += --disable-coinmp
 else
-	BUILD_DEPS += , coinor-libcoinmp-dev $(COINMP_MINVER), coinor-libcoinutils-dev $(COINUTILS_MINVER)
+	BUILD_DEPS += , coinor-libcoinmp-dev $(COINMP_MINVER), coinor-libcoinutils-dev $(COINUTILS_MINVER), libbz2-dev
 endif
 
 ifneq (,$(filter openssl, $(SYSTEM_STUFF)))
diff --git a/tests/control b/tests/control
index 87b03c1..325e69d 100644
--- a/tests/control
+++ b/tests/control
@@ -1,5 +1,5 @@
 Tests: junit-subsequentcheck
-Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~2 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~2 [...]
 
 Tests: pyuno-import
 Depends: python3-uno

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