loolwsd/configure.ac | 2 +-
loolwsd/loolwsd.service | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 76fbcdf7ce5c55675aed5aa412cd90844acc9e66
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Jul 8 18:11:48 2015 +0300
Bump version to 1.1.7 after tarball
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index d5777f2..cfcc00a 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.1.6], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.1.7], [libreoff...@collabora.com])
AM_INIT_AUTOMAKE([1.11 silent-rules])
commit fd03389082692dad372e9649da5aea3df5775bed
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Jul 8 18:02:47 2015 +0300
Bump version to 1.1.6 for tarball
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 4ce0d45..d5777f2 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.1.5], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.1.6], [libreoff...@collabora.com])
AM_INIT_AUTOMAKE([1.11 silent-rules])
commit fa48f9d2ca01555d418d478c4a9b47739ff70e5b
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Jun 9 20:15:55 2015 +0300
Use /opt/libreoffice5.0 to match LO 5.0 beta
Note that the LibreOffice version present on the build system, if any, has
no
relation to the one the packaged binaries are supposed to run against. When
building RPM or Debian packages, we use the bundled copy of the
LibreOfficeKit
headers we have here, and not ones from a LibreOffice source tree.
diff --git a/loolwsd/loolwsd.service b/loolwsd/loolwsd.service
index 526b272..19fb82c 100644
--- a/loolwsd/loolwsd.service
+++ b/loolwsd/loolwsd.service
@@ -4,7 +4,7 @@ After=network.target
[Service]
EnvironmentFile=-/etc/sysconfig/loolwsd
-ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate
--lotemplate=/opt/libreofficedev5.1 --childroot=/opt/lool/child-roots
--numprespawns=5
+ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate
--lotemplate=/opt/libreoffice5.0 --childroot=/opt/lool/child-roots
--numprespawns=5
User=lool
KillMode=process
Restart=always
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
