[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - configure.ac debian/changelog debian/control loolwsd.spec.in
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Aug 17 15:02:16 UTC 2018
configure.ac | 2 +-
debian/changelog | 6 ++++++
debian/control | 2 +-
loolwsd.spec.in | 4 ++--
4 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 0aa4fe8c892796c8e2267f75a858a836cd16259d
Author: Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Aug 17 17:00:32 2018 +0200
Commit: Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Aug 17 17:00:32 2018 +0200
Bump package version to 3.4.0-1
Change-Id: I43df3b699021b15123ee73d9a124c1aa30ff08f6
diff --git a/configure.ac b/configure.ac
index ef4dcf901..30be98b70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.63])
-AC_INIT([loolwsd], [3.3.1], [libreoffice at lists.freedesktop.org])
+AC_INIT([loolwsd], [3.4.0], [libreoffice at 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 b13a677bd..38969b61c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (3.4.0-1) unstable; urgency=medium
+
+ * see the git log: http://col.la/cool3
+
+ -- Jan Holesovsky <kendy at collabora.com> Fri, 17 Aug 2018 17:00:00 +0200
+
loolwsd (3.3.1-3) unstable; urgency=medium
* see the git log: http://col.la/cool3
diff --git a/debian/control b/debian/control
index 858cbbd0d..b45416480 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.53), collaboraofficebasis5.3-core (>= 5.3.10.53), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.53), collaboraofficebasis5.3-images (>= 5.3.10.53), collaboraofficebasis5.3-impress (>= 5.3.10.53), collaboraofficebasis5.3-ooofonts (>= 5.3.10.53), collaboraofficebasis5.3-writer (>= 5.3.10.53), collaboraoffice5.3 (>= 5.3.10.53), collaboraoffice5.3-ure (>= 5.3.10.53), collaboraofficebasis5.3-en-us (>= 5.3.10.53), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.53), collaboraofficebasis5.3-en-us-res (>= 5.3.10.53), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.53), collaboraofficebasis5.3-draw (>= 5.3.10.53), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.53), collaboraofficebasis5.3-filter-data (>= 5.3.10.53), collaboraofficebasis5.3-ooolinguistic (>= 5.3.10.53)
+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.54), collaboraofficebasis5.3-core (>= 5.3.10.54), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.54), collaboraofficebasis5.3-images (>= 5.3.10.54), collaboraofficebasis5.3-impress (>= 5.3.10.54), collaboraofficebasis5.3-ooofonts (>= 5.3.10.54), collaboraofficebasis5.3-writer (>= 5.3.10.54), collaboraoffice5.3 (>= 5.3.10.54), collaboraoffice5.3-ure (>= 5.3.10.54), collaboraofficebasis5.3-en-us (>= 5.3.10.54), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.54), collaboraofficebasis5.3-en-us-res (>= 5.3.10.54), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.54), collaboraofficebasis5.3-draw (>= 5.3.10.54), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.54), collaboraofficebasis5.3-filter-data (>= 5.3.10.54), collaboraofficebasis5.3-ooolinguistic (>= 5.3.10.54)
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 abbec5972..deafcde4d 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name: loolwsd%{name_suffix}
Name: loolwsd
%endif
Version: @PACKAGE_VERSION@
-Release: 3%{?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.53 collaboraoffice5.3-ure >= 5.3.10.53 collaboraofficebasis5.3-core >= 5.3.10.53 collaboraofficebasis5.3-writer >= 5.3.10.53 collaboraofficebasis5.3-impress >= 5.3.10.53 collaboraofficebasis5.3-graphicfilter >= 5.3.10.53 collaboraofficebasis5.3-en-US >= 5.3.10.53 collaboraofficebasis5.3-calc >= 5.3.10.53 collaboraofficebasis5.3-en-US-res >= 5.3.10.53 collaboraofficebasis5.3-en-US-calc >= 5.3.10.53 collaboraofficebasis5.3-ooofonts >= 5.3.10.53 collaboraofficebasis5.3-images >= 5.3.10.53 collaboraofficebasis5.3-noto-fonts >= 5.3.10.53 collaboraofficebasis5.3-draw >= 5.3.10.53 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.53 collaboraofficebasis5.3-filter-data >= 5.3.10.53 collaboraofficebasis5.3-ooolinguistic >= 5.3.10.53
+Requires: collaboraoffice5.3 >= 5.3.10.54 collaboraoffice5.3-ure >= 5.3.10.54 collaboraofficebasis5.3-core >= 5.3.10.54 collaboraofficebasis5.3-writer >= 5.3.10.54 collaboraofficebasis5.3-impress >= 5.3.10.54 collaboraofficebasis5.3-graphicfilter >= 5.3.10.54 collaboraofficebasis5.3-en-US >= 5.3.10.54 collaboraofficebasis5.3-calc >= 5.3.10.54 collaboraofficebasis5.3-en-US-res >= 5.3.10.54 collaboraofficebasis5.3-en-US-calc >= 5.3.10.54 collaboraofficebasis5.3-ooofonts >= 5.3.10.54 collaboraofficebasis5.3-images >= 5.3.10.54 collaboraofficebasis5.3-noto-fonts >= 5.3.10.54 collaboraofficebasis5.3-draw >= 5.3.10.54 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.54 collaboraofficebasis5.3-filter-data >= 5.3.10.54 collaboraofficebasis5.3-ooolinguistic >= 5.3.10.54
Conflicts: collaboraofficebasis5.3-kde-integration collaboraofficebasis5.3-gnome-integration
Requires(post): coreutils grep sed
%if 0%{?rhel} == 6
More information about the Libreoffice-commits
mailing list