[libreoffice-online] 01/01: Merge remote-tracking branch 'origin/master' into experimental

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch experimental
in repository libreoffice-online.

commit f4456c6ed8d6f491e2fdf863b1ff77c10416a2d4
Merge: 3285660 b4c0b05
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Nov 27 19:56:06 2017 +0100

    Merge remote-tracking branch 'origin/master' into experimental

 debian/changelog                 |  2 +-
 debian/control                   |  5 ++--
 debian/loolwsd.init              | 50 ++++++++++++++++++++++++++++++++++++++++
 debian/loolwsd.postinst          | 20 ++++++++++++++++
 debian/loolwsd.postrm            |  9 ++++++++
 debian/patches/no-npm-check.diff | 26 +++++++++++++++++++++
 debian/patches/series            |  3 ++-
 debian/patches/ssl-dir.diff      |  4 ++--
 debian/rules                     |  6 ++++-
 9 files changed, 118 insertions(+), 7 deletions(-)

diff --cc debian/changelog
index 1fadd99,8b844e8..99540c5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,4 @@@
- libreoffice-online (5.4.2.2+git20171113-1) UNRELEASED; urgency=medium
 -libreoffice-online (5.4.2.2-1) UNRELEASED; urgency=medium
++libreoffice-online (5.4.2.2+git20171127-1) UNRELEASED; urgency=medium
  
    * Initial release. (closes: #787080)
  
diff --cc debian/control
index 2071be0,f6869be..45e9938
--- a/debian/control
+++ b/debian/control
@@@ -3,7 -3,8 +3,8 @@@ Section: we
  Priority: optional
  Maintainer: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
  Uploaders: Rene Engelhard <rene at debian.org>
- Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, libpoco-dev (>= 1.8.0), libreofficekit-dev (>= 1:6.0.0~beta1~), dh-autoreconf, libreoffice-core (>= 1:6.0.0~beta1~), cpio, npm, libcppunit-dev, node-jake, python, python-polib
 -Build-Depends: debhelper (>= 9), debhelper (>= 10.9.2), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, libpoco-dev (>= 1.8.0), libreofficekit-dev (>= 1:5.3~), dh-autoreconf, libreoffice-core (>= 1:5.3~), cpio, libcppunit-dev, zlib1g-dev, pkg-config, chrpath
++Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, libpoco-dev (>= 1.8.0), libreofficekit-dev (>= 1:6.0.0~beta1~), dh-autoreconf, libreoffice-core (>= 1:6.0.0~beta1~), cpio, libcppunit-dev, zlib1g-dev, chrpath
+ Build-Depends-Indep: npm, node-jake, python, python-polib
  Standards-Version: 3.9.7
  
  Package: loolwsd

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice-online.git