configure.ac | 2 +-
debian/changelog | 6 ++++++
debian/control | 2 +-
loolwsd.spec.in | 2 +-
4 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit a2132266584381c875fa707446417e259753e2f5
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed May 8 17:18:52 2019 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed May 8 17:18:52 2019 +0200
Bump package version to 4.0.4-1
Change-Id: I369a536f2a6ed2ae86a511e00796b82f3613712e
diff --git a/configure.ac b/configure.ac
index 5f60b3d23..ac8f0db37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.63])
-AC_INIT([loolwsd], [4.0.3], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [4.0.4], [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 fcdb70028..3c2b62503 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.0.4-1) unstable; urgency=medium
+
+ * see the git log: http://col.la/cool4
+
+ -- Andras Timar <andras.ti...@collabora.com> Wed, 08 May 2019 13:30:00 +0100
+
loolwsd (4.0.3-1) unstable; urgency=medium
* see the git log: http://col.la/cool4
diff --git a/debian/control b/debian/control
index b105fb301..31ad9acc9 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.27), collaboraofficebasis6.0-core (>=
6.0.10.27), collaboraofficebasis6.0-graphicfilter (>= 6.0.10.27),
collaboraofficebasis6.0-images (>= 6.0.10.27), collaboraofficebasis6.0-impress
(>= 6.0.10.27), collaboraofficebasis6.0-ooofonts (>= 6.0.10.27),
collaboraofficebasis6.0-writer (>= 6.0.10.27), collaboraoffice6.0 (>=
6.0.10.27), collaboraoffice6.0-ure (>= 6.0.10.27),
collaboraofficebasis6.0-en-us (>= 6.0.10.27), collaboraofficebasis6.0-draw (>=
6.0.10.27), collaboraofficebasis6.0-extension-pdf-import (>= 6.0.10.27),
collaboraofficebasis6.0-ooolinguistic (>= 6.0.10.27)
+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), collaboraofficebasis6.0-core (=
6.0.10.29), collaboraofficebasis6.0-graphicfilter (= 6.0.10.29),
collaboraofficebasis6.0-images (= 6.0.10.29), collaboraofficebasis6.0-impress
(= 6.0.10.29), collaboraofficebasis6.0-ooofonts (= 6.0.10.29),
collaboraofficebasis6.0-writer (= 6.0.10.29), collaboraoffice6.0 (= 6.0.10.29),
collaboraoffice6.0-ure (= 6.0.10.29), collaboraofficebasis6.0-en-us (=
6.0.10.29), collaboraofficebasis6.0-draw (= 6.0.10.29),
collaboraofficebasis6.0-extension-pdf-import (= 6.0.10.29),
collaboraofficebasis6.0-ooolinguistic (= 6.0.10.29)
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 2e142b093..f6133159d 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -38,7 +38,7 @@ BuildRequires: libcap-progs linux-glibc-devel
systemd-rpm-macros python-polib
BuildRequires: libcap-progs
%endif
-Requires: collaboraoffice6.0 >= 6.0.10.27 collaboraoffice6.0-ure >=
6.0.10.27 collaboraofficebasis6.0-core >= 6.0.10.27
collaboraofficebasis6.0-writer >= 6.0.10.27 collaboraofficebasis6.0-impress >=
6.0.10.27 collaboraofficebasis6.0-graphicfilter >= 6.0.10.27
collaboraofficebasis6.0-en-US >= 6.0.10.27 collaboraofficebasis6.0-calc >=
6.0.10.27 collaboraofficebasis6.0-ooofonts >= 6.0.10.27
collaboraofficebasis6.0-images >= 6.0.10.27 collaboraofficebasis6.0-draw >=
6.0.10.27 collaboraofficebasis6.0-extension-pdf-import >= 6.0.10.27
collaboraofficebasis6.0-ooolinguistic >= 6.0.10.27
+Requires: collaboraoffice6.0 = 6.0.10.29 collaboraoffice6.0-ure =
6.0.10.29 collaboraofficebasis6.0-core = 6.0.10.29
collaboraofficebasis6.0-writer = 6.0.10.29 collaboraofficebasis6.0-impress =
6.0.10.29 collaboraofficebasis6.0-graphicfilter = 6.0.10.29
collaboraofficebasis6.0-en-US = 6.0.10.29 collaboraofficebasis6.0-calc =
6.0.10.29 collaboraofficebasis6.0-ooofonts = 6.0.10.29
collaboraofficebasis6.0-images = 6.0.10.29 collaboraofficebasis6.0-draw =
6.0.10.29 collaboraofficebasis6.0-extension-pdf-import = 6.0.10.29
collaboraofficebasis6.0-ooolinguistic = 6.0.10.29
Conflicts: collaboraofficebasis6.0-kde-integration
collaboraofficebasis6.0-gnome-integration
Requires(post): coreutils grep sed
%if 0%{?rhel} == 6
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
