[SCM] Debian packaging for apache2 branch, master, updated. debian/2.2.22-3-28-g425eeef

[Arno Töll]

The following commit has been merged in the master branch:
commit a5c0465b6da2859a465cc274fa9e8e93623f6ace
Author: Arno Töll <arno at debian.org>
Date:   Mon Jun 11 11:22:18 2012 +0200

    Be even more explicit in apache2.conf comment. Closes 676975

diff --git a/debian/changelog b/debian/changelog
index f854577..9feaa04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apache2 (2.2.22-8) UNRELEASED; urgency=low
+
+  * Fix "contradictory comment in /etc/apache2/apache2.conf about the
+    .load suffix" (Closes: #676975). Hopefully you are now happy, Vincent. :-)
+
+ -- Arno Töll <arno at debian.org>  Mon, 11 Jun 2012 11:14:57 +0200
+
 apache2 (2.2.22-7) unstable; urgency=low
 
   [ Arno Töll ]
diff --git a/debian/config-dir/apache2.conf b/debian/config-dir/apache2.conf
index 74fad11..c1fdd70 100644
--- a/debian/config-dir/apache2.conf
+++ b/debian/config-dir/apache2.conf
@@ -40,7 +40,7 @@
 #
 #   Yet we strongly suggest that all configuration files either end with a
 #   .conf or .load suffix in the file name. The next Debian release will
-#   ignore files not ending with .conf.
+#   ignore files not ending with .conf (nor .load for mods-enabled).
 #
 # * ports.conf is always included from the main configuration file. It is
 #   supposed to determine listening ports for incoming connections, and which
@@ -57,8 +57,8 @@
 #
 # * Configuration files in the conf.d directory are either provided by other
 #   packages or may be added by the local administrator. Local additions
-#   should start with local- or end with .local or .local.conf to avoid name
-#   clashes. All files in conf.d are considered (excluding the exceptions noted
+#   should start with local- or end with .local.conf to avoid name clashes. All
+#   files in conf.d are considered (excluding the exceptions noted
 #   above) by the Apache 2 web server.
 #
 # * The binary is called apache2. Due to the use of environment variables, in

-- 
Debian packaging for apache2