[apache2] 01/02: avoid building with openssl 1.1 for now

[Stefan Fritsch]

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

sf pushed a commit to branch master
in repository apache2.

commit 5f7faa1590375c3f2dad310d22384154587ef9ca
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Wed Nov 9 23:49:08 2016 +0100

    avoid building with openssl 1.1 for now
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 50989b2..749ae3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ apache2 (2.4.23-6) UNRELEASED; urgency=medium
 
   * One more tweak for reproducible build. Thanks to Daniel Shahaf for the
     patch. Closes: #839977
+  * Avoid building with openssl 1.1 for now. See #828236
 
  -- Stefan Fritsch <sf at debian.org>  Tue, 01 Nov 2016 22:37:32 +0100
 
diff --git a/debian/control b/debian/control
index 9bc98a1..5dfd9db 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Apache Maintainers <debian-apache at lists.debian.org>
 Uploaders: Stefan Fritsch <sf at debian.org>, Arno Töll <arno at debian.org>
 Build-Depends: debhelper (>= 9.20131213~), lsb-release, dpkg-dev (>= 1.16.1~),
  libaprutil1-dev (>= 1.5.0), libapr1-dev (>= 1.5.0), libpcre3-dev, zlib1g-dev,
- libnghttp2-dev, libssl-dev (>= 0.9.8m), perl,
+ libnghttp2-dev, libssl1.0-dev | libssl-dev (<< 1.1), perl,
  liblua5.2-dev, libxml2-dev, autotools-dev, gawk | awk,
  dh-systemd
 Build-Conflicts: autoconf2.13

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git