[Libreoffice-commits] online.git: 3 commits - loleaflet/Makefile loolwsd/debian

[Tor Lillqvist]

 loleaflet/Makefile   |    2 +-
 loolwsd/debian/rules |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 314a9ba826744abf93dec52cec6b5e8f58787797
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Jun 4 15:53:19 2015 +0300

    We want --localstatedir=/var on Debian

diff --git a/loolwsd/debian/rules b/loolwsd/debian/rules
index 474a309..a1e9d92 100755
--- a/loolwsd/debian/rules
+++ b/loolwsd/debian/rules
@@ -5,7 +5,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
 
 include /usr/share/dpkg/default.mk
 
-CONFFLAGS = --prefix=/usr --with-lokit-path=bundled/include
+CONFFLAGS = --prefix=/usr --localstatedir=/var --with-lokit-path=bundled/include
 
 # Avoid setcap when doing "make", when building for packaging
 # the setcap is done at installation time
commit 28d28dd67cb45bee8dff5e26ea15e5c0ea39cf72
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Jun 4 14:20:11 2015 +0300

    Bump version after tarball

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 61d54f2..4b95dc5 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -1,6 +1,6 @@
 # Version number of loleaflet, no need to be in sync with the loolwsd one
 
-VERSION=1.0.10
+VERSION=1.0.11
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
commit 41c5359d828ba7559ee0d9e4a09532dd77c62251
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Jun 4 14:19:48 2015 +0300

    Bump version for tarball

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 6ae9e76..61d54f2 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -1,6 +1,6 @@
 # Version number of loleaflet, no need to be in sync with the loolwsd one
 
-VERSION=1.0.9
+VERSION=1.0.10
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4