summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2018-07-05 21:28:29 +0200
committerAndras Timar <andras.timar@collabora.com>2018-07-05 21:28:29 +0200
commit603da5a7cf6ba23585e70b4d59325f4b2170913c (patch)
tree654d55eb9694dcde1648c051110437f591ff8ff4
parent874b54a193c462a147a370e35f7b84ec4ca363e3 (diff)
Bump package version to 3.3.1-23.3.1-rc2
Change-Id: I503cb6028cd76baa7e7511668b4de5a38f49879b
-rw-r--r--debian/changelog8
-rw-r--r--debian/control2
-rw-r--r--loolwsd.spec.in4
3 files changed, 10 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index abab34bae..f62281dd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
+loolwsd (3.3.1-2) unstable; urgency=medium
+
+ * see the git log: http://col.la/cool3
+
+ -- Andras Timar <andras.timar@collabora.com> Thu, 05 Jul 2018 21:10:00 +0200
+
loolwsd (3.3.1-1) unstable; urgency=medium
* see the git log: http://col.la/cool3
- -- Andras Timar <andras.timar@collabora.com> Wed, 03 Jul 2018 23:10:00 +0200
+ -- Andras Timar <andras.timar@collabora.com> Tue, 03 Jul 2018 23:10:00 +0200
loolwsd (3.3.0-3) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index c00db80dd..396b565fc 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.50), collaboraofficebasis5.3-core (>= 5.3.10.50), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.50), collaboraofficebasis5.3-images (>= 5.3.10.50), collaboraofficebasis5.3-impress (>= 5.3.10.50), collaboraofficebasis5.3-ooofonts (>= 5.3.10.50), collaboraofficebasis5.3-writer (>= 5.3.10.50), collaboraoffice5.3 (>= 5.3.10.50), collaboraoffice5.3-ure (>= 5.3.10.50), collaboraofficebasis5.3-en-us (>= 5.3.10.50), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.50), collaboraofficebasis5.3-en-us-res (>= 5.3.10.50), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.50), collaboraofficebasis5.3-draw (>= 5.3.10.50), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.50), collaboraofficebasis5.3-filter-data (>= 5.3.10.50), collaboraofficebasis5.3-ooolinguistic (>= 5.3.10.50)
+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.52), collaboraofficebasis5.3-core (>= 5.3.10.52), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.52), collaboraofficebasis5.3-images (>= 5.3.10.52), collaboraofficebasis5.3-impress (>= 5.3.10.52), collaboraofficebasis5.3-ooofonts (>= 5.3.10.52), collaboraofficebasis5.3-writer (>= 5.3.10.52), collaboraoffice5.3 (>= 5.3.10.52), collaboraoffice5.3-ure (>= 5.3.10.52), collaboraofficebasis5.3-en-us (>= 5.3.10.52), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.52), collaboraofficebasis5.3-en-us-res (>= 5.3.10.52), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.52), collaboraofficebasis5.3-draw (>= 5.3.10.52), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.52), collaboraofficebasis5.3-filter-data (>= 5.3.10.52), collaboraofficebasis5.3-ooolinguistic (>= 5.3.10.52)
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 83b1a3ba0..1badb1e65 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name: loolwsd%{name_suffix}
Name: loolwsd
%endif
Version: @PACKAGE_VERSION@
-Release: 1%{?dist}
+Release: 2%{?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.50 collaboraoffice5.3-ure >= 5.3.10.50 collaboraofficebasis5.3-core >= 5.3.10.50 collaboraofficebasis5.3-writer >= 5.3.10.50 collaboraofficebasis5.3-impress >= 5.3.10.50 collaboraofficebasis5.3-graphicfilter >= 5.3.10.50 collaboraofficebasis5.3-en-US >= 5.3.10.50 collaboraofficebasis5.3-calc >= 5.3.10.50 collaboraofficebasis5.3-en-US-res >= 5.3.10.50 collaboraofficebasis5.3-en-US-calc >= 5.3.10.50 collaboraofficebasis5.3-ooofonts >= 5.3.10.50 collaboraofficebasis5.3-images >= 5.3.10.50 collaboraofficebasis5.3-noto-fonts >= 5.3.10.50 collaboraofficebasis5.3-draw >= 5.3.10.50 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.50 collaboraofficebasis5.3-filter-data >= 5.3.10.50 collaboraofficebasis5.3-ooolinguistic >= 5.3.10.50
+Requires: collaboraoffice5.3 >= 5.3.10.52 collaboraoffice5.3-ure >= 5.3.10.52 collaboraofficebasis5.3-core >= 5.3.10.52 collaboraofficebasis5.3-writer >= 5.3.10.52 collaboraofficebasis5.3-impress >= 5.3.10.52 collaboraofficebasis5.3-graphicfilter >= 5.3.10.52 collaboraofficebasis5.3-en-US >= 5.3.10.52 collaboraofficebasis5.3-calc >= 5.3.10.52 collaboraofficebasis5.3-en-US-res >= 5.3.10.52 collaboraofficebasis5.3-en-US-calc >= 5.3.10.52 collaboraofficebasis5.3-ooofonts >= 5.3.10.52 collaboraofficebasis5.3-images >= 5.3.10.52 collaboraofficebasis5.3-noto-fonts >= 5.3.10.52 collaboraofficebasis5.3-draw >= 5.3.10.52 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.52 collaboraofficebasis5.3-filter-data >= 5.3.10.52 collaboraofficebasis5.3-ooolinguistic >= 5.3.10.52
Conflicts: collaboraofficebasis5.3-kde-integration collaboraofficebasis5.3-gnome-integration
Requires(post): coreutils grep sed
%if 0%{?rhel} == 6