debian/control | 2 +-
debian/loolwsd.postinst | 4 ++--
loolwsd.service | 2 +-
loolwsd.spec.in | 4 ++--
loolwsd.xml.in | 2 +-
wsd/LOOLWSD.cpp | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit b17d64a854db58584702770390288d0a0f184b7c
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sat Mar 18 21:56:19 2017 +0100
switch to 5.3
Change-Id: I21cf56f8d061453c4ff3f609ea81a5604e12b78c
diff --git a/debian/control b/debian/control
index 9a601155..24914db8 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
Package: loolwsd
Section: web
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0,
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2,
cpio, collaboraofficebasis5.1-base, collaboraofficebasis5.1-calc,
collaboraofficebasis5.1-core, collaboraofficebasis5.1-draw,
collaboraofficebasis5.1-extension-beanshell-script-provider,
collaboraofficebasis5.1-extension-ct2n,
collaboraofficebasis5.1-extension-javascript-script-provider,
collaboraofficebasis5.1-extension-mediawiki-publisher,
collaboraofficebasis5.1-extension-nlpsolver,
collaboraofficebasis5.1-extension-numbertext,
collaboraofficebasis5.1-extension-pdf-import,
collaboraofficebasis5.1-extension-report-builder,
collaboraofficebasis5.1-gnome-integration,
collaboraofficebasis5.1-graphicfilter, collaboraofficebasis5.1-images,
collaboraofficebasis5.1-impress, collaboraofficebasis5.1-librelogo,
collaboraofficebasis5.1-math, collaboraofficebasis5.1-ogltrans,
collaboraofficebasis5.1-ooofonts, collaboraofficebasis5.1-oooling
uistic, collaboraofficebasis5.1-postgresql-sdbc,
collaboraofficebasis5.1-python-script-provider, collaboraofficebasis5.1-pyuno,
collaboraofficebasis5.1-writer, collaboraofficebasis5.1-xsltfilter,
collaboraoffice5.1, collaboraoffice5.1-base, collaboraoffice5.1-calc,
collaboraoffice5.1-dict-en, collaboraoffice5.1-draw,
collaboraoffice5.1-debian-menus, collaboraoffice5.1-impress,
collaboraoffice5.1-math, collaboraoffice5.1-ure, collaboraoffice5.1-writer,
collaboraofficebasis5.1-en-us, collaboraofficebasis5.1-en-us-base,
collaboraofficebasis5.1-en-us-calc, collaboraofficebasis5.1-en-us-math,
collaboraofficebasis5.1-en-us-res, collaboraofficebasis5.1-en-us-writer,
collaboraoffice5.1-en-us
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0,
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2,
cpio, collaboraofficebasis5.3-base, collaboraofficebasis5.3-calc,
collaboraofficebasis5.3-core, collaboraofficebasis5.3-draw,
collaboraofficebasis5.3-extension-beanshell-script-provider,
collaboraofficebasis5.3-extension-ct2n,
collaboraofficebasis5.3-extension-javascript-script-provider,
collaboraofficebasis5.3-extension-mediawiki-publisher,
collaboraofficebasis5.3-extension-nlpsolver,
collaboraofficebasis5.3-extension-numbertext,
collaboraofficebasis5.3-extension-pdf-import,
collaboraofficebasis5.3-extension-report-builder,
collaboraofficebasis5.3-gnome-integration,
collaboraofficebasis5.3-graphicfilter, collaboraofficebasis5.3-images,
collaboraofficebasis5.3-impress, collaboraofficebasis5.3-librelogo,
collaboraofficebasis5.3-math, collaboraofficebasis5.3-ogltrans,
collaboraofficebasis5.3-ooofonts, collaboraofficebasis5.3-oooling
uistic, collaboraofficebasis5.3-postgresql-sdbc,
collaboraofficebasis5.3-python-script-provider, collaboraofficebasis5.3-pyuno,
collaboraofficebasis5.3-writer, collaboraofficebasis5.3-xsltfilter,
collaboraoffice5.3, collaboraoffice5.3-base, collaboraoffice5.3-calc,
collaboraoffice5.3-dict-en, collaboraoffice5.3-draw,
collaboraoffice5.3-debian-menus, collaboraoffice5.3-impress,
collaboraoffice5.3-math, collaboraoffice5.3-ure, collaboraoffice5.3-writer,
collaboraofficebasis5.3-en-us, collaboraofficebasis5.3-en-us-base,
collaboraofficebasis5.3-en-us-calc, collaboraofficebasis5.3-en-us-math,
collaboraofficebasis5.3-en-us-res, collaboraofficebasis5.3-en-us-writer,
collaboraoffice5.3-en-us
Description: LibreOffice Online WebSocket Daemon
LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
services.
diff --git a/debian/loolwsd.postinst b/debian/loolwsd.postinst
index ad4f7ec8..765e4f3d 100755
--- a/debian/loolwsd.postinst
+++ b/debian/loolwsd.postinst
@@ -12,7 +12,7 @@ case "$1" in
rm -rf /var/cache/loolwsd/*
# We assume that the LibreOffice to be used is built TDF-style
- # and installs in /opt/collaboraoffice5.1, and that /opt/lool is
+ # and installs in /opt/collaboraoffice5.3, and that /opt/lool is
# on the same file system
rm -rf /opt/lool
@@ -20,7 +20,7 @@ case "$1" in
chown lool: /opt/lool
chown lool: /opt/lool/child-roots
- su lool --shell=/bin/sh -c "loolwsd-systemplate-setup
/opt/lool/systemplate /opt/collaboraoffice5.1 >/dev/null 2>&1"
+ su lool --shell=/bin/sh -c "loolwsd-systemplate-setup
/opt/lool/systemplate /opt/collaboraoffice5.3 >/dev/null 2>&1"
;;
esac
diff --git a/loolwsd.service b/loolwsd.service
index 327ffc81..2a7125ed 100644
--- a/loolwsd.service
+++ b/loolwsd.service
@@ -4,7 +4,7 @@ After=network.target
[Service]
EnvironmentFile=-/etc/sysconfig/loolwsd
-ExecStart=/usr/bin/loolwsd --version
--o:sys_template_path=/opt/lool/systemplate
--o:lo_template_path=/opt/collaboraoffice5.1
--o:child_root_path=/opt/lool/child-roots
--o:file_server_root_path=/usr/share/loolwsd
+ExecStart=/usr/bin/loolwsd --version
--o:sys_template_path=/opt/lool/systemplate
--o:lo_template_path=/opt/collaboraoffice5.3
--o:child_root_path=/opt/lool/child-roots
--o:file_server_root_path=/usr/share/loolwsd
User=lool
KillMode=control-group
Restart=always
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index a26b53d1..4430954b 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -26,7 +26,7 @@ BuildRequires: libcap-progs systemd-rpm-macros
%endif
%endif
-Requires: collaboraoffice5.1 collaboraoffice5.1-en-US
collaboraoffice5.1-ure collaboraofficebasis5.1-core
collaboraofficebasis5.1-writer collaboraofficebasis5.1-impress
collaboraofficebasis5.1-graphicfilter collaboraofficebasis5.1-en-US
collaboraofficebasis5.1-calc collaboraofficebasis5.1-en-US-res
collaboraofficebasis5.1-en-US-calc collaboraofficebasis5.1-ooofonts
collaboraofficebasis5.1-images collaboraofficebasis5.1-filter-data
collaboraofficebasis5.1-draw collaboraofficebasis5.1-base
collaboraofficebasis5.1-en-US-writer collaboraofficebasis5.1-en-US-math
collaboraofficebasis5.1-en-US-base
+Requires: collaboraoffice5.3 collaboraoffice5.3-en-US
collaboraoffice5.3-ure collaboraofficebasis5.3-core
collaboraofficebasis5.3-writer collaboraofficebasis5.3-impress
collaboraofficebasis5.3-graphicfilter collaboraofficebasis5.3-en-US
collaboraofficebasis5.3-calc collaboraofficebasis5.3-en-US-res
collaboraofficebasis5.3-en-US-calc collaboraofficebasis5.3-ooofonts
collaboraofficebasis5.3-images collaboraofficebasis5.3-filter-data
collaboraofficebasis5.3-draw collaboraofficebasis5.3-base
collaboraofficebasis5.3-en-US-writer collaboraofficebasis5.3-en-US-math
collaboraofficebasis5.3-en-US-base
Requires: systemd
Requires(post): coreutils grep sed
%if 0%{?fedora} || 0%{?rhel} >= 7
@@ -131,7 +131,7 @@ rm -rf /var/cache/loolwsd/*
# Figure out where LO is installed, let's hope it is not a mount point
# Create a directory for loolwsd on the same file system
-loroot=`rpm -ql collaboraoffice5.1 | grep '/soffice$' | sed -e
's-/program/soffice--'`
+loroot=`rpm -ql collaboraoffice5.3 | grep '/soffice$' | sed -e
's-/program/soffice--'`
loolparent=`cd ${loroot} && cd .. && /bin/pwd`
rm -rf ${loolparent}/lool
diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index 66fb7860..360bde1c 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -5,7 +5,7 @@
<tile_cache_path desc="Path to a directory where to keep the tile cache."
type="path" relative="false" default="@LOOLWSD_CACHEDIR@"></tile_cache_path>
<sys_template_path desc="Path to a template tree with shared libraries etc
to be used as source for chroot jails for child processes." type="path"
relative="true" default="systemplate"></sys_template_path>
- <lo_template_path desc="Path to a LibreOffice installation tree to be
copied (linked) into the jails for child processes. Should be on the same file
system as systemplate." type="path" relative="false"
default="/opt/collaboraoffice5.1"></lo_template_path>
+ <lo_template_path desc="Path to a LibreOffice installation tree to be
copied (linked) into the jails for child processes. Should be on the same file
system as systemplate." type="path" relative="false"
default="/opt/collaboraoffice5.3"></lo_template_path>
<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/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index ea9a73b0..55e52ccd 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -650,7 +650,7 @@ void LOOLWSD::initialize(Application& self)
static const std::map<std::string, std::string> DefAppConfig
= { { "tile_cache_path", LOOLWSD_CACHEDIR },
{ "sys_template_path", "systemplate" },
- { "lo_template_path", "/opt/collaboraoffice5.1" },
+ { "lo_template_path", "/opt/collaboraoffice5.3" },
{ "child_root_path", "jails" },
{ "lo_jail_subpath", "lo" },
{ "server_name", "" },
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
