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

[libreoffice] 02/02: git update; update patches/fix-system-lpsolve-build.diff



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

rene pushed a commit to branch debian-experimental-4.3
in repository libreoffice.

commit a98654ecc4abb0f93092b4a96ff2645d60dbf610
Author: Rene Engelhard <rene@debian.org>
Date:   Wed May 21 11:15:10 2014 +0200

    git update; update patches/fix-system-lpsolve-build.diff
---
 changelog                             |  2 +-
 patches/fix-system-lpsolve-build.diff | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/changelog b/changelog
index 86791ae..dde06c3 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.3.0~beta1~git20140516-1) UNRELEASED; urgency=low
+libreoffice (1:4.3.0~beta1~git20140521-1) UNRELEASED; urgency=low
 
   * new upstream snapshot
 
diff --git a/patches/fix-system-lpsolve-build.diff b/patches/fix-system-lpsolve-build.diff
index 4119c5a..3961915 100644
--- a/patches/fix-system-lpsolve-build.diff
+++ b/patches/fix-system-lpsolve-build.diff
@@ -3,16 +3,16 @@ index cdae8b5..49f3ba2 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -9468,8 +9468,9 @@ if test "$with_system_lpsolve" = "yes"; then
-     # some systems need this. Like Ubuntu....
-     AC_CHECK_LIB(m, floor)
-     AC_CHECK_LIB(dl, dlopen)
-+    AC_CHECK_LIB(colamd, colamd)
-     AC_CHECK_LIB([lpsolve55], [make_lp], [:],
--        [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
-+        [ AC_MSG_ERROR(lpsolve library not found or too old.)], [-L/usr/lib/lpsolve])
-     LIBS=$save_LIBS
-     libo_MINGW_CHECK_DLL([lpsolve55])
- else
+         # some systems need this. Like Ubuntu....
+         AC_CHECK_LIB(m, floor)
+         AC_CHECK_LIB(dl, dlopen)
++        AC_CHECK_LIB(colamd, colamd)
+         AC_CHECK_LIB([lpsolve55], [make_lp], [:],
+-            [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
++            [ AC_MSG_ERROR(lpsolve library not found or too old.)], [-L/usr/lib/lpsolve])
+         LIBS=$save_LIBS
+         libo_MINGW_CHECK_DLL([lpsolve55])
+     else
 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
 index a4daea7..0dea12d 100644
 --- a/RepositoryExternal.mk

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


Reply to: