[apache2] 02/03: Fix changelog, control after upstream merge

[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 576263df2233c70481490067f5980b31074cdb78
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Oct 24 10:45:09 2015 +0200

    Fix changelog, control after upstream merge
    
    * add libnghttp2-dev build-dep for http2
    * bump version number
---
 debian/changelog | 4 +++-
 debian/control   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 83e2c78..cf50f8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-apache2 (2.4.16-4) UNRELEASED; urgency=medium
+apache2 (2.4.17-1) UNRELEASED; urgency=medium
 
   [ Stefan Fritsch ]
+  * New upstream release:
+    - New experimental http2 module
   * reproducible build: Make symbol sorting consistent over different locales
   * Conflict with apache2.2-common and apache2.2-bin to get the transitional
     packages removed. Closes: #768815
diff --git a/debian/control b/debian/control
index 7239f64..f1dc6aa 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,
- libssl-dev (>= 0.9.8m), perl,
+ libnghttp2-dev, libssl-dev (>= 0.9.8m), perl,
  liblua5.1-0-dev, libxml2-dev, autotools-dev, gawk | awk
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.9.6

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