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

[Andras Timar (via logerrit)]

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

New commits:
commit e7bbd765ee3954bb1b037fc27849a8f0d9a99ed3
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Sep 2 12:01:43 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Sep 2 12:01:43 2020 +0200

    Bump package version to 4.0.12-1
    
    Change-Id: Ia6babe4ec988705090b9d0c95cc93b6a037de0b9

diff --git a/configure.ac b/configure.ac
index 4d1595b55..da06a9ed1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([loolwsd], [4.0.11], [libreoffice at lists.freedesktop.org])
+AC_INIT([loolwsd], [4.0.12], [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 fb3ecbf4a..12563bedf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.0.12-1) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool40
+
+ -- Andras Timar <andras.timar at collabora.com>  Wed, 02 Sep 2020 12:00:00 +0200
+
 loolwsd (4.0.11-1) unstable; urgency=medium
 
   * see the git log: http://col.la/cool40
diff --git a/debian/control b/debian/control
index 336af31d8..2f737a721 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}, libsm6, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, libxcb-render0, libxcb-shm0, locales-all, adduser, expat, fontconfig, cpio, libcap2-bin, collaboraofficebasis6.0-calc (= 6.0.10.29-20200312), collaboraofficebasis6.0-core (= 6.0.10.29-20200312), collaboraofficebasis6.0-graphicfilter (= 6.0.10.29-20200312), collaboraofficebasis6.0-images (= 6.0.10.29-20200312), collaboraofficebasis6.0-impress (= 6.0.10.29-20200312), collaboraofficebasis6.0-ooofonts (= 6.0.10.29-20200312), collaboraofficebasis6.0-writer (= 6.0.10.29-20200312), collaboraoffice6.0 (= 6.0.10.29-20200312), collaboraoffice6.0-ure (= 6.0.10.29-20200312), collaboraofficebasis6.0-en-us (= 6.0.10.29-20200312), collaboraofficebasis6.0-draw (= 6.0.10.29-20200312), collaboraofficebasis6.0-extension-pdf-import (= 6.0.10.29-20200312), collaboraofficebasis6.0-ooolinguistic (= 6.0.10.29-20200312)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libsm6, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, libxcb-render0, libxcb-shm0, locales-all, adduser, expat, fontconfig, cpio, libcap2-bin, collaboraofficebasis6.0-calc (= 6.0.10.29-20200902), collaboraofficebasis6.0-core (= 6.0.10.29-20200902), collaboraofficebasis6.0-graphicfilter (= 6.0.10.29-20200902), collaboraofficebasis6.0-images (= 6.0.10.29-20200902), collaboraofficebasis6.0-impress (= 6.0.10.29-20200902), collaboraofficebasis6.0-ooofonts (= 6.0.10.29-20200902), collaboraofficebasis6.0-writer (= 6.0.10.29-20200902), collaboraoffice6.0 (= 6.0.10.29-20200902), collaboraoffice6.0-ure (= 6.0.10.29-20200902), collaboraofficebasis6.0-en-us (= 6.0.10.29-20200902), collaboraofficebasis6.0-draw (= 6.0.10.29-20200902), collaboraofficebasis6.0-extension-pdf-import (= 6.0.10.29-20200902), collaboraofficebasis6.0-ooolinguistic (= 6.0.10.29-20200902)
 Conflicts: collaboraofficebasis6.0-gnome-integration, collaboraofficebasis6.0-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 5e7a9302c..f92b5319e 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -38,7 +38,7 @@ BuildRequires:  libcap-progs linux-glibc-devel systemd-rpm-macros
 BuildRequires:  libcap-progs
 %endif
 
-Requires:       collaboraoffice6.0 = 6.0.10.29-20200312 collaboraoffice6.0-ure = 6.0.10.29-20200312 collaboraofficebasis6.0-core = 6.0.10.29-20200312 collaboraofficebasis6.0-writer = 6.0.10.29-20200312 collaboraofficebasis6.0-impress = 6.0.10.29-20200312 collaboraofficebasis6.0-graphicfilter = 6.0.10.29-20200312 collaboraofficebasis6.0-en-US = 6.0.10.29-20200312 collaboraofficebasis6.0-calc = 6.0.10.29-20200312 collaboraofficebasis6.0-ooofonts = 6.0.10.29-20200312 collaboraofficebasis6.0-images = 6.0.10.29-20200312 collaboraofficebasis6.0-draw = 6.0.10.29-20200312 collaboraofficebasis6.0-extension-pdf-import = 6.0.10.29-20200312 collaboraofficebasis6.0-ooolinguistic = 6.0.10.29-20200312
+Requires:       collaboraoffice6.0 = 6.0.10.29-20200902 collaboraoffice6.0-ure = 6.0.10.29-20200902 collaboraofficebasis6.0-core = 6.0.10.29-20200902 collaboraofficebasis6.0-writer = 6.0.10.29-20200902 collaboraofficebasis6.0-impress = 6.0.10.29-20200902 collaboraofficebasis6.0-graphicfilter = 6.0.10.29-20200902 collaboraofficebasis6.0-en-US = 6.0.10.29-20200902 collaboraofficebasis6.0-calc = 6.0.10.29-20200902 collaboraofficebasis6.0-ooofonts = 6.0.10.29-20200902 collaboraofficebasis6.0-images = 6.0.10.29-20200902 collaboraofficebasis6.0-draw = 6.0.10.29-20200902 collaboraofficebasis6.0-extension-pdf-import = 6.0.10.29-20200902 collaboraofficebasis6.0-ooolinguistic = 6.0.10.29-20200902
 Conflicts:      collaboraofficebasis6.0-kde-integration collaboraofficebasis6.0-gnome-integration
 Requires(post): coreutils grep sed
 %if 0%{?rhel} == 6