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

[Andras Timar]

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

New commits:
commit 414020eebadbd4b32d59c64b72fc2e68a02a20b1
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Feb 15 22:26:24 2018 +0100

    Bump version to 3.1.0
    
    Change-Id: I4cfe386fda07aa3073decf0e56fda2fccc79a8b5

diff --git a/configure.ac b/configure.ac
index 94d05087..4921f953 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([loolwsd], [3.0.0], [libreoffice at lists.freedesktop.org])
+AC_INIT([loolwsd], [3.1.0], [libreoffice at lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
diff --git a/debian/changelog b/debian/changelog
index fa54fdcc..cd7ee9d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (3.1.0-1) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool30
+
+ -- Andras Timar <andras.timar at collabora.com>  Thu, 15 Feb 2018 22:00:00 +0100
+
 loolwsd (3.0.0-7) unstable; urgency=medium
 
   * see the git log: http://col.la/cool30
diff --git a/debian/control b/debian/control
index e442d6ee..d6c67ca1 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, fontconfig, libsm6, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, cpio, libcap2-bin, libxcb-render0, libxcb-shm0, collaboraofficebasis5.3-calc (>= 5.3.10.39), collaboraofficebasis5.3-core (>= 5.3.10.39), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.39), collaboraofficebasis5.3-images (>= 5.3.10.39), collaboraofficebasis5.3-impress (>= 5.3.10.39), collaboraofficebasis5.3-ooofonts (>= 5.3.10.39), collaboraofficebasis5.3-writer (>= 5.3.10.39), collaboraoffice5.3 (>= 5.3.10.39), collaboraoffice5.3-ure (>= 5.3.10.39), collaboraofficebasis5.3-en-us (>= 5.3.10.39), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.39), collaboraofficebasis5.3-en-us-res (>= 5.3.10.39), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.39), collaboraofficebasis5.3-draw (>= 5.3.10.39), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.39), collaboraofficebasis5.3-filter-data (>= 5.3.10.39)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, cpio, libcap2-bin, libxcb-render0, libxcb-shm0, collaboraofficebasis5.3-calc (>= 5.3.10.40), collaboraofficebasis5.3-core (>= 5.3.10.40), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.40), collaboraofficebasis5.3-images (>= 5.3.10.40), collaboraofficebasis5.3-impress (>= 5.3.10.40), collaboraofficebasis5.3-ooofonts (>= 5.3.10.40), collaboraofficebasis5.3-writer (>= 5.3.10.40), collaboraoffice5.3 (>= 5.3.10.40), collaboraoffice5.3-ure (>= 5.3.10.40), collaboraofficebasis5.3-en-us (>= 5.3.10.40), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.40), collaboraofficebasis5.3-en-us-res (>= 5.3.10.40), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.40), collaboraofficebasis5.3-draw (>= 5.3.10.40), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.40), collaboraofficebasis5.3-filter-data (>= 5.3.10.40)
 Conflicts: collaboraofficebasis5.3-gnome-integration, collaboraofficebasis5.3-kde-integration
 Description: LibreOffice Online WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index a1524fc3..ae110121 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:           loolwsd%{name_suffix}
 Name:           loolwsd
 %endif
 Version:        @PACKAGE_VERSION@
-Release:        7%{?dist}
+Release:        1%{?dist}
 %if 0%{?suse_version} == 1110
 Group:          Productivity/Office/Suite
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -38,7 +38,7 @@ BuildRequires:  libcap-progs linux-glibc-devel systemd-rpm-macros
 BuildRequires:  libcap-progs
 %endif
 
-Requires:       collaboraoffice5.3 >= 5.3.10.39 collaboraoffice5.3-ure >= 5.3.10.39 collaboraofficebasis5.3-core >= 5.3.10.39 collaboraofficebasis5.3-writer >= 5.3.10.39 collaboraofficebasis5.3-impress >= 5.3.10.39 collaboraofficebasis5.3-graphicfilter >= 5.3.10.39 collaboraofficebasis5.3-en-US >= 5.3.10.39 collaboraofficebasis5.3-calc >= 5.3.10.39 collaboraofficebasis5.3-en-US-res >= 5.3.10.39 collaboraofficebasis5.3-en-US-calc >= 5.3.10.39 collaboraofficebasis5.3-ooofonts >= 5.3.10.39 collaboraofficebasis5.3-images >= 5.3.10.39 collaboraofficebasis5.3-noto-fonts >= 5.3.10.39 collaboraofficebasis5.3-draw >= 5.3.10.39 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.39 collaboraofficebasis5.3-filter-data >= 5.3.10.39
+Requires:       collaboraoffice5.3 >= 5.3.10.40 collaboraoffice5.3-ure >= 5.3.10.40 collaboraofficebasis5.3-core >= 5.3.10.40 collaboraofficebasis5.3-writer >= 5.3.10.40 collaboraofficebasis5.3-impress >= 5.3.10.40 collaboraofficebasis5.3-graphicfilter >= 5.3.10.40 collaboraofficebasis5.3-en-US >= 5.3.10.40 collaboraofficebasis5.3-calc >= 5.3.10.40 collaboraofficebasis5.3-en-US-res >= 5.3.10.40 collaboraofficebasis5.3-en-US-calc >= 5.3.10.40 collaboraofficebasis5.3-ooofonts >= 5.3.10.40 collaboraofficebasis5.3-images >= 5.3.10.40 collaboraofficebasis5.3-noto-fonts >= 5.3.10.40 collaboraofficebasis5.3-draw >= 5.3.10.40 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.40 collaboraofficebasis5.3-filter-data >= 5.3.10.40
 Conflicts:      collaboraofficebasis5.3-kde-integration collaboraofficebasis5.3-gnome-integration
 Requires(post): coreutils grep sed
 %if 0%{?rhel} == 6