[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4-0' - configure.ac debian/changelog debian/control loolwsd.spec.in
Andras Timar (via logerrit)
logerrit at kemper.freedesktop.org
Mon Jan 20 22:33:00 UTC 2020
configure.ac | 2 +-
debian/changelog | 6 ++++++
debian/control | 2 +-
loolwsd.spec.in | 4 ++--
4 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 5d6ea523d81d010d18ca5b5fcad497278c62729b
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Jan 20 23:30:44 2020 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Jan 20 23:32:19 2020 +0100
Bump package version to 4.0.10-1
Change-Id: I21933dd3540f51ca044d140dae6bc862e5199612
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 at lists.freedesktop.org])
+AC_INIT([loolwsd], [4.0.10], [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 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 at 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
More information about the Libreoffice-commits
mailing list