[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 55/59: use system lpsolve again



This is an automated email from the git hooks/post-receive script.

sweetshark-guest pushed a commit to branch ubuntu-trusty-4.2
in repository libreoffice.

commit 483dea920f54693b46317524c0defcd487a75414
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Sat Jan 18 03:06:04 2014 +0100

    use system lpsolve again
---
 changelog | 5 +++--
 rules     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index 0f6c92e..a718b00 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,9 @@
-libreoffice (1:4.2.0~rc2-0ubuntu1~trusty1) trusty; urgency=low
+libreoffice (1:4.2.0~rc2-0ubuntu1~trusty2) trusty; urgency=low
 
   * bump upstream release candidate
+  * use system lpsolve again
 
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Fri, 10 Jan 2014 01:53:36 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Sat, 18 Jan 2014 03:06:32 +0100
 
 libreoffice (1:4.2.0~rc1-0ubuntu1~trusty8) trusty; urgency=low
 
diff --git a/rules b/rules
index 0404e40..e8d2fc5 100755
--- a/rules
+++ b/rules
@@ -624,7 +624,7 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
   USE_VLC:=n
   #temp. hacks
   ENABLE_EVO2:=n
-  SYSTEM_STUFF := $(filter-out libcmis mdds libodfgen libmwaw libetonyek libfreehand libebook lpsolve libeot, $(SYSTEM_STUFF))
+  SYSTEM_STUFF := $(filter-out libcmis mdds libodfgen libmwaw libetonyek libfreehand libebook libeot, $(SYSTEM_STUFF))
   ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
     ENABLE_HELP=n
   endif

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


Reply to: