[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd' - debian/control loolwsd.spec.in

[Andras Timar]

 debian/control  |    1 +
 loolwsd.spec.in |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit 951e86f88a65ff998a186650df3e42575c6fe56b
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Jan 3 10:28:44 2018 +0100

    Online and KDE/Gnome integrations may conflict
    
    Change-Id: I1788eaaed7bcdf5debc33dc96578d48a3febc96e
    Reviewed-on: https://gerrit.libreoffice.org/47302
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/debian/control b/debian/control
index bfd3c51e..85f61c06 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Package: loolwsd
 Section: web
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, libssl1.0.0, libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, cpio, libpoppler58, 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), collaboraofficebasis5.3-filter-data (>= 5.3.10.26)
+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
  services.
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 63ead186..8dc30052 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -27,6 +27,7 @@ BuildRequires:  libcap-progs systemd-rpm-macros
 %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 collaboraofficebasis5.3-filter-data >= 5.3.10.26
+Conflicts:      collaboraofficebasis5.3-kde-integration collaboraofficebasis5.3-gnome-integration
 Requires:       systemd
 Requires(post): coreutils grep sed
 %if 0%{?fedora} || 0%{?rhel} >= 7