[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-2' - 3 commits - loolwsd/configure.ac loolwsd/loolwsd.service

[Tor Lillqvist]

 loolwsd/configure.ac    |    2 +-
 loolwsd/loolwsd.service |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ace50130b3f55665d90fc37e52d831a5888ba881
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jun 9 20:22:14 2015 +0300

    Bump version after tarball

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 23f9c16..bb4c544 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.0.38], [libreoffice at collabora.com])
+AC_INIT([loolwsd], [1.0.39], [libreoffice at collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
commit 2dd3119c2464faa421e16f4df4e2e7ee5e6ac5c3
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jun 9 20:18:13 2015 +0300

    Bump version for tarball

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 17d2364..23f9c16 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.0.37], [libreoffice at collabora.com])
+AC_INIT([loolwsd], [1.0.38], [libreoffice at collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
commit 9d2c09ecb68a968f78017f88fadc95e1f032009b
Author: Tor Lillqvist <tml at 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