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-29 12:00:08 +0200
commite4cf75c9c9019f77065c628bf81d20fefe147abc (patch)
tree45e0edaea8dfc6725052a4467f285d38567ea994
parenta7fee287ffb73255e627b6c8c178f51b8ffd8da8 (diff)
Bump package version to 4.0.6-1cd-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.in2
4 files changed, 9 insertions, 3 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 9fb2ac5eb..b70d83888 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/coolcd40
+
+ -- Andras Timar <andras.timar@collabora.com> Thu, 29 Aug 2019 11:00:00 +0100
+
loolwsd (4.0.5-6) unstable; urgency=medium
* see the git log: http://col.la/coolcd4
diff --git a/debian/control b/debian/control
index 557ab9046..a18e0ee97 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}, libcurl3-gnutls, libexpat1, libicu55, libjpeg-turbo8, libnss3, libpng12-0, libxml2, libxslt1.1, 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-294), collaboraofficebasis6.0-core (= 6.0.10.29-294), collaboraofficebasis6.0-graphicfilter (= 6.0.10.29-294), collaboraofficebasis6.0-images (= 6.0.10.29-294), collaboraofficebasis6.0-impress (= 6.0.10.29-294), collaboraofficebasis6.0-ooofonts (= 6.0.10.29-294), collaboraofficebasis6.0-writer (= 6.0.10.29-294), collaboraoffice6.0 (= 6.0.10.29-294), collaboraoffice6.0-ure (= 6.0.10.29-294), collaboraofficebasis6.0-en-us (= 6.0.10.29-294), collaboraofficebasis6.0-draw (= 6.0.10.29-294), collaboraofficebasis6.0-extension-pdf-import (= 6.0.10.29-294), collaboraofficebasis6.0-ooolinguistic (= 6.0.10.29-294)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcurl3-gnutls, libexpat1, libicu55, libjpeg-turbo8, libnss3, libpng12-0, libxml2, libxslt1.1, 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 84abe1d5c..aa5c2c97c 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -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-29 collaboraoffice6.0-ure = 6.0.10.29-29 collaboraofficebasis6.0-core = 6.0.10.29-29 collaboraofficebasis6.0-writer = 6.0.10.29-29 collaboraofficebasis6.0-impress = 6.0.10.29-29 collaboraofficebasis6.0-graphicfilter = 6.0.10.29-29 collaboraofficebasis6.0-en-US = 6.0.10.29-29 collaboraofficebasis6.0-calc = 6.0.10.29-29 collaboraofficebasis6.0-ooofonts = 6.0.10.29-29 collaboraofficebasis6.0-images = 6.0.10.29-29 collaboraofficebasis6.0-draw = 6.0.10.29-29 collaboraofficebasis6.0-extension-pdf-import = 6.0.10.29-29 collaboraofficebasis6.0-ooolinguistic = 6.0.10.29-29
+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