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

[Andras Timar]

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

New commits:
commit a557eac1f335c3969b9fd365d918ea140de65127
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue May 29 22:23:18 2018 +0200

    Bump package version to 3.2.2-2

diff --git a/debian/changelog b/debian/changelog
index 73ad63348..7c67d474f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
+loolwsd (3.2.2-2) unstable; urgency=medium
+
+  * see the git log: http://col.la/coolcd32
+
+ -- Andras Timar <andras.timar at collabora.com>  Tue, 29 May 2018 22:20:00 +0100
+
 loolwsd (3.2.2-1) unstable; urgency=medium
 
   * see the git log: http://col.la/cool32
 
  -- Andras Timar <andras.timar at collabora.com>  Thu, 10 May 2018 11:20:00 +0100
+
 loolwsd (3.2.1-1) unstable; urgency=medium
 
   * see the git log: http://col.la/cool321
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index e206dcf00..de6587671 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 1af148cbe68a8137f63b03f70254861234c32e95
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue May 29 22:20:22 2018 +0200

    require Collabora Office 5.3-47

diff --git a/debian/control b/debian/control
index 0faa0656a..ee1310c5c 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, libcurl3-gnutls, cpio, libcap2-bin, libexpat1, libicu55, libjpeg-turbo8, libnss3, libpng12-0, libpoppler58, libxcb-render0, libxcb-shm0, libxml2, libxslt1.1, collaboraofficebasis5.3-calc (>= 5.3.10.46), collaboraofficebasis5.3-core (>= 5.3.10.46), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.46), collaboraofficebasis5.3-images (>= 5.3.10.46), collaboraofficebasis5.3-impress (>= 5.3.10.46), collaboraofficebasis5.3-ooofonts (>= 5.3.10.46), collaboraofficebasis5.3-writer (>= 5.3.10.46), collaboraoffice5.3 (>= 5.3.10.46), collaboraoffice5.3-ure (>= 5.3.10.46), collaboraofficebasis5.3-en-us (>= 5.3.10.46), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.46), collaboraofficebasis5.3-en-us-res (>= 5.3.10.46), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.46), collaboraofficebasis5.3-draw (>= 5.3.10.46), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.46)
 , collaboraofficebasis5.3-filter-data (>= 5.3.10.46), collaboraofficebasis5.3-ooolinguistic (>= 5.3.10.46)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, libcurl3-gnutls, cpio, libcap2-bin, libexpat1, libicu55, libjpeg-turbo8, libnss3, libpng12-0, libpoppler58, libxcb-render0, libxcb-shm0, libxml2, libxslt1.1, collaboraofficebasis5.3-calc (>= 5.3.10.47), collaboraofficebasis5.3-core (>= 5.3.10.47), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.47), collaboraofficebasis5.3-images (>= 5.3.10.47), collaboraofficebasis5.3-impress (>= 5.3.10.47), collaboraofficebasis5.3-ooofonts (>= 5.3.10.47), collaboraofficebasis5.3-writer (>= 5.3.10.47), collaboraoffice5.3 (>= 5.3.10.47), collaboraoffice5.3-ure (>= 5.3.10.47), collaboraofficebasis5.3-en-us (>= 5.3.10.47), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.47), collaboraofficebasis5.3-en-us-res (>= 5.3.10.47), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.47), collaboraofficebasis5.3-draw (>= 5.3.10.47), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.47)
 , collaboraofficebasis5.3-filter-data (>= 5.3.10.47), collaboraofficebasis5.3-ooolinguistic (>= 5.3.10.47)
 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
commit 0d5abf9189e2614305fa05361009af7e982ed91c
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue May 29 21:55:40 2018 +0200

    missing dependencies

diff --git a/debian/control b/debian/control
index 76f676324..0faa0656a 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.46), collaboraofficebasis5.3-core (>= 5.3.10.46), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.46), collaboraofficebasis5.3-images (>= 5.3.10.46), collaboraofficebasis5.3-impress (>= 5.3.10.46), collaboraofficebasis5.3-ooofonts (>= 5.3.10.46), collaboraofficebasis5.3-writer (>= 5.3.10.46), collaboraoffice5.3 (>= 5.3.10.46), collaboraoffice5.3-ure (>= 5.3.10.46), collaboraofficebasis5.3-en-us (>= 5.3.10.46), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.46), collaboraofficebasis5.3-en-us-res (>= 5.3.10.46), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.46), collaboraofficebasis5.3-draw (>= 5.3.10.46), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.46), collaboraofficebasis5.3-filter-data (>= 5.3.10.46), collaboraofficebasis5.3-ooolinguistic (>= 5.3.10.46)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, libcurl3-gnutls, cpio, libcap2-bin, libexpat1, libicu55, libjpeg-turbo8, libnss3, libpng12-0, libpoppler58, libxcb-render0, libxcb-shm0, libxml2, libxslt1.1, collaboraofficebasis5.3-calc (>= 5.3.10.46), collaboraofficebasis5.3-core (>= 5.3.10.46), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.46), collaboraofficebasis5.3-images (>= 5.3.10.46), collaboraofficebasis5.3-impress (>= 5.3.10.46), collaboraofficebasis5.3-ooofonts (>= 5.3.10.46), collaboraofficebasis5.3-writer (>= 5.3.10.46), collaboraoffice5.3 (>= 5.3.10.46), collaboraoffice5.3-ure (>= 5.3.10.46), collaboraofficebasis5.3-en-us (>= 5.3.10.46), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.46), collaboraofficebasis5.3-en-us-res (>= 5.3.10.46), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.46), collaboraofficebasis5.3-draw (>= 5.3.10.46), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.46)
 , collaboraofficebasis5.3-filter-data (>= 5.3.10.46), collaboraofficebasis5.3-ooolinguistic (>= 5.3.10.46)
 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