summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2018-02-15 22:26:24 +0100
committerAndras Timar <andras.timar@collabora.com>2018-02-15 22:26:24 +0100
commit414020eebadbd4b32d59c64b72fc2e68a02a20b1 (patch)
tree0eebf0ca3c73af6a2fdc4910486213c536fcd18d
parentf652da057391a466c13953e0be6558e0c0f26d4d (diff)
Bump version to 3.1.0
Change-Id: I4cfe386fda07aa3073decf0e56fda2fccc79a8b5
-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 94d05087a..4921f9530 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.63])
-AC_INIT([loolwsd], [3.0.0], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [3.1.0], [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 fa54fdcc6..cd7ee9d04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (3.1.0-1) unstable; urgency=medium
+
+ * see the git log: http://col.la/cool30
+
+ -- Andras Timar <andras.timar@collabora.com> Thu, 15 Feb 2018 22:00:00 +0100
+
loolwsd (3.0.0-7) unstable; urgency=medium
* see the git log: http://col.la/cool30
diff --git a/debian/control b/debian/control
index e442d6ee5..d6c67ca1c 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.39), collaboraofficebasis5.3-core (>= 5.3.10.39), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.39), collaboraofficebasis5.3-images (>= 5.3.10.39), collaboraofficebasis5.3-impress (>= 5.3.10.39), collaboraofficebasis5.3-ooofonts (>= 5.3.10.39), collaboraofficebasis5.3-writer (>= 5.3.10.39), collaboraoffice5.3 (>= 5.3.10.39), collaboraoffice5.3-ure (>= 5.3.10.39), collaboraofficebasis5.3-en-us (>= 5.3.10.39), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.39), collaboraofficebasis5.3-en-us-res (>= 5.3.10.39), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.39), collaboraofficebasis5.3-draw (>= 5.3.10.39), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.39), collaboraofficebasis5.3-filter-data (>= 5.3.10.39)
+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.40), collaboraofficebasis5.3-core (>= 5.3.10.40), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.40), collaboraofficebasis5.3-images (>= 5.3.10.40), collaboraofficebasis5.3-impress (>= 5.3.10.40), collaboraofficebasis5.3-ooofonts (>= 5.3.10.40), collaboraofficebasis5.3-writer (>= 5.3.10.40), collaboraoffice5.3 (>= 5.3.10.40), collaboraoffice5.3-ure (>= 5.3.10.40), collaboraofficebasis5.3-en-us (>= 5.3.10.40), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.40), collaboraofficebasis5.3-en-us-res (>= 5.3.10.40), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.40), collaboraofficebasis5.3-draw (>= 5.3.10.40), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.40), collaboraofficebasis5.3-filter-data (>= 5.3.10.40)
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 a1524fc30..ae1101215 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name: loolwsd%{name_suffix}
Name: loolwsd
%endif
Version: @PACKAGE_VERSION@
-Release: 7%{?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
BuildRequires: libcap-progs
%endif
-Requires: collaboraoffice5.3 >= 5.3.10.39 collaboraoffice5.3-ure >= 5.3.10.39 collaboraofficebasis5.3-core >= 5.3.10.39 collaboraofficebasis5.3-writer >= 5.3.10.39 collaboraofficebasis5.3-impress >= 5.3.10.39 collaboraofficebasis5.3-graphicfilter >= 5.3.10.39 collaboraofficebasis5.3-en-US >= 5.3.10.39 collaboraofficebasis5.3-calc >= 5.3.10.39 collaboraofficebasis5.3-en-US-res >= 5.3.10.39 collaboraofficebasis5.3-en-US-calc >= 5.3.10.39 collaboraofficebasis5.3-ooofonts >= 5.3.10.39 collaboraofficebasis5.3-images >= 5.3.10.39 collaboraofficebasis5.3-noto-fonts >= 5.3.10.39 collaboraofficebasis5.3-draw >= 5.3.10.39 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.39 collaboraofficebasis5.3-filter-data >= 5.3.10.39
+Requires: collaboraoffice5.3 >= 5.3.10.40 collaboraoffice5.3-ure >= 5.3.10.40 collaboraofficebasis5.3-core >= 5.3.10.40 collaboraofficebasis5.3-writer >= 5.3.10.40 collaboraofficebasis5.3-impress >= 5.3.10.40 collaboraofficebasis5.3-graphicfilter >= 5.3.10.40 collaboraofficebasis5.3-en-US >= 5.3.10.40 collaboraofficebasis5.3-calc >= 5.3.10.40 collaboraofficebasis5.3-en-US-res >= 5.3.10.40 collaboraofficebasis5.3-en-US-calc >= 5.3.10.40 collaboraofficebasis5.3-ooofonts >= 5.3.10.40 collaboraofficebasis5.3-images >= 5.3.10.40 collaboraofficebasis5.3-noto-fonts >= 5.3.10.40 collaboraofficebasis5.3-draw >= 5.3.10.40 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.40 collaboraofficebasis5.3-filter-data >= 5.3.10.40
Conflicts: collaboraofficebasis5.3-kde-integration collaboraofficebasis5.3-gnome-integration
Requires(post): coreutils grep sed
%if 0%{?rhel} == 6