[libreoffice-online] 01/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 f93afaa9710d71f186c3bb4e5cdc0b26598b9bcc
Merge: f4456c6 3fb64ce
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Nov 28 01:02:03 2017 +0100

    Merge branch 'master' into experimental

 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc debian/control
index 45e9938,8a56b15..5a082ea
--- 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 (>= 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: 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, chrpath
++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-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