[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - configure.ac debian/changelog debian/control loolwsd.spec.in
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Nov 29 14:37:43 UTC 2018
configure.ac | 2 +-
debian/changelog | 6 ++++++
debian/control | 2 +-
loolwsd.spec.in | 4 ++--
4 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit e503dc1c82fd33f3191824f694b55fccc217e8da
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Nov 29 15:37:19 2018 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Nov 29 15:37:19 2018 +0100
Bump package version to 3.4.2-1
Change-Id: I6287e625e8049a9962ef64bb01d6ba0a783f24e7
diff --git a/configure.ac b/configure.ac
index c213ed383..495767fcf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.63])
-AC_INIT([loolwsd], [3.4.1], [libreoffice at lists.freedesktop.org])
+AC_INIT([loolwsd], [3.4.2], [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 9f2e76230..52b0fe6f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (3.4.2-1) unstable; urgency=medium
+
+ * see the git log: http://col.la/cool3
+
+ -- Andras Timar <andras.timar at collabora.com> Thu, 29 Nov 2018 15:30:00 +0100
+
loolwsd (3.4.1-1) unstable; urgency=medium
* see the git log: http://col.la/cool3
diff --git a/debian/control b/debian/control
index 4a3ad193f..e746aa631 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}, adduser, fontconfig, libsm6, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, cpio, libcap2-bin, libxcb-render0, libxcb-shm0, collaboraofficebasis5.3-calc (>= 5.3.10.60), collaboraofficebasis5.3-core (>= 5.3.10.60), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.60), collaboraofficebasis5.3-images (>= 5.3.10.60), collaboraofficebasis5.3-impress (>= 5.3.10.60), collaboraofficebasis5.3-ooofonts (>= 5.3.10.60), collaboraofficebasis5.3-writer (>= 5.3.10.60), collaboraoffice5.3 (>= 5.3.10.60), collaboraoffice5.3-ure (>= 5.3.10.60), collaboraofficebasis5.3-en-us (>= 5.3.10.60), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.60), collaboraofficebasis5.3-en-us-res (>= 5.3.10.60), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.60), collaboraofficebasis5.3-draw (>= 5.3.10.60), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.60), collaboraofficebasis5.3-filter-data (>= 5.3.10.60), collaboraofficebasis5.3-ooolinguistic (>= 5.3.10.60)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, cpio, libcap2-bin, libxcb-render0, libxcb-shm0, collaboraofficebasis5.3-calc (>= 5.3.10.61), collaboraofficebasis5.3-core (>= 5.3.10.61), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.61), collaboraofficebasis5.3-images (>= 5.3.10.61), collaboraofficebasis5.3-impress (>= 5.3.10.61), collaboraofficebasis5.3-ooofonts (>= 5.3.10.61), collaboraofficebasis5.3-writer (>= 5.3.10.61), collaboraoffice5.3 (>= 5.3.10.61), collaboraoffice5.3-ure (>= 5.3.10.61), collaboraofficebasis5.3-en-us (>= 5.3.10.61), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.61), collaboraofficebasis5.3-en-us-res (>= 5.3.10.61), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.61), collaboraofficebasis5.3-draw (>= 5.3.10.61), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.61), collaboraofficebasis5.3-filter-data (>= 5.3.10.61), collaboraofficebasis5.3-ooolinguistic (>= 5.3.10.61)
Conflicts: collaboraofficebasis5.3-gnome-integration, collaboraofficebasis5.3-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 8bbc5325c..b2002f332 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: collaboraoffice5.3 >= 5.3.10.60 collaboraoffice5.3-ure >= 5.3.10.60 collaboraofficebasis5.3-core >= 5.3.10.60 collaboraofficebasis5.3-writer >= 5.3.10.60 collaboraofficebasis5.3-impress >= 5.3.10.60 collaboraofficebasis5.3-graphicfilter >= 5.3.10.60 collaboraofficebasis5.3-en-US >= 5.3.10.60 collaboraofficebasis5.3-calc >= 5.3.10.60 collaboraofficebasis5.3-en-US-res >= 5.3.10.60 collaboraofficebasis5.3-en-US-calc >= 5.3.10.60 collaboraofficebasis5.3-ooofonts >= 5.3.10.60 collaboraofficebasis5.3-images >= 5.3.10.60 collaboraofficebasis5.3-noto-fonts >= 5.3.10.60 collaboraofficebasis5.3-draw >= 5.3.10.60 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.60 collaboraofficebasis5.3-filter-data >= 5.3.10.60 collaboraofficebasis5.3-ooolinguistic >= 5.3.10.60
+Requires: collaboraoffice5.3 >= 5.3.10.61 collaboraoffice5.3-ure >= 5.3.10.61 collaboraofficebasis5.3-core >= 5.3.10.61 collaboraofficebasis5.3-writer >= 5.3.10.61 collaboraofficebasis5.3-impress >= 5.3.10.61 collaboraofficebasis5.3-graphicfilter >= 5.3.10.61 collaboraofficebasis5.3-en-US >= 5.3.10.61 collaboraofficebasis5.3-calc >= 5.3.10.61 collaboraofficebasis5.3-en-US-res >= 5.3.10.61 collaboraofficebasis5.3-en-US-calc >= 5.3.10.61 collaboraofficebasis5.3-ooofonts >= 5.3.10.61 collaboraofficebasis5.3-images >= 5.3.10.61 collaboraofficebasis5.3-noto-fonts >= 5.3.10.61 collaboraofficebasis5.3-draw >= 5.3.10.61 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.61 collaboraofficebasis5.3-filter-data >= 5.3.10.61 collaboraofficebasis5.3-ooolinguistic >= 5.3.10.61
Conflicts: collaboraofficebasis5.3-kde-integration collaboraofficebasis5.3-gnome-integration
Requires(post): coreutils grep sed
%if 0%{?rhel} == 6
@@ -66,7 +66,7 @@ Requires: libcap2 libpng12-0 %{fillup_prereq}
%if 0%{?suse_version} >= 1300
Requires: systemd
Requires: libopenssl1_0_0 libpcre1 libz1
-Requires: libPocoCrypto60 >= 1.9.0 libPocoFoundation60 >= 1.9.0 libPocoJSON60 >= 1.9.0 libPocoNet60 >= 1.9.0 libPocoNetSSL60 >= 1.9.0 libPocoUtil60 >= 1.9.0 libPocoXML60 >= 1.9.0
+Requires: libPocoCrypto61 >= 1.9.0 libPocoFoundation61 >= 1.9.0 libPocoJSON61 >= 1.9.0 libPocoNet61 >= 1.9.0 libPocoNetSSL61 >= 1.9.0 libPocoUtil61 >= 1.9.0 libPocoXML61 >= 1.9.0
# Collabora Office dependencies (unfortunately Collabora Office RPM packages do not have real dependencies)
# cd /opt/collaboraoffice5.3/program ; for i in soffice.bin *.so ;do ldd $i | grep '=>' | sed -e "s/^.*=> //" -e "s/ [(].*$//"; done | sort | uniq | xargs rpm -qf --qf="%{NAME}\n" | sort | uniq | grep -v collaboraoffice
Requires: Mesa-libGL1 Mesa-libglapi0 cups-libs fontconfig krb5 libavahi-client3 libavahi-common3 libavahi-glib1 libbz2-1 libcom_err2 libdbus-1-3 libdrm2 libexpat1 libfreetype6 libkeyutils1 libpng16-16 libuuid1 libICE6 libselinux1 libSM6 libX11-6 libX11-xcb1 libXau6 libxcb1 libxcb-dri2-0 libxcb-dri3-0 libxcb-glx0 libxcb-present0 libxcb-render0 libxcb-shm0 libxcb-sync1 libXdamage1 libXext6 libXfixes3 libXrender1 libxshmfence1 libXxf86vm1
More information about the Libreoffice-commits
mailing list