summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2018-09-19 08:03:51 +0200
committerAndras Timar <andras.timar@collabora.com>2018-09-19 08:03:51 +0200
commitca41d2971e25a12215ac16db01d273442fc7e7de (patch)
tree70591dfac9903bf632a029e24b8d1d24da404022
parent5b33ec605f9a26d7f7070b2b030f8a7c953f96bd (diff)
Bump package version to 3.4.0-63.4-rc6
Change-Id: Ideee4d8f64db091dcd03ea08dcb3c6ea25667667
-rw-r--r--debian/changelog6
-rw-r--r--debian/control2
-rw-r--r--loolwsd.spec.in4
3 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 9e060fa31..00fa5ec89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (3.4.0-6) unstable; urgency=medium
+
+ * see the git log: http://col.la/cool3
+
+ -- Andras Timar <andras.timar@collabora.com> Wed, 19 Sep 2018 08:00:00 +0200
+
loolwsd (3.4.0-5) unstable; urgency=medium
* see the git log: http://col.la/cool3
diff --git a/debian/control b/debian/control
index ac962d360..ae1c16936 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.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)
+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.57), collaboraofficebasis5.3-core (>= 5.3.10.57), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.57), collaboraofficebasis5.3-images (>= 5.3.10.57), collaboraofficebasis5.3-impress (>= 5.3.10.57), collaboraofficebasis5.3-ooofonts (>= 5.3.10.57), collaboraofficebasis5.3-writer (>= 5.3.10.57), collaboraoffice5.3 (>= 5.3.10.57), collaboraoffice5.3-ure (>= 5.3.10.57), collaboraofficebasis5.3-en-us (>= 5.3.10.57), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.57), collaboraofficebasis5.3-en-us-res (>= 5.3.10.57), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.57), collaboraofficebasis5.3-draw (>= 5.3.10.57), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.57), collaboraofficebasis5.3-filter-data (>= 5.3.10.57), collaboraofficebasis5.3-ooolinguistic (>= 5.3.10.57)
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 c54d376a7..520a84bc6 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name: loolwsd%{name_suffix}
Name: loolwsd
%endif
Version: @PACKAGE_VERSION@
-Release: 5%{?dist}
+Release: 6%{?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.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
+Requires: collaboraoffice5.3 >= 5.3.10.57 collaboraoffice5.3-ure >= 5.3.10.57 collaboraofficebasis5.3-core >= 5.3.10.57 collaboraofficebasis5.3-writer >= 5.3.10.57 collaboraofficebasis5.3-impress >= 5.3.10.57 collaboraofficebasis5.3-graphicfilter >= 5.3.10.57 collaboraofficebasis5.3-en-US >= 5.3.10.57 collaboraofficebasis5.3-calc >= 5.3.10.57 collaboraofficebasis5.3-en-US-res >= 5.3.10.57 collaboraofficebasis5.3-en-US-calc >= 5.3.10.57 collaboraofficebasis5.3-ooofonts >= 5.3.10.57 collaboraofficebasis5.3-images >= 5.3.10.57 collaboraofficebasis5.3-noto-fonts >= 5.3.10.57 collaboraofficebasis5.3-draw >= 5.3.10.57 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.57 collaboraofficebasis5.3-filter-data >= 5.3.10.57 collaboraofficebasis5.3-ooolinguistic >= 5.3.10.57
Conflicts: collaboraofficebasis5.3-kde-integration collaboraofficebasis5.3-gnome-integration
Requires(post): coreutils grep sed
%if 0%{?rhel} == 6