diff options
author | Andras Timar <andras.timar@collabora.com> | 2020-01-20 23:30:44 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2020-01-20 23:32:19 +0100 |
commit | 5d6ea523d81d010d18ca5b5fcad497278c62729b (patch) | |
tree | 9ddf9e1eefed9cbfdafb2a8266d7577c492ae6c4 | |
parent | 3de6e2b2ee363da30484e2aabc0a6ddef26aa5a3 (diff) |
Bump package version to 4.0.10-1cp-4.0.10-1
Change-Id: I21933dd3540f51ca044d140dae6bc862e5199612
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | debian/control | 2 | ||||
-rw-r--r-- | loolwsd.spec.in | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 35846f279..c09112c22 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.63]) -AC_INIT([loolwsd], [4.0.9], [libreoffice@lists.freedesktop.org]) +AC_INIT([loolwsd], [4.0.10], [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 8e5c51ae7..491eab45e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +loolwsd (4.0.10-1) unstable; urgency=medium + + * see the git log: http://col.la/cool40 + + -- Andras Timar <andras.timar@collabora.com> Mon, 20 Jan 2020 23:29:00 +0100 + loolwsd (4.0.9-4) unstable; urgency=medium * see the git log: http://col.la/cool40 diff --git a/debian/control b/debian/control index aac247a55..5de880417 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-20191127), collaboraofficebasis6.0-core (= 6.0.10.29-20191127), collaboraofficebasis6.0-graphicfilter (= 6.0.10.29-20191127), collaboraofficebasis6.0-images (= 6.0.10.29-20191127), collaboraofficebasis6.0-impress (= 6.0.10.29-20191127), collaboraofficebasis6.0-ooofonts (= 6.0.10.29-20191127), collaboraofficebasis6.0-writer (= 6.0.10.29-20191127), collaboraoffice6.0 (= 6.0.10.29-20191127), collaboraoffice6.0-ure (= 6.0.10.29-20191127), collaboraofficebasis6.0-en-us (= 6.0.10.29-20191127), collaboraofficebasis6.0-draw (= 6.0.10.29-20191127), collaboraofficebasis6.0-extension-pdf-import (= 6.0.10.29-20191127), collaboraofficebasis6.0-ooolinguistic (= 6.0.10.29-20191127) +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-20200120), collaboraofficebasis6.0-core (= 6.0.10.29-20200120), collaboraofficebasis6.0-graphicfilter (= 6.0.10.29-20200120), collaboraofficebasis6.0-images (= 6.0.10.29-20200120), collaboraofficebasis6.0-impress (= 6.0.10.29-20200120), collaboraofficebasis6.0-ooofonts (= 6.0.10.29-20200120), collaboraofficebasis6.0-writer (= 6.0.10.29-20200120), collaboraoffice6.0 (= 6.0.10.29-20200120), collaboraoffice6.0-ure (= 6.0.10.29-20200120), collaboraofficebasis6.0-en-us (= 6.0.10.29-20200120), collaboraofficebasis6.0-draw (= 6.0.10.29-20200120), collaboraofficebasis6.0-extension-pdf-import (= 6.0.10.29-20200120), collaboraofficebasis6.0-ooolinguistic (= 6.0.10.29-20200120) 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 098c56f8a..e9ea27f38 100644 --- a/loolwsd.spec.in +++ b/loolwsd.spec.in @@ -12,7 +12,7 @@ Name: loolwsd%{name_suffix} Name: loolwsd %endif Version: @PACKAGE_VERSION@ -Release: 4%{?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: collaboraoffice6.0 = 6.0.10.29-20191127 collaboraoffice6.0-ure = 6.0.10.29-20191127 collaboraofficebasis6.0-core = 6.0.10.29-20191127 collaboraofficebasis6.0-writer = 6.0.10.29-20191127 collaboraofficebasis6.0-impress = 6.0.10.29-20191127 collaboraofficebasis6.0-graphicfilter = 6.0.10.29-20191127 collaboraofficebasis6.0-en-US = 6.0.10.29-20191127 collaboraofficebasis6.0-calc = 6.0.10.29-20191127 collaboraofficebasis6.0-ooofonts = 6.0.10.29-20191127 collaboraofficebasis6.0-images = 6.0.10.29-20191127 collaboraofficebasis6.0-draw = 6.0.10.29-20191127 collaboraofficebasis6.0-extension-pdf-import = 6.0.10.29-20191127 collaboraofficebasis6.0-ooolinguistic = 6.0.10.29-20191127 +Requires: collaboraoffice6.0 = 6.0.10.29-20200120 collaboraoffice6.0-ure = 6.0.10.29-20200120 collaboraofficebasis6.0-core = 6.0.10.29-20200120 collaboraofficebasis6.0-writer = 6.0.10.29-20200120 collaboraofficebasis6.0-impress = 6.0.10.29-20200120 collaboraofficebasis6.0-graphicfilter = 6.0.10.29-20200120 collaboraofficebasis6.0-en-US = 6.0.10.29-20200120 collaboraofficebasis6.0-calc = 6.0.10.29-20200120 collaboraofficebasis6.0-ooofonts = 6.0.10.29-20200120 collaboraofficebasis6.0-images = 6.0.10.29-20200120 collaboraofficebasis6.0-draw = 6.0.10.29-20200120 collaboraofficebasis6.0-extension-pdf-import = 6.0.10.29-20200120 collaboraofficebasis6.0-ooolinguistic = 6.0.10.29-20200120 Conflicts: collaboraofficebasis6.0-kde-integration collaboraofficebasis6.0-gnome-integration Requires(post): coreutils grep sed %if 0%{?rhel} == 6 |