diff options
author | Andras Timar <andras.timar@collabora.com> | 2020-12-21 23:19:45 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2020-12-21 23:19:45 +0100 |
commit | 37c53a5949681e454ce30a4026252e7bbc01c1b4 (patch) | |
tree | 9c0b8b40ca59e7ecf196855cb66b169481ef6c13 | |
parent | Bump package version to 4.0.13-1 (diff) | |
download | online-distro/collabora/collabora-online-4-0.tar.gz online-distro/collabora/collabora-online-4-0.zip |
Bump package version to 4.0.14-1
cp-4.0.14-1distro/collabora/collabora-online-4-0
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Ic2573450406e7d8238411b5627615f5735137da7
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | debian/control | 2 | ||||
-rw-r--r-- | loolwsd.spec.in | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index acd75bec1b..2745912b90 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.63]) -AC_INIT([loolwsd], [4.0.13], [libreoffice@lists.freedesktop.org]) +AC_INIT([loolwsd], [4.0.14], [libreoffice@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 4f455e459c..b7340a6092 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +loolwsd (4.0.14-1) unstable; urgency=medium + + * see the git log: https://github.com/CollaboraOnline/online/releases/tag/cp-4.0.14-1 + + -- Andras Timar <andras.timar@collabora.com> Mon, 21 Dec 2020 23:00:00 +0100 + loolwsd (4.0.13-1) unstable; urgency=medium * see the git log: http://col.la/cool40 diff --git a/debian/control b/debian/control index 2f737a721d..692cfc85ed 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-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) +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-20201221), collaboraofficebasis6.0-core (= 6.0.10.29-20201221), collaboraofficebasis6.0-graphicfilter (= 6.0.10.29-20201221), collaboraofficebasis6.0-images (= 6.0.10.29-20201221), collaboraofficebasis6.0-impress (= 6.0.10.29-20201221), collaboraofficebasis6.0-ooofonts (= 6.0.10.29-20201221), collaboraofficebasis6.0-writer (= 6.0.10.29-20201221), collaboraoffice6.0 (= 6.0.10.29-20201221), collaboraoffice6.0-ure (= 6.0.10.29-20201221), collaboraofficebasis6.0-en-us (= 6.0.10.29-20201221), collaboraofficebasis6.0-draw (= 6.0.10.29-20201221), collaboraofficebasis6.0-extension-pdf-import (= 6.0.10.29-20201221), collaboraofficebasis6.0-ooolinguistic (= 6.0.10.29-20201221) 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 f92b5319e6..e4262dd44f 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-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 +Requires: collaboraoffice6.0 = 6.0.10.29-20201221 collaboraoffice6.0-ure = 6.0.10.29-20201221 collaboraofficebasis6.0-core = 6.0.10.29-20201221 collaboraofficebasis6.0-writer = 6.0.10.29-20201221 collaboraofficebasis6.0-impress = 6.0.10.29-20201221 collaboraofficebasis6.0-graphicfilter = 6.0.10.29-20201221 collaboraofficebasis6.0-en-US = 6.0.10.29-20201221 collaboraofficebasis6.0-calc = 6.0.10.29-20201221 collaboraofficebasis6.0-ooofonts = 6.0.10.29-20201221 collaboraofficebasis6.0-images = 6.0.10.29-20201221 collaboraofficebasis6.0-draw = 6.0.10.29-20201221 collaboraofficebasis6.0-extension-pdf-import = 6.0.10.29-20201221 collaboraofficebasis6.0-ooolinguistic = 6.0.10.29-20201221 Conflicts: collaboraofficebasis6.0-kde-integration collaboraofficebasis6.0-gnome-integration Requires(post): coreutils grep sed %if 0%{?rhel} == 6 |