[SCM] Debian packaging for apache2 branch, master, updated. debian/2.4.4-6-13-gcc403de

[Arno Töll]

The following commit has been merged in the master branch:
commit cc403dec38773aa807ae196794190929914db8a3
Author: Arno Töll <arno at debian.org>
Date:   Sat Jul 20 12:38:51 2013 +0200

    correctly detect alternative httpds  to be supported when using dh_apache2. We are off by one

diff --git a/debian/changelog b/debian/changelog
index 6d1d60e..9ab3e7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,13 +8,15 @@ apache2 (2.4.4-7) UNRELEASED; urgency=low
     arguments supplied to to sh sub-function. Allow manual override in such
     cases.
   * Mention that the dh_apache2 conditional must be present in postrm too (Closes: #716694)
+  * Fix "dh_apache2 ignores alternative httpd on conf files" by correctly
+    checking the supplied arguments, we were off by one (Closes: #717299).
 
   [ Stefan Fritsch ]
   * Don't fail package upgrade or removal just because the configuration is in
     an inconsistent state. Closes: #716921
   * Improve error output of init script.
 
- -- Arno Töll <arno at debian.org>  Sat, 13 Jul 2013 22:20:05 +0200
+ -- Arno Töll <arno at debian.org>  Sat, 20 Jul 2013 12:37:31 +0200
 
 apache2 (2.4.4-6) unstable; urgency=low
 
diff --git a/debian/debhelper/dh_apache2.in b/debian/debhelper/dh_apache2.in
index 7b51644..bd6d261 100755
--- a/debian/debhelper/dh_apache2.in
+++ b/debian/debhelper/dh_apache2.in
@@ -383,7 +383,7 @@ foreach my $package ((@{$dh{DOPACKAGES}}))
 			elsif($type eq "conf")
 			{
 
-				if ($#arguments > 0)
+				if ($#arguments >= 0)
 				{
 					$PACKAGE_TYPE{'dependency_line'} .= " | " . join("", @arguments);
 				}

-- 
Debian packaging for apache2