configure.ac | 2 +-
debian/changelog | 6 ++++++
debian/control | 2 +-
loleaflet/Makefile | 2 +-
loleaflet/src/control/Control.Tabs.js | 2 +-
loolwsd.spec.in | 2 +-
6 files changed, 11 insertions(+), 5 deletions(-)
New commits:
commit 268497d552d89d6016b7f94f68db841e81006c3c
Author: Andras Timar <andras.ti...@collabora.com>
Date: Wed Mar 29 22:17:16 2017 +0200
Bump version to 2.0.6
Change-Id: If523cf16e64a9a9f155acc00e41720048133dbc1
diff --git a/configure.ac b/configure.ac
index 20eca8c8..f46e29f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [2.0.5], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [2.0.6], [libreoffice@lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects])
diff --git a/debian/changelog b/debian/changelog
index 28352d70..8b3c150a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (2.0.6-1) unstable; urgency=medium
+
+ * see the git log: http://col.la/cool20
+
+ -- Andras Timar <andras.ti...@collabora.com> Thu, 30 Mar 2017 11:20:00 +0100
+
loolwsd (2.0.5-1) unstable; urgency=medium
* see the git log: http://col.la/cool20
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 5b003770..70732612 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
# ("micro") part: Between releases odd, even for releases (no other
# changes inbetween).
-VERSION=2.0.5
+VERSION=2.0.6
# Version number of the bundled 'draw' thing
DRAW_VERSION=0.2.4
commit 38f032bc7074abb03362b221659020c4d5922b56
Author: Andras Timar <andras.ti...@collabora.com>
Date: Wed Mar 29 22:14:30 2017 +0200
Requires: Collabora Office 5.1-24
Change-Id: I5d6cd38c9a189e07620fa5f2cbbd033eca6ff2bc
diff --git a/debian/control b/debian/control
index ee629693..4f3260d6 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-calc (>= 5.1.10.23), collaboraofficebasis5.1-core
(>= 5.1.10.23), collaboraofficebasis5.1-graphicfilter (>= 5.1.10.23),
collaboraofficebasis5.1-images (>= 5.1.10.23), collaboraofficebasis5.1-impress
(>= 5.1.10.23), collaboraofficebasis5.1-ooofonts (>= 5.1.10.23),
collaboraofficebasis5.1-writer (>= 5.1.10.23), collaboraoffice5.1 (>=
5.1.10.23), collaboraoffice5.1-ure (>= 5.1.10.23),
collaboraofficebasis5.1-en-us (>= 5.1.10.23),
collaboraofficebasis5.1-en-us-calc (>= 5.1.10.23),
collaboraofficebasis5.1-en-us-res (>= 5.1.10.23),
collaboraofficebasis5.1-noto-fonts (>= 5.1.10.23), collaboraofficebasis5.1-draw
(>= 5.1.10.23), collaboraofficebasis5.1-extension-pdf-import (>= 5.1.10.23)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0,
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2,
cpio, collaboraofficebasis5.1-calc (>= 5.1.10.24), collaboraofficebasis5.1-core
(>= 5.1.10.24), collaboraofficebasis5.1-graphicfilter (>= 5.1.10.24),
collaboraofficebasis5.1-images (>= 5.1.10.24), collaboraofficebasis5.1-impress
(>= 5.1.10.24), collaboraofficebasis5.1-ooofonts (>= 5.1.10.24),
collaboraofficebasis5.1-writer (>= 5.1.10.24), collaboraoffice5.1 (>=
5.1.10.24), collaboraoffice5.1-ure (>= 5.1.10.24),
collaboraofficebasis5.1-en-us (>= 5.1.10.24),
collaboraofficebasis5.1-en-us-calc (>= 5.1.10.24),
collaboraofficebasis5.1-en-us-res (>= 5.1.10.24),
collaboraofficebasis5.1-noto-fonts (>= 5.1.10.24), collaboraofficebasis5.1-draw
(>= 5.1.10.24), collaboraofficebasis5.1-extension-pdf-import (>= 5.1.10.24)
Description: LibreOffice On-Line WebSocket Daemon
LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
services.
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index c0e0dee1..a7fa5111 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -27,7 +27,7 @@ BuildRequires: libcap-progs systemd-rpm-macros
%endif
%endif
-Requires: collaboraoffice5.1 >= 5.1.10.23 collaboraoffice5.1-ure >=
5.1.10.23 collaboraofficebasis5.1-core >= 5.1.10.23
collaboraofficebasis5.1-writer >= 5.1.10.23 collaboraofficebasis5.1-impress >=
5.1.10.23 collaboraofficebasis5.1-graphicfilter >= 5.1.10.23
collaboraofficebasis5.1-en-US >= 5.1.10.23 collaboraofficebasis5.1-calc >=
5.1.10.23 collaboraofficebasis5.1-en-US-res >= 5.1.10.23
collaboraofficebasis5.1-en-US-calc >= 5.1.10.23
collaboraofficebasis5.1-ooofonts >= 5.1.10.23 collaboraofficebasis5.1-images >=
5.1.10.23 collaboraofficebasis5.1-noto-fonts >= 5.1.10.23
collaboraofficebasis5.1-draw >= 5.1.10.23
collaboraofficebasis5.1-extension-pdf-import >= 5.1.10.23
+Requires: collaboraoffice5.1 >= 5.1.10.24 collaboraoffice5.1-ure >=
5.1.10.24 collaboraofficebasis5.1-core >= 5.1.10.24
collaboraofficebasis5.1-writer >= 5.1.10.24 collaboraofficebasis5.1-impress >=
5.1.10.24 collaboraofficebasis5.1-graphicfilter >= 5.1.10.24
collaboraofficebasis5.1-en-US >= 5.1.10.24 collaboraofficebasis5.1-calc >=
5.1.10.24 collaboraofficebasis5.1-en-US-res >= 5.1.10.24
collaboraofficebasis5.1-en-US-calc >= 5.1.10.24
collaboraofficebasis5.1-ooofonts >= 5.1.10.24 collaboraofficebasis5.1-images >=
5.1.10.24 collaboraofficebasis5.1-noto-fonts >= 5.1.10.24
collaboraofficebasis5.1-draw >= 5.1.10.24
collaboraofficebasis5.1-extension-pdf-import >= 5.1.10.24
Requires: systemd
Requires(post): coreutils grep sed
%if 0%{?fedora} || 0%{?rhel} >= 7
commit 444358b76028ef2637b771d72c2e022ae1f7a672
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Tue Mar 28 18:47:08 2017 +0530
loleaflet: Prevent hscrollbar coming over context menu
Change-Id: Ie4f0fc67aad64e93fe4abc8ac624decc128f59b0
(cherry picked from commit 9107b012e774e9715b18cda656262a06f2f5319c)
Signed-off-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/loleaflet/src/control/Control.Tabs.js
b/loleaflet/src/control/Control.Tabs.js
index c33495f4..b604c48c 100644
--- a/loleaflet/src/control/Control.Tabs.js
+++ b/loleaflet/src/control/Control.Tabs.js
@@ -70,7 +70,7 @@ L.Control.Tabs = L.Control.extend({
});
}}
},
- zIndex: 10
+ zIndex: 1000
});
map.on('updateparts', this._updateDisabled, this);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
