[libreoffice] 10/25: use internal lpsolve for now
This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-wily-5.0
in repository libreoffice.
commit c8e513bac1e32002b8d23ac877a6b381aa70faff
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Jun 2 12:55:08 2015 +0200
use internal lpsolve for now
---
patches/series | 2 +-
rules | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/patches/series b/patches/series
index 63853cc..5f1017e 100644
--- a/patches/series
+++ b/patches/series
@@ -4,7 +4,7 @@ jurt-soffice-location.diff
split-evoab.diff
debian-debug.diff
#rhino-build-optional.diff
-fix-system-lpsolve-build.diff
+#fix-system-lpsolve-build.diff
install-fixes.diff
#mention-java-common-package.diff
#help-msg-add-package-info.diff
diff --git a/rules b/rules
index 4485d7f..e9d7a6b 100755
--- a/rules
+++ b/rules
@@ -674,6 +674,7 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
ENABLE_EVO2:=n
SYSTEM_STUFF := $(filter-out libetonyek, $(SYSTEM_STUFF))
SYSTEM_STUFF := $(filter-out orcus libgltf coinmp, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out lpsolve, $(SYSTEM_STUFF))
# libetonyek 0.1.1 is in vivid/universe, needs MIR, was shipped with LibreOffice in utopic/main
# libgltf-dev (0.0.2-2) is in vivid/universe, needs MIR, new with LibreOffice 4.4
# libcoinor-libcoinmp-dev is in vivid/universe, needs MIR, new with LibreOffice 4.4
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: