[libreoffice-online] 02/05: remove bogus hunk in lo-path.diff

Rene Engelhard rene at moszumanska.debian.org
Mon Feb 27 15:13:40 UTC 2017


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

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

commit b15f086972449af3e35b911d8d2a05f5d211f07f
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Feb 27 15:25:55 2017 +0100

    remove bogus hunk in lo-path.diff
---
 debian/patches/lo-path.diff | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/debian/patches/lo-path.diff b/debian/patches/lo-path.diff
index a3908fa..30477fe 100644
--- a/debian/patches/lo-path.diff
+++ b/debian/patches/lo-path.diff
@@ -47,19 +47,6 @@ index c3a550b..9bf0bd2 100644
      <child_root_path desc="Path to the directory under which the chroot jails for the child processes will be created. Should be on the same file system as systemplate and lotemplate. Must be an empty directory." type="path" relative="true" default="jails"></child_root_path>
  
      <server_name desc="Hostname:port of the server running loolwsd. If empty, it's derived from the request." type="string" default=""></server_name>
-diff --git a/test/run_unit.sh b/test/run_unit.sh
-index d3cdeb1..4d6d372 100755
---- a/test/run_unit.sh
-+++ b/test/run_unit.sh
-@@ -13,7 +13,7 @@ abs_top_builddir="${DIR}/.."
- systemplate_path="${abs_top_builddir}/systemplate"
- enable_debug="true"
- jails_path="${abs_top_builddir}/jails"
--lo_path="/opt/libreoffice/cp-5.1/instdir"
-+lo_path="/usr/lib/libreoffice"
- valgrind_cmd="valgrind --tool=memcheck --trace-children=no -v --read-var-info=yes"
- 
- # Note that these options are used by commands in the Makefile that
 diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
 index 64eabf0..b62ce4b 100644
 --- a/wsd/LOOLWSD.cpp

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



More information about the Pkg-openoffice-commits mailing list