summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2019-02-25 16:42:06 +0100
committerAndras Timar <andras.timar@collabora.com>2019-02-25 16:58:47 +0100
commit8fd7e1b8ed64dc20cf6879ca87a914b181a47eaa (patch)
treea130ba9aacb0fe8db0b892f08eaf5c3734f9a188
parent92b87e8eba48af0262990640bbf27e19fa80b437 (diff)
Bump package version to 4.0.1-1cd-4.0.1-1
Change-Id: Id262916eab72cc292ef54ffa3f39862dd63ffb01
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog8
-rw-r--r--debian/control2
-rw-r--r--loolwsd.spec.in4
4 files changed, 11 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 855cd8a2d..b932f8909 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.63])
-AC_INIT([loolwsd], [4.0.0], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [4.0.1], [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 3fb64ee81..c0f0b04b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
+loolwsd (4.0.1-1) unstable; urgency=medium
+
+ * see the git log: http://col.la/coolcd4
+
+ -- Andras Timar <andras.timar@collabora.com> Mon, 25 Feb 2019 15:10:00 +0100
+
loolwsd (4.0.0-6) unstable; urgency=medium
- * see the git log: http://col.la/cool4
+ * see the git log: http://col.la/coolcd4
-- Andras Timar <andras.timar@collabora.com> Mon, 11 Feb 2019 15:10:00 +0100
diff --git a/debian/control b/debian/control
index 00f62f6dc..b06e7063a 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, libpoppler58, 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.23), collaboraofficebasis6.0-core (>= 6.0.10.23), collaboraofficebasis6.0-graphicfilter (>= 6.0.10.23), collaboraofficebasis6.0-images (>= 6.0.10.23), collaboraofficebasis6.0-impress (>= 6.0.10.23), collaboraofficebasis6.0-ooofonts (>= 6.0.10.23), collaboraofficebasis6.0-writer (>= 6.0.10.23), collaboraoffice6.0 (>= 6.0.10.23), collaboraoffice6.0-ure (>= 6.0.10.23), collaboraofficebasis6.0-en-us (>= 6.0.10.23), collaboraofficebasis6.0-draw (>= 6.0.10.23), collaboraofficebasis6.0-extension-pdf-import (>= 6.0.10.23), collaboraofficebasis6.0-ooolinguistic (>= 6.0.10.23), collaboraoffice6.0-dict-en (>= 6.0.10.23)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcurl3-gnutls, libexpat1, libicu55, libjpeg-turbo8, libnss3, libpng12-0, libpoppler58, 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.25), collaboraofficebasis6.0-core (>= 6.0.10.25), collaboraofficebasis6.0-graphicfilter (>= 6.0.10.25), collaboraofficebasis6.0-images (>= 6.0.10.25), collaboraofficebasis6.0-impress (>= 6.0.10.25), collaboraofficebasis6.0-ooofonts (>= 6.0.10.25), collaboraofficebasis6.0-writer (>= 6.0.10.25), collaboraoffice6.0 (>= 6.0.10.25), collaboraoffice6.0-ure (>= 6.0.10.25), collaboraofficebasis6.0-en-us (>= 6.0.10.25), collaboraofficebasis6.0-draw (>= 6.0.10.25), collaboraofficebasis6.0-extension-pdf-import (>= 6.0.10.25), collaboraofficebasis6.0-ooolinguistic (>= 6.0.10.25), collaboraoffice6.0-dict-en (>= 6.0.10.25)
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 5950b9b14..89c193c53 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name: loolwsd%{name_suffix}
Name: loolwsd
%endif
Version: @PACKAGE_VERSION@
-Release: 6%{?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.23 collaboraoffice6.0-ure >= 6.0.10.23 collaboraofficebasis6.0-core >= 6.0.10.23 collaboraofficebasis6.0-writer >= 6.0.10.23 collaboraofficebasis6.0-impress >= 6.0.10.23 collaboraofficebasis6.0-graphicfilter >= 6.0.10.23 collaboraofficebasis6.0-en-US >= 6.0.10.23 collaboraofficebasis6.0-calc >= 6.0.10.23 collaboraofficebasis6.0-ooofonts >= 6.0.10.23 collaboraofficebasis6.0-images >= 6.0.10.23 collaboraofficebasis6.0-draw >= 6.0.10.23 collaboraofficebasis6.0-extension-pdf-import >= 6.0.10.23 collaboraofficebasis6.0-ooolinguistic >= 6.0.10.23 collaboraoffice6.0-dict-en >= 6.0.10.23
+Requires: collaboraoffice6.0 >= 6.0.10.25 collaboraoffice6.0-ure >= 6.0.10.25 collaboraofficebasis6.0-core >= 6.0.10.25 collaboraofficebasis6.0-writer >= 6.0.10.25 collaboraofficebasis6.0-impress >= 6.0.10.25 collaboraofficebasis6.0-graphicfilter >= 6.0.10.25 collaboraofficebasis6.0-en-US >= 6.0.10.25 collaboraofficebasis6.0-calc >= 6.0.10.25 collaboraofficebasis6.0-ooofonts >= 6.0.10.25 collaboraofficebasis6.0-images >= 6.0.10.25 collaboraofficebasis6.0-draw >= 6.0.10.25 collaboraofficebasis6.0-extension-pdf-import >= 6.0.10.25 collaboraofficebasis6.0-ooolinguistic >= 6.0.10.25 collaboraoffice6.0-dict-en >= 6.0.10.25
Conflicts: collaboraofficebasis6.0-kde-integration collaboraofficebasis6.0-gnome-integration
Requires(post): coreutils grep sed
%if 0%{?rhel} == 6