[libreoffice-online] 02/02: current master needs 6.0 beta1; bump build-dep; remove upstreamed poco-1.8.diff

[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 3285660337ef9d7f706e654927e7f11977a33a46
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Nov 13 20:52:34 2017 +0100

    current master needs 6.0 beta1; bump build-dep; remove upstreamed poco-1.8.diff
---
 debian/changelog             |  2 +-
 debian/control               |  2 +-
 debian/patches/poco-1.8.diff | 32 --------------------------------
 debian/patches/series        |  1 -
 4 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8b844e8..1fadd99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libreoffice-online (5.4.2.2-1) UNRELEASED; urgency=medium
+libreoffice-online (5.4.2.2+git20171113-1) UNRELEASED; urgency=medium
 
   * Initial release. (closes: #787080)
 
diff --git a/debian/control b/debian/control
index 535fd04..2071be0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
 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:5.3~), dh-autoreconf, libreoffice-core (>= 1:5.3~), cpio, npm, libcppunit-dev, node-jake, python, python-polib
+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
 Standards-Version: 3.9.7
 
 Package: loolwsd
diff --git a/debian/patches/poco-1.8.diff b/debian/patches/poco-1.8.diff
deleted file mode 100644
index f57d188..0000000
--- a/debian/patches/poco-1.8.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-From 623b45a533198acc3ef7a393382f23ebb0f6ebab Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene at rene-engelhard.de>
-Date: Mon, 13 Nov 2017 20:20:00 +0100
-Subject: [PATCH] fix build with poco 1.8.0(.1)
-
----
- common/UnitHTTP.hpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/common/UnitHTTP.hpp b/common/UnitHTTP.hpp
-index 0343036f..a6a107d9 100644
---- a/common/UnitHTTP.hpp
-+++ b/common/UnitHTTP.hpp
-@@ -82,13 +82,13 @@ public:
-     {
-         return _dummyStream;
-     }
--#if POCO_VERSION < 0x02000000
-+#if POCO_VERSION < 0x01080000
-     virtual bool expectContinue() const override
-     {
-         return false;
-     }
- #endif
--#if POCO_VERSION >= 0x02000000
-+#if POCO_VERSION >= 0x01080000
-     virtual bool secure() const override
-     {
-         return true;
--- 
-2.11.0
-
diff --git a/debian/patches/series b/debian/patches/series
index 5842888..4e568c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@ no-werror.diff
 etc-default.diff
 ssl-dir.diff
 logs.diff
-poco-1.8.diff

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