[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - configure.ac debian/changelog debian/control loleaflet/Makefile loolwsd.spec.in

Wed Dec 14 10:33:39 UTC 2016

configure.ac       |    2 +-
 debian/changelog   |    6 ++++++
 debian/control     |    2 +-
 loleaflet/Makefile |    2 +-
 loolwsd.spec.in    |    2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit ae661f86bbd80da39f0f46f3bcc503bbc0e44451
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Dec 14 11:33:12 2016 +0100

    Bump version to 2.0.1
    
    Change-Id: I965a55f4622666e1a434599f3e2b08a58f912203

diff --git a/configure.ac b/configure.ac
index c08025b..af85b90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [2.0.0], [libreoffice at lists.freedesktop.org])
+AC_INIT([loolwsd], [2.0.1], [libreoffice at 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 40fda22..babec6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (2.0.1-1) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool20
+
+ -- Andras Timar <andras.timar at collabora.com>  Tue, 20 Dec 2016 11:40:00 +0100
+
 loolwsd (2.0.0-1) unstable; urgency=medium
 
   * see the git log: http://col.la/cool20
diff --git a/debian/control b/debian/control
index 122e37f..df54dac 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 (>= 5.1.10.14), collaboraofficebasis5.1-calc (>= 5.1.10.14), collaboraofficebasis5.1-core (>= 5.1.10.14), collaboraofficebasis5.1-draw (>= 5.1.10.14), collaboraofficebasis5.1-extension-beanshell-script-provider (>= 5.1.10.14), collaboraofficebasis5.1-extension-ct2n (>= 5.1.10.14), collaboraofficebasis5.1-extension-javascript-script-provider (>= 5.1.10.14), collaboraofficebasis5.1-extension-mediawiki-publisher (>= 5.1.10.14), collaboraofficebasis5.1-extension-nlpsolver (>= 5.1.10.14), collaboraofficebasis5.1-extension-numbertext (>= 5.1.10.14), collaboraofficebasis5.1-extension-pdf-import (>= 5.1.10.14), collaboraofficebasis5.1-extension-report-builder (>= 5.1.10.14), collaboraofficebasis5.1-gnome-integration (>= 5.1.10.14), collaboraofficebasis5.1-graphicfilter (>= 5.1.10.14), collaboraofficebasi
 s5.1-images (>= 5.1.10.14), collaboraofficebasis5.1-impress (>= 5.1.10.14), collaboraofficebasis5.1-librelogo (>= 5.1.10.14), collaboraofficebasis5.1-math (>= 5.1.10.14), collaboraofficebasis5.1-ogltrans (>= 5.1.10.14), collaboraofficebasis5.1-ooofonts (>= 5.1.10.14), collaboraofficebasis5.1-ooolinguistic (>= 5.1.10.14), collaboraofficebasis5.1-postgresql-sdbc (>= 5.1.10.14), collaboraofficebasis5.1-python-script-provider (>= 5.1.10.14), collaboraofficebasis5.1-pyuno (>= 5.1.10.14), collaboraofficebasis5.1-writer (>= 5.1.10.14), collaboraofficebasis5.1-xsltfilter (>= 5.1.10.14), collaboraoffice5.1 (>= 5.1.10.14), collaboraoffice5.1-base (>= 5.1.10.14), collaboraoffice5.1-calc (>= 5.1.10.14), collaboraoffice5.1-dict-en (>= 5.1.10.14), collaboraoffice5.1-draw (>= 5.1.10.14), collaboraoffice5.1-debian-menus, collaboraoffice5.1-impress (>= 5.1.10.14), collaboraoffice5.1-math (>= 5.1.10.14), collaboraoffice5.1-ure (>= 5.1.10.14), collaboraoffice5.1-writer (>= 5.1.10.14), collaboraofficeb
 asis5.1-en-us (>= 5.1.10.14), collaboraofficebasis5.1-en-us-base (>= 5.1.10.14), collaboraofficebasis5.1-en-us-calc (>= 5.1.10.14), collaboraofficebasis5.1-en-us-math (>= 5.1.10.14), collaboraofficebasis5.1-en-us-res (>= 5.1.10.14), collaboraofficebasis5.1-en-us-writer (>= 5.1.10.14), collaboraoffice5.1-en-us (>= 5.1.10.14), collaboraofficebasis5.1-noto-fonts (>= 5.1.10.14)
+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 (>= 5.1.10.15), collaboraofficebasis5.1-calc (>= 5.1.10.15), collaboraofficebasis5.1-core (>= 5.1.10.15), collaboraofficebasis5.1-draw (>= 5.1.10.15), collaboraofficebasis5.1-extension-beanshell-script-provider (>= 5.1.10.15), collaboraofficebasis5.1-extension-ct2n (>= 5.1.10.15), collaboraofficebasis5.1-extension-javascript-script-provider (>= 5.1.10.15), collaboraofficebasis5.1-extension-mediawiki-publisher (>= 5.1.10.15), collaboraofficebasis5.1-extension-nlpsolver (>= 5.1.10.15), collaboraofficebasis5.1-extension-numbertext (>= 5.1.10.15), collaboraofficebasis5.1-extension-pdf-import (>= 5.1.10.15), collaboraofficebasis5.1-extension-report-builder (>= 5.1.10.15), collaboraofficebasis5.1-gnome-integration (>= 5.1.10.15), collaboraofficebasis5.1-graphicfilter (>= 5.1.10.15), collaboraofficebasi
 s5.1-images (>= 5.1.10.15), collaboraofficebasis5.1-impress (>= 5.1.10.15), collaboraofficebasis5.1-librelogo (>= 5.1.10.15), collaboraofficebasis5.1-math (>= 5.1.10.15), collaboraofficebasis5.1-ogltrans (>= 5.1.10.15), collaboraofficebasis5.1-ooofonts (>= 5.1.10.15), collaboraofficebasis5.1-ooolinguistic (>= 5.1.10.15), collaboraofficebasis5.1-postgresql-sdbc (>= 5.1.10.15), collaboraofficebasis5.1-python-script-provider (>= 5.1.10.15), collaboraofficebasis5.1-pyuno (>= 5.1.10.15), collaboraofficebasis5.1-writer (>= 5.1.10.15), collaboraofficebasis5.1-xsltfilter (>= 5.1.10.15), collaboraoffice5.1 (>= 5.1.10.15), collaboraoffice5.1-base (>= 5.1.10.15), collaboraoffice5.1-calc (>= 5.1.10.15), collaboraoffice5.1-dict-en (>= 5.1.10.15), collaboraoffice5.1-draw (>= 5.1.10.15), collaboraoffice5.1-debian-menus, collaboraoffice5.1-impress (>= 5.1.10.15), collaboraoffice5.1-math (>= 5.1.10.15), collaboraoffice5.1-ure (>= 5.1.10.15), collaboraoffice5.1-writer (>= 5.1.10.15), collaboraofficeb
 asis5.1-en-us (>= 5.1.10.15), collaboraofficebasis5.1-en-us-base (>= 5.1.10.15), collaboraofficebasis5.1-en-us-calc (>= 5.1.10.15), collaboraofficebasis5.1-en-us-math (>= 5.1.10.15), collaboraofficebasis5.1-en-us-res (>= 5.1.10.15), collaboraofficebasis5.1-en-us-writer (>= 5.1.10.15), collaboraoffice5.1-en-us (>= 5.1.10.15), collaboraofficebasis5.1-noto-fonts (>= 5.1.10.15)
 Description: LibreOffice On-Line WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
  services.
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 917eaf4..7615e05 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.0
+VERSION=2.0.1
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 7e794d9..ac82d2a 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.14 collaboraoffice5.1-en-US >= 5.1.10.14 collaboraoffice5.1-ure >= 5.1.10.14 collaboraofficebasis5.1-core >= 5.1.10.14 collaboraofficebasis5.1-writer >= 5.1.10.14 collaboraofficebasis5.1-impress >= 5.1.10.14 collaboraofficebasis5.1-graphicfilter >= 5.1.10.14 collaboraofficebasis5.1-en-US >= 5.1.10.14 collaboraofficebasis5.1-calc >= 5.1.10.14 collaboraofficebasis5.1-en-US-res >= 5.1.10.14 collaboraofficebasis5.1-en-US-calc >= 5.1.10.14 collaboraofficebasis5.1-ooofonts >= 5.1.10.14 collaboraofficebasis5.1-images >= 5.1.10.14 collaboraofficebasis5.1-filter-data >= 5.1.10.14 collaboraofficebasis5.1-draw >= 5.1.10.14 collaboraofficebasis5.1-base >= 5.1.10.14 collaboraofficebasis5.1-en-US-writer >= 5.1.10.14 collaboraofficebasis5.1-en-US-math >= 5.1.10.14 collaboraofficebasis5.1-en-US-base >= 5.1.10.14 collaboraofficebasis5.1-noto-fonts >= 5.1.10.14
+Requires:       collaboraoffice5.1 >= 5.1.10.15 collaboraoffice5.1-en-US >= 5.1.10.15 collaboraoffice5.1-ure >= 5.1.10.15 collaboraofficebasis5.1-core >= 5.1.10.15 collaboraofficebasis5.1-writer >= 5.1.10.15 collaboraofficebasis5.1-impress >= 5.1.10.15 collaboraofficebasis5.1-graphicfilter >= 5.1.10.15 collaboraofficebasis5.1-en-US >= 5.1.10.15 collaboraofficebasis5.1-calc >= 5.1.10.15 collaboraofficebasis5.1-en-US-res >= 5.1.10.15 collaboraofficebasis5.1-en-US-calc >= 5.1.10.15 collaboraofficebasis5.1-ooofonts >= 5.1.10.15 collaboraofficebasis5.1-images >= 5.1.10.15 collaboraofficebasis5.1-filter-data >= 5.1.10.15 collaboraofficebasis5.1-draw >= 5.1.10.15 collaboraofficebasis5.1-base >= 5.1.10.15 collaboraofficebasis5.1-en-US-writer >= 5.1.10.15 collaboraofficebasis5.1-en-US-math >= 5.1.10.15 collaboraofficebasis5.1-en-US-base >= 5.1.10.15 collaboraofficebasis5.1-noto-fonts >= 5.1.10.15
 Requires:       systemd
 Requires(post): coreutils grep sed
 %if 0%{?fedora} || 0%{?rhel} >= 7
