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

[Libreoffice Gerrit user]

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

New commits:
commit d59ba627a80c96c14e77e17d334ff19856b19ed8
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu May 9 09:42:05 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu May 9 09:42:05 2019 +0200

    Bump package version to 4.0.4-2
    
    Change-Id: I3322c83e93ed33aeb2cbdfa1429ad18da3f8a66a

diff --git a/debian/changelog b/debian/changelog
index 3c2b62503..71bd5a77e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.0.4-2) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool4
+
+ -- Andras Timar <andras.timar at collabora.com>  Thu, 09 May 2019 09:30:00 +0100
+
 loolwsd (4.0.4-1) unstable; urgency=medium
 
   * see the git log: http://col.la/cool4
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 84abe1d5c..bc760614a 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:           loolwsd%{name_suffix}
 Name:           loolwsd
 %endif
 Version:        @PACKAGE_VERSION@
-Release:        1%{?dist}
+Release:        2%{?dist}
 %if 0%{?suse_version} == 1110
 Group:          Productivity/Office/Suite
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
commit a1dabe7d1e3b005adc4c4dfebf40bb24672a9ac3
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu May 9 09:40:23 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu May 9 09:40:23 2019 +0200

    Fix dependency
    
    Change-Id: I630ac7c1937ae74d395cff9070e5ead7cdd5de41

diff --git a/debian/control b/debian/control
index 31ad9acc9..508137813 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}, 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.29), collaboraofficebasis6.0-core (= 6.0.10.29), collaboraofficebasis6.0-graphicfilter (= 6.0.10.29), collaboraofficebasis6.0-images (= 6.0.10.29), collaboraofficebasis6.0-impress (= 6.0.10.29), collaboraofficebasis6.0-ooofonts (= 6.0.10.29), collaboraofficebasis6.0-writer (= 6.0.10.29), collaboraoffice6.0 (= 6.0.10.29), collaboraoffice6.0-ure (= 6.0.10.29), collaboraofficebasis6.0-en-us (= 6.0.10.29), collaboraofficebasis6.0-draw (= 6.0.10.29), collaboraofficebasis6.0-extension-pdf-import (= 6.0.10.29), collaboraofficebasis6.0-ooolinguistic (= 6.0.10.29)
+Depends: ${shlibs:Depends}, ${misc:Depends}, 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.29-29), collaboraofficebasis6.0-core (= 6.0.10.29-29), collaboraofficebasis6.0-graphicfilter (= 6.0.10.29-29), collaboraofficebasis6.0-images (= 6.0.10.29-29), collaboraofficebasis6.0-impress (= 6.0.10.29-29), collaboraofficebasis6.0-ooofonts (= 6.0.10.29-29), collaboraofficebasis6.0-writer (= 6.0.10.29-29), collaboraoffice6.0 (= 6.0.10.29-29), collaboraoffice6.0-ure (= 6.0.10.29-29), collaboraofficebasis6.0-en-us (= 6.0.10.29-29), collaboraofficebasis6.0-draw (= 6.0.10.29-29), collaboraofficebasis6.0-extension-pdf-import (= 6.0.10.29-29), collaboraofficebasis6.0-ooolinguistic (= 6.0.10.29-29)
 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 f6133159d..84abe1d5c 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -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.29 collaboraoffice6.0-ure = 6.0.10.29 collaboraofficebasis6.0-core = 6.0.10.29 collaboraofficebasis6.0-writer = 6.0.10.29 collaboraofficebasis6.0-impress = 6.0.10.29 collaboraofficebasis6.0-graphicfilter = 6.0.10.29 collaboraofficebasis6.0-en-US = 6.0.10.29 collaboraofficebasis6.0-calc = 6.0.10.29 collaboraofficebasis6.0-ooofonts = 6.0.10.29 collaboraofficebasis6.0-images = 6.0.10.29 collaboraofficebasis6.0-draw = 6.0.10.29 collaboraofficebasis6.0-extension-pdf-import = 6.0.10.29 collaboraofficebasis6.0-ooolinguistic = 6.0.10.29
+Requires:       collaboraoffice6.0 = 6.0.10.29-29 collaboraoffice6.0-ure = 6.0.10.29-29 collaboraofficebasis6.0-core = 6.0.10.29-29 collaboraofficebasis6.0-writer = 6.0.10.29-29 collaboraofficebasis6.0-impress = 6.0.10.29-29 collaboraofficebasis6.0-graphicfilter = 6.0.10.29-29 collaboraofficebasis6.0-en-US = 6.0.10.29-29 collaboraofficebasis6.0-calc = 6.0.10.29-29 collaboraofficebasis6.0-ooofonts = 6.0.10.29-29 collaboraofficebasis6.0-images = 6.0.10.29-29 collaboraofficebasis6.0-draw = 6.0.10.29-29 collaboraofficebasis6.0-extension-pdf-import = 6.0.10.29-29 collaboraofficebasis6.0-ooolinguistic = 6.0.10.29-29
 Conflicts:      collaboraofficebasis6.0-kde-integration collaboraofficebasis6.0-gnome-integration
 Requires(post): coreutils grep sed
 %if 0%{?rhel} == 6