[libreoffice] 06/06: temporarily disable coinmp
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit fbc947c6ce50a1912ee601ef73e5f10986827ffd
Author: Rene Engelhard <rene@debian.org>
Date: Fri Aug 21 11:11:36 2015 +0200
temporarily disable coinmp
---
changelog | 2 +-
control | 4 ----
rules | 2 +-
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/changelog b/changelog
index 5f570cc..edf93ce 100644
--- a/changelog
+++ b/changelog
@@ -5,7 +5,7 @@ libreoffice (1:5.0.1~rc1-3) UNRELEASED; urgency=medium
gcc 5 versions
- add explicit dh-python build-dependency
- temporarily disable -kde (KDE uninstallable in sid right now
- anyway)
+ anyway) and coinmp
* merge from Ubuntu:
- autopkgtest updates/fixes
diff --git a/control b/control
index d01ba8c..53dbece 100644
--- a/control
+++ b/control
@@ -11,8 +11,6 @@ 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],
@@ -4335,8 +4333,6 @@ 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 bc1128b..c6bc398 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=y
+ENABLE_COINMP=n
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
Reply to: