Bump

debian/changelog

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 mod-proxy-protocol (0.2-2) UNRELEASED; urgency=medium
 
   * Add patch for CVE-2019-10097
@@ -11,8 +10,6 @@ mod-proxy-protocol (0.2-1) xenial; urgency=low
 
  -- Roadrunner2 <roadrunner2@github.com>  Tue, 20 Mar 2018 02:11:49 -0700
 
-=======
->>>>>>> upstream/0.1
 mod-proxy-protocol (0.1-1) trusty; urgency=low
 
   * Initial release

debian/control

@@ -8,7 +8,7 @@ Homepage: https://github.com/roadrunner2/mod-proxy-protocol
 
 Package: libapache2-mod-proxy-protocol
 Architecture: amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-api-20120211, apache2 (>= 2.4.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-api-20120211
 Description: Apache module for proxy protocol
  The proxy protocol is a way for upstream proxies and load-balancers to
  for the ip-address of the client to the server. This package contains

debian/docs

@@ -1,5 +1,4 @@
 README.md
 mod_proxy_protocol.xml
 mod_proxy_protocol.xml.meta
-mod_proxy_protocol.html
 debian/README.Debian

debian/lintian-overrides

@@ -0,0 +1,2 @@
+libapache2-mod-proxy-protocol: apache2-module-depends-on-real-apache2-package
+libapache2-mod-proxy-protocol: copyright-should-refer-to-common-license-file-for-apache-2

debian/rules

@@ -4,7 +4,7 @@
 
 build:
 	dh_testdir
-	make all docs
+	make all # docs
 
 clean:
 	dh_testdir