[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-4' - debian/changelog debian/control loolwsd.spec.in
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Sep 13 19:24:11 UTC 2018
debian/changelog | 12 +++++++++---
debian/control | 2 +-
loolwsd.spec.in | 4 ++--
3 files changed, 12 insertions(+), 6 deletions(-)
New commits:
commit 0b967e8be148a1441372fd312918bfe04a24b4fc
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Sep 13 21:23:42 2018 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Sep 13 21:23:42 2018 +0200
Bump package version to 3.4.0-4
Change-Id: I806a95b2f0a27e34300ef9943b900f4621ffdd5e
diff --git a/debian/changelog b/debian/changelog
index e2b92dfaf..8bbcd69f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,24 @@
+loolwsd (3.4.0-4) unstable; urgency=medium
+
+ * see the git log: http://col.la/coolcd34
+
+ -- Andras Timar <andras.timar at collabora.com> Thu, 13 Sep 2018 20:30:00 +0200
+
loolwsd (3.4.0-3) unstable; urgency=medium
- * see the git log: http://col.la/cool3
+ * see the git log: http://col.la/coolcd34
-- Andras Timar <andras.timar at collabora.com> Fri, 30 Aug 2018 08:30:00 +0200
loolwsd (3.4.0-2) unstable; urgency=medium
- * see the git log: http://col.la/cool3
+ * see the git log: http://col.la/coolcd34
-- Andras Timar <andras.timar at collabora.com> Thu, 28 Aug 2018 10:50:00 +0200
loolwsd (3.4.0-1) unstable; urgency=medium
- * see the git log: http://col.la/cool3
+ * see the git log: http://col.la/coolcd34
-- Jan Holesovsky <kendy at collabora.com> Fri, 17 Aug 2018 17:00:00 +0200
diff --git a/debian/control b/debian/control
index 7b8975dc3..486545b85 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, libcurl3-gnutls, cpio, libcap2-bin, libexpat1, libicu55, libjpeg-turbo8, libnss3, libpng12-0, libpoppler58, libxcb-render0, libxcb-shm0, libxml2, libxslt1.1, collaboraofficebasis5.3-calc (>= 5.3.10.54), collaboraofficebasis5.3-core (>= 5.3.10.54), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.54), collaboraofficebasis5.3-images (>= 5.3.10.54), collaboraofficebasis5.3-impress (>= 5.3.10.54), collaboraofficebasis5.3-ooofonts (>= 5.3.10.54), collaboraofficebasis5.3-writer (>= 5.3.10.54), collaboraoffice5.3 (>= 5.3.10.54), collaboraoffice5.3-ure (>= 5.3.10.54), collaboraofficebasis5.3-en-us (>= 5.3.10.54), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.54), collaboraofficebasis5.3-en-us-res (>= 5.3.10.54), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.54), collaboraofficebasis5.3-draw (>= 5.3.10.54), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.54)
, collaboraofficebasis5.3-filter-data (>= 5.3.10.54), collaboraofficebasis5.3-ooolinguistic (>= 5.3.10.54)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, libcurl3-gnutls, cpio, libcap2-bin, libexpat1, libicu55, libjpeg-turbo8, libnss3, libpng12-0, libpoppler58, libxcb-render0, libxcb-shm0, libxml2, libxslt1.1, collaboraofficebasis5.3-calc (>= 5.3.10.56), collaboraofficebasis5.3-core (>= 5.3.10.56), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.56), collaboraofficebasis5.3-images (>= 5.3.10.56), collaboraofficebasis5.3-impress (>= 5.3.10.56), collaboraofficebasis5.3-ooofonts (>= 5.3.10.56), collaboraofficebasis5.3-writer (>= 5.3.10.56), collaboraoffice5.3 (>= 5.3.10.56), collaboraoffice5.3-ure (>= 5.3.10.56), collaboraofficebasis5.3-en-us (>= 5.3.10.56), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.56), collaboraofficebasis5.3-en-us-res (>= 5.3.10.56), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.56), collaboraofficebasis5.3-draw (>= 5.3.10.56), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.56)
, collaboraofficebasis5.3-filter-data (>= 5.3.10.56), collaboraofficebasis5.3-ooolinguistic (>= 5.3.10.56)
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 59191c142..bf9dee572 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name: loolwsd%{name_suffix}
Name: loolwsd
%endif
Version: @PACKAGE_VERSION@
-Release: 3%{?dist}
+Release: 4%{?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: collaboraoffice5.3 >= 5.3.10.54 collaboraoffice5.3-ure >= 5.3.10.54 collaboraofficebasis5.3-core >= 5.3.10.54 collaboraofficebasis5.3-writer >= 5.3.10.54 collaboraofficebasis5.3-impress >= 5.3.10.54 collaboraofficebasis5.3-graphicfilter >= 5.3.10.54 collaboraofficebasis5.3-en-US >= 5.3.10.54 collaboraofficebasis5.3-calc >= 5.3.10.54 collaboraofficebasis5.3-en-US-res >= 5.3.10.54 collaboraofficebasis5.3-en-US-calc >= 5.3.10.54 collaboraofficebasis5.3-ooofonts >= 5.3.10.54 collaboraofficebasis5.3-images >= 5.3.10.54 collaboraofficebasis5.3-noto-fonts >= 5.3.10.54 collaboraofficebasis5.3-draw >= 5.3.10.54 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.54 collaboraofficebasis5.3-filter-data >= 5.3.10.54 collaboraofficebasis5.3-ooolinguistic >= 5.3.10.54
+Requires: collaboraoffice5.3 >= 5.3.10.56 collaboraoffice5.3-ure >= 5.3.10.56 collaboraofficebasis5.3-core >= 5.3.10.56 collaboraofficebasis5.3-writer >= 5.3.10.56 collaboraofficebasis5.3-impress >= 5.3.10.56 collaboraofficebasis5.3-graphicfilter >= 5.3.10.56 collaboraofficebasis5.3-en-US >= 5.3.10.56 collaboraofficebasis5.3-calc >= 5.3.10.56 collaboraofficebasis5.3-en-US-res >= 5.3.10.56 collaboraofficebasis5.3-en-US-calc >= 5.3.10.56 collaboraofficebasis5.3-ooofonts >= 5.3.10.56 collaboraofficebasis5.3-images >= 5.3.10.56 collaboraofficebasis5.3-noto-fonts >= 5.3.10.56 collaboraofficebasis5.3-draw >= 5.3.10.56 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.56 collaboraofficebasis5.3-filter-data >= 5.3.10.56 collaboraofficebasis5.3-ooolinguistic >= 5.3.10.56
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