summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2019-08-28 15:43:13 +0200
committerAndras Timar <andras.timar@collabora.com>2019-08-28 15:43:18 +0200
commit79f3ef227ea43e81f46b4b11c28fcc24cb5fbb28 (patch)
tree8a4616076d5baeae6b36f200ac3d3c262f4dbafe
parent0a150a88349d010a889b3f753795d86b62c56954 (diff)
Bump package version to 4.0.6-1cp-4.0.6-1
Change-Id: I9878d1541c3a3eb3bf8dff9a8212a6ddd4ab4a9b
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog6
-rw-r--r--debian/control2
-rw-r--r--loolwsd.spec.in4
4 files changed, 10 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 6cec31107..dbd9d9a71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.63])
-AC_INIT([loolwsd], [4.0.5], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [4.0.6], [libreoffice@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 76a977657..00534a4ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.0.6-1) unstable; urgency=medium
+
+ * see the git log: http://col.la/cool40
+
+ -- Andras Timar <andras.timar@collabora.com> Wed, 28 Aug 2019 15:00:00 +0100
+
loolwsd (4.0.5-2) unstable; urgency=medium
* see the git log: http://col.la/cool40
diff --git a/debian/control b/debian/control
index 921f5a0ad..160e96524 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}, libsm6, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, libxcb-render0, libxcb-shm0, locales-all, adduser, expat, fontconfig, cpio, libcap2-bin, collaboraofficebasis6.0-calc (= 6.0.10.29-292), collaboraofficebasis6.0-core (= 6.0.10.29-292), collaboraofficebasis6.0-graphicfilter (= 6.0.10.29-292), collaboraofficebasis6.0-images (= 6.0.10.29-292), collaboraofficebasis6.0-impress (= 6.0.10.29-292), collaboraofficebasis6.0-ooofonts (= 6.0.10.29-292), collaboraofficebasis6.0-writer (= 6.0.10.29-292), collaboraoffice6.0 (= 6.0.10.29-292), collaboraoffice6.0-ure (= 6.0.10.29-292), collaboraofficebasis6.0-en-us (= 6.0.10.29-292), collaboraofficebasis6.0-draw (= 6.0.10.29-292), collaboraofficebasis6.0-extension-pdf-import (= 6.0.10.29-292), collaboraofficebasis6.0-ooolinguistic (= 6.0.10.29-292)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libsm6, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, libxcb-render0, libxcb-shm0, locales-all, adduser, expat, fontconfig, cpio, libcap2-bin, collaboraofficebasis6.0-calc (= 6.0.10.29-20190828), collaboraofficebasis6.0-core (= 6.0.10.29-20190828), collaboraofficebasis6.0-graphicfilter (= 6.0.10.29-20190828), collaboraofficebasis6.0-images (= 6.0.10.29-20190828), collaboraofficebasis6.0-impress (= 6.0.10.29-20190828), collaboraofficebasis6.0-ooofonts (= 6.0.10.29-20190828), collaboraofficebasis6.0-writer (= 6.0.10.29-20190828), collaboraoffice6.0 (= 6.0.10.29-20190828), collaboraoffice6.0-ure (= 6.0.10.29-20190828), collaboraofficebasis6.0-en-us (= 6.0.10.29-20190828), collaboraofficebasis6.0-draw (= 6.0.10.29-20190828), collaboraofficebasis6.0-extension-pdf-import (= 6.0.10.29-20190828), collaboraofficebasis6.0-ooolinguistic (= 6.0.10.29-20190828)
Conflicts: collaboraofficebasis6.0-gnome-integration, collaboraofficebasis6.0-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 e37783a05..aa5c2c97c 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name: loolwsd%{name_suffix}
Name: loolwsd
%endif
Version: @PACKAGE_VERSION@
-Release: 2%{?dist}
+Release: 1%{?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 python-polib
BuildRequires: libcap-progs
%endif
-Requires: collaboraoffice6.0 = 6.0.10.29-292 collaboraoffice6.0-ure = 6.0.10.29-292 collaboraofficebasis6.0-core = 6.0.10.29-292 collaboraofficebasis6.0-writer = 6.0.10.29-292 collaboraofficebasis6.0-impress = 6.0.10.29-292 collaboraofficebasis6.0-graphicfilter = 6.0.10.29-292 collaboraofficebasis6.0-en-US = 6.0.10.29-292 collaboraofficebasis6.0-calc = 6.0.10.29-292 collaboraofficebasis6.0-ooofonts = 6.0.10.29-292 collaboraofficebasis6.0-images = 6.0.10.29-292 collaboraofficebasis6.0-draw = 6.0.10.29-292 collaboraofficebasis6.0-extension-pdf-import = 6.0.10.29-292 collaboraofficebasis6.0-ooolinguistic = 6.0.10.29-292
+Requires: collaboraoffice6.0 = 6.0.10.29-20190828 collaboraoffice6.0-ure = 6.0.10.29-20190828 collaboraofficebasis6.0-core = 6.0.10.29-20190828 collaboraofficebasis6.0-writer = 6.0.10.29-20190828 collaboraofficebasis6.0-impress = 6.0.10.29-20190828 collaboraofficebasis6.0-graphicfilter = 6.0.10.29-20190828 collaboraofficebasis6.0-en-US = 6.0.10.29-20190828 collaboraofficebasis6.0-calc = 6.0.10.29-20190828 collaboraofficebasis6.0-ooofonts = 6.0.10.29-20190828 collaboraofficebasis6.0-images = 6.0.10.29-20190828 collaboraofficebasis6.0-draw = 6.0.10.29-20190828 collaboraofficebasis6.0-extension-pdf-import = 6.0.10.29-20190828 collaboraofficebasis6.0-ooolinguistic = 6.0.10.29-20190828
Conflicts: collaboraofficebasis6.0-kde-integration collaboraofficebasis6.0-gnome-integration
Requires(post): coreutils grep sed
%if 0%{?rhel} == 6