[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
Tue Feb 5 10:55:59 UTC 2019
configure.ac | 2 +-
debian/changelog | 6 ++++++
debian/control | 4 ++--
loolwsd.spec.in | 2 +-
4 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 0f826534a35fb231285722aba92c7777e6620aee
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Tue Feb 5 11:55:15 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Feb 5 11:55:15 2019 +0100
Bump package version to 3.4.3-1 and updated dependencies
Change-Id: I34407a0debe699840b1a3e2b7c8a10104925078b
diff --git a/configure.ac b/configure.ac
index 495767fcf..b1f54a955 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.63])
-AC_INIT([loolwsd], [3.4.2], [libreoffice at lists.freedesktop.org])
+AC_INIT([loolwsd], [3.4.3], [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 52b0fe6f7..aad29b23a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (3.4.3-1) unstable; urgency=medium
+
+ * see the git log: http://col.la/cool3
+
+ -- Andras Timar <andras.timar at collabora.com> Tue, 05 Feb 2019 10:30:00 +0100
+
loolwsd (3.4.2-1) unstable; urgency=medium
* see the git log: http://col.la/cool3
diff --git a/debian/control b/debian/control
index e746aa631..00c38b69d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: loolwsd
Section: web
Priority: optional
Maintainer: Andras Timar <andras.timar at collabora.com>
-Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.5)
+Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.5), linux-libc-dev, nodejs, python-polib, python-lxml, fontconfig, libpam-dev, libcppunit-dev, pkg-config, devscripts
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.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)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libsm6, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, libxcb-render0, libxcb-shm0, locales-all, adduser, expat, fontconfig, cpio, libcap2-bin, collaboraofficebasis5.3-calc (>= 5.3.10.62), collaboraofficebasis5.3-core (>= 5.3.10.62), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.62), collaboraofficebasis5.3-images (>= 5.3.10.62), collaboraofficebasis5.3-impress (>= 5.3.10.62), collaboraofficebasis5.3-ooofonts (>= 5.3.10.62), collaboraofficebasis5.3-writer (>= 5.3.10.62), collaboraoffice5.3 (>= 5.3.10.62), collaboraoffice5.3-ure (>= 5.3.10.62), collaboraofficebasis5.3-en-us (>= 5.3.10.62), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.62), collaboraofficebasis5.3-en-us-res (>= 5.3.10.62), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.62), collaboraofficebasis5.3-draw (>= 5.3.10.62), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.62), collaboraofficebasis5.3-filter-data (>= 5.3.10.62), collaboraofficebasis5.3-ooolinguisti
c (>= 5.3.10.62), collaboraoffice5.3-dict-en (>= 5.3.10.62)
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 b2002f332..a02960c11 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.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
+Requires: collaboraoffice5.3 >= 5.3.10.62 collaboraoffice5.3-ure >= 5.3.10.62 collaboraofficebasis5.3-core >= 5.3.10.62 collaboraofficebasis5.3-writer >= 5.3.10.62 collaboraofficebasis5.3-impress >= 5.3.10.62 collaboraofficebasis5.3-graphicfilter >= 5.3.10.62 collaboraofficebasis5.3-en-US >= 5.3.10.62 collaboraofficebasis5.3-calc >= 5.3.10.62 collaboraofficebasis5.3-en-US-res >= 5.3.10.62 collaboraofficebasis5.3-en-US-calc >= 5.3.10.62 collaboraofficebasis5.3-ooofonts >= 5.3.10.62 collaboraofficebasis5.3-images >= 5.3.10.62 collaboraofficebasis5.3-noto-fonts >= 5.3.10.62 collaboraofficebasis5.3-draw >= 5.3.10.62 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.62 collaboraofficebasis5.3-filter-data >= 5.3.10.62 collaboraofficebasis5.3-ooolinguistic >= 5.3.10.62
Conflicts: collaboraofficebasis5.3-kde-integration collaboraofficebasis5.3-gnome-integration
Requires(post): coreutils grep sed
%if 0%{?rhel} == 6
More information about the Libreoffice-commits
mailing list