[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1-5' - 2 commits - debian/changelog debian/control loolwsd.spec.in

[Andras Timar]

 debian/changelog |    6 ++++++
 debian/control   |    2 +-
 loolwsd.spec.in  |    4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit c235c3d6a0c1ae0d1d79462e9b8631e097130c0c
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Nov 27 18:17:10 2017 +0100

    Bump version for packages 2.1.5-5
    
    Change-Id: Idc4d7b656bf7b56d31a768446fb6586de736a093
    (cherry picked from commit a1e9f8039370103a3567a6fcaf7c8cc64c68b7e6)

diff --git a/debian/changelog b/debian/changelog
index a1920788..e9500cb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (2.1.5-5) unstable; urgency=medium
+
+  * add collaboraofficebasis5.3-filter-data as dependency
+
+ -- Andras Timar <andras.timar at collabora.com>  Wed, 27 Nov 2017 18:10:00 +0100
+
 loolwsd (2.1.5-4) unstable; urgency=medium
 
   * see the git log: http://col.la/cool21
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index d2b5b0b0..397af41a 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:           loolwsd%{name_suffix}
 Name:           loolwsd
 %endif
 Version:        @PACKAGE_VERSION@
-Release:        4%{?dist}
+Release:        5%{?dist}
 %if 0%{?suse_version} == 1110
 Group:          Productivity/Office/Suite
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
commit 5218b82255b16927cc5e28f7e45cd2d8ad14e4fa
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Nov 27 17:03:57 2017 +0100

    we need collaboraofficebasis5.3-filter-data for opening e.g. pptx properly
    
    Change-Id: I1d4a0f0b45a0d0a4bc492c6c021f5f5ab5c16883
    (cherry picked from commit 22351ce5e798c1c2d3cc3bb43c5827d2e26cb442)
    (cherry picked from commit 00f1137b0a9711c0e515f88b2e256b11ed52fe9e)

diff --git a/debian/control b/debian/control
index bdd6b165..e24296f5 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, libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, cpio, libcap2-bin, collaboraofficebasis5.3-calc (>= 5.3.10.26), collaboraofficebasis5.3-core (>= 5.3.10.26), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.26), collaboraofficebasis5.3-images (>= 5.3.10.26), collaboraofficebasis5.3-impress (>= 5.3.10.26), collaboraofficebasis5.3-ooofonts (>= 5.3.10.26), collaboraofficebasis5.3-writer (>= 5.3.10.26), collaboraoffice5.3 (>= 5.3.10.26), collaboraoffice5.3-ure (>= 5.3.10.26), collaboraofficebasis5.3-en-us (>= 5.3.10.26), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.26), collaboraofficebasis5.3-en-us-res (>= 5.3.10.26), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.26), collaboraofficebasis5.3-draw (>= 5.3.10.26), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.26)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, cpio, libcap2-bin, collaboraofficebasis5.3-calc (>= 5.3.10.31), collaboraofficebasis5.3-core (>= 5.3.10.31), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.31), collaboraofficebasis5.3-images (>= 5.3.10.31), collaboraofficebasis5.3-impress (>= 5.3.10.31), collaboraofficebasis5.3-ooofonts (>= 5.3.10.31), collaboraofficebasis5.3-writer (>= 5.3.10.31), collaboraoffice5.3 (>= 5.3.10.31), collaboraoffice5.3-ure (>= 5.3.10.31), collaboraofficebasis5.3-en-us (>= 5.3.10.31), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.31), collaboraofficebasis5.3-en-us-res (>= 5.3.10.31), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.31), collaboraofficebasis5.3-draw (>= 5.3.10.31), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.31), collaboraofficebasis5.3-filter-data (>= 5.3.10.31)
 Description: LibreOffice Online WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
  services.
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 844c327c..d2b5b0b0 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -38,7 +38,7 @@ BuildRequires:  libcap-progs systemd-rpm-macros
 BuildRequires:  libcap-progs
 %endif
 
-Requires:       collaboraoffice5.3 >= 5.3.10.26 collaboraoffice5.3-ure >= 5.3.10.26 collaboraofficebasis5.3-core >= 5.3.10.26 collaboraofficebasis5.3-writer >= 5.3.10.26 collaboraofficebasis5.3-impress >= 5.3.10.26 collaboraofficebasis5.3-graphicfilter >= 5.3.10.26 collaboraofficebasis5.3-en-US >= 5.3.10.26 collaboraofficebasis5.3-calc >= 5.3.10.26 collaboraofficebasis5.3-en-US-res >= 5.3.10.26 collaboraofficebasis5.3-en-US-calc >= 5.3.10.26 collaboraofficebasis5.3-ooofonts >= 5.3.10.26 collaboraofficebasis5.3-images >= 5.3.10.26 collaboraofficebasis5.3-noto-fonts >= 5.3.10.26 collaboraofficebasis5.3-draw >= 5.3.10.26 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.26
+Requires:       collaboraoffice5.3 >= 5.3.10.31 collaboraoffice5.3-ure >= 5.3.10.31 collaboraofficebasis5.3-core >= 5.3.10.31 collaboraofficebasis5.3-writer >= 5.3.10.31 collaboraofficebasis5.3-impress >= 5.3.10.31 collaboraofficebasis5.3-graphicfilter >= 5.3.10.31 collaboraofficebasis5.3-en-US >= 5.3.10.31 collaboraofficebasis5.3-calc >= 5.3.10.31 collaboraofficebasis5.3-en-US-res >= 5.3.10.31 collaboraofficebasis5.3-en-US-calc >= 5.3.10.31 collaboraofficebasis5.3-ooofonts >= 5.3.10.31 collaboraofficebasis5.3-images >= 5.3.10.31 collaboraofficebasis5.3-noto-fonts >= 5.3.10.31 collaboraofficebasis5.3-draw >= 5.3.10.31 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.31 collaboraofficebasis5.3-filter-data >= 5.3.10.31
 Requires(post): coreutils grep sed
 %if 0%{?rhel} == 6
 # loolwsd dependencies