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 98df184a5841fb562e4c49ac104efd5c7ac566ce
Author: Rene Engelhard <r...@debian.org>
Date: Thu Sep 17 20:27:28 2015 +0200
re-enable coinmp
---
changelog | 3 ++-
control | 4 ++++
rules | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/changelog b/changelog
index f141d1b..3b76ce4 100644
--- a/changelog
+++ b/changelog
@@ -20,8 +20,9 @@ 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
- -- Rene Engelhard <r...@debian.org> Thu, 17 Sep 2015 18:20:07 +0200
+ -- Rene Engelhard <r...@rene-engelhard.de> Thu, 17 Sep 2015 20:24:38 +0200
libreoffice (1:5.0.1-2) unstable; urgency=medium
diff --git a/control b/control
index 7d6fc3e..94d1d96 100644
--- a/control
+++ b/control
@@ -11,6 +11,8 @@ Build-Depends: ant (>= 1.7.0),
binutils (>= 2.23) [mips mipsel],
bison,
bzip2,
+ coinor-libcoinmp-dev,
+ coinor-libcoinutils-dev,
debhelper (>= 7.2.3~),
default-jdk,
default-jdk (>= 1:1.7-48) [ia64],
@@ -4356,6 +4358,8 @@ Depends: ant (>= 1.7.0),
bison,
build-essential,
bzip2,
+ coinor-libcoinmp-dev,
+ coinor-libcoinutils-dev,
debhelper (>= 7.2.3~),
default-jdk,
dh-python,
diff --git a/rules b/rules
index cb68c58..0ac7175 100755
--- a/rules
+++ b/rules
@@ -223,7 +223,7 @@ endif
SYSTEM_STUFF += lpsolve
USE_SHARED_LPSOLVE=y
LPSOLVE_MIN_VERSION= (>= 5.5.0.13-5+b1)
-ENABLE_COINMP=n
+ENABLE_COINMP=y
SYSTEM_STUFF += coinmp
USE_DBUS=y
ifeq "$(USE_DBUS)" "y"
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
