[apache2] 05/06: dh_ apache2: Be less strict with versioned recommends

[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 29342912dda6303042533c195771bc9707bb4243
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Thu Aug 11 15:04:17 2016 +0200

    dh_ apache2: Be less strict with versioned recommends
    
    It will just make backports harder and there is no reason to recommend the
    current version. Instead use the last version with significant changes
    to apache2-maintscript-helper.
---
 debian/changelog               | 2 ++
 debian/debhelper/dh_apache2.in | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5cf71df..45c3122 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ apache2 (2.4.23-3) UNRELEASED; urgency=low
     local admin has disabled the requested mpm manually.
     Closes: #827446, #799630
   * Make mod_proxy_html depend on mod_xml2enc.
+  * dh_apache2: Make versioned recommends on apache2 less strict. There is
+    no advantage in recommending the current version. Closes: #784290
 
  -- Stefan Fritsch <sf at debian.org>  Wed, 10 Aug 2016 11:25:02 +0200
 
diff --git a/debian/debhelper/dh_apache2.in b/debian/debhelper/dh_apache2.in
index 24bc054..3652d07 100755
--- a/debian/debhelper/dh_apache2.in
+++ b/debian/debhelper/dh_apache2.in
@@ -477,7 +477,7 @@ foreach my $package ((@{$dh{DOPACKAGES}}))
 	if ($#{$PACKAGE_TYPE{'has_a_conf_file'}} >= 0 or $#{$PACKAGE_TYPE{'has_a_site_conf'}} >= 0)
 	{
 		$PACKAGE_TYPE{'dependency_line'} .= "| httpd";
-		addsubstvar($package, "misc:Recommends", "apache2 (" . apache_version() . ") " . $PACKAGE_TYPE{'dependency_line'} );
+		addsubstvar($package, "misc:Recommends", "apache2 ( >= 2.4.6-4~ ) " . $PACKAGE_TYPE{'dependency_line'} );
 
 		my $confs = "";
 		my $sites = "";

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