[libreoffice-online] 05/05: Merge branch '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 6945e708b2a960efb7dbd20b231ceb3b6f8662c5
Merge: 5bfec8b 743ddf6
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Wed Nov 29 19:13:23 2017 +0000

    Merge branch 'master' into experimental

 debian/control                    |  2 +-
 debian/loolwsd.init               |  6 ++++--
 debian/patches/no-snap-rpath.diff | 13 +++++++++++++
 debian/patches/series             |  1 +
 debian/rules                      |  2 --
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --cc debian/control
index 5a082ea,d9308bc..8d1b3c1
--- a/debian/control
+++ b/debian/control
@@@ -3,7 -3,7 +3,7 @@@ Section: we
  Priority: optional
  Maintainer: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
  Uploaders: Rene Engelhard <rene at debian.org>
- Build-Depends: debhelper (>= 10.9.2), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, libpoco-dev (>= 1.8.0), libreofficekit-dev (>= 1:6.0.0~beta1~), libreoffice-core (>= 1:6.0.0~beta1~), dh-autoreconf, cpio, libcppunit-dev, zlib1g-dev, chrpath
 -Build-Depends: debhelper (>= 10.9.2), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, libpoco-dev (>= 1.8.0), libreofficekit-dev (>= 1:5.3~), libreoffice-core (>= 1:5.3~), dh-autoreconf, cpio, libcppunit-dev, zlib1g-dev, pkg-config
++Build-Depends: debhelper (>= 10.9.2), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, libpoco-dev (>= 1.8.0), libreofficekit-dev (>= 1:6.0.0~beta1~), libreoffice-core (>= 1:6.0.0~beta1~), dh-autoreconf, cpio, libcppunit-dev, zlib1g-dev
  Build-Depends-Indep: npm, node-jake, python, python-polib
  Standards-Version: 3.9.7
  

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