[libreoffice] 18/25: use system lpsolve
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 d024e4f522ac7f3111e715f4565127a7f3781404
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Jun 4 10:29:35 2015 +0200
use system lpsolve
---
changelog | 6 ++++++
patches/series | 2 +-
rules | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/changelog b/changelog
index 37bf931..1b239a0 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.0.0~beta1-1ubuntu1~vivid3) vivid; urgency=medium
+
+ * use system lpsolve
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 04 Jun 2015 10:23:24 +0200
+
libreoffice (1:5.0.0~beta1-1ubuntu1~vivid2) vivid; urgency=medium
* use more internal libs for now
diff --git a/patches/series b/patches/series
index 5890474..e9eff43 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 abcfff3..fcb5ad8 100755
--- a/rules
+++ b/rules
@@ -674,7 +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 libmwaw libwps mdds lpsolve glm, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libmwaw libwps mdds glm, $(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: