[libreoffice-online] 04/04: update patches

[Rene Engelhard]

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

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

commit 34f8a9a9ff0e78d01f2c93fa8bbe6dcc32a6c7b1
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat May 27 13:57:16 2017 +0200

    update patches
---
 debian/patches/lo-path.diff | 13 +++++++++++++
 debian/patches/logs.diff    |  5 ++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/debian/patches/lo-path.diff b/debian/patches/lo-path.diff
index 30477fe..994cf41 100644
--- a/debian/patches/lo-path.diff
+++ b/debian/patches/lo-path.diff
@@ -60,3 +60,16 @@ index 64eabf0..b62ce4b 100644
              { "child_root_path", "jails" },
              { "lo_jail_subpath", "lo" },
              { "server_name", "" },
+diff --git a/configure.ac b/configure.ac
+index 876bb9b..357995a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -166,7 +166,7 @@ AS_IF([test -n "$with_lokit_path"],
+       [CPPFLAGS="$CPPFLAGS -I${with_lokit_path}"])
+ lokit_msg="$with_lokit_path"
+ 
+-LO_PATH="/usr/lib64/libreoffice"
++LO_PATH="/usr/lib/libreoffice"
+ JAIL_PATH=not-set
+ SYSTEMPLATE_PATH=not-set
+ have_lo_path=false
diff --git a/debian/patches/logs.diff b/debian/patches/logs.diff
index 4cc419c..6c98eb3 100644
--- a/debian/patches/logs.diff
+++ b/debian/patches/logs.diff
@@ -4,15 +4,18 @@ diff --git a/configure.ac b/configure.ac
 index 09a129b..3876aa8 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -107,7 +107,7 @@ AS_IF([test "$enable_debug" = yes -a -n "$with_poco_libs"],
+@@ -112,9 +112,9 @@ AS_IF([test "$enable_debug" = yes -a -n "$with_poco_libs"],
  
  ENABLE_DEBUG=
  LOOLWSD_LOGLEVEL="warning"
 -LOOLWSD_LOG_TO_FILE="false"
 +LOOLWSD_LOG_TO_FILE="true"
  LOOLWSD_LOGFILE="/var/log/loolwsd.log"
+-LOLEAFLET_LOGGING="false"
++LOLEAFLET_LOGGING="true"
  debug_msg="secure mode: product build"
  if test "$enable_debug" = "yes"; then
+    AC_DEFINE([ENABLE_DEBUG],1,[Whether to compile in some extra debugging support code and disable some security pieces])
 @@ -115,7 +115,7 @@ if test "$enable_debug" = "yes"; then
     ENABLE_DEBUG=true
     LOOLWSD_LOGLEVEL="trace"

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