[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, master, updated. debian/2.2.22-3-20-g8d2ee8d

[Arno Töll]

The following commit has been merged in the master branch:
commit 8d2ee8d5b32c67ed56f6f3ed07dc76e384845415
Author: Arno Töll <arno at debian.org>
Date:   Wed Jun 6 00:20:11 2012 +0200

    Fix contradictions in apache2.conf (closes 675184)

diff --git a/debian/changelog b/debian/changelog
index 325a1b6..2a6878d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apache2 (2.2.22-7) UNRELEASED; urgency=low
+
+  * UNRELEASED
+  * Fix "ambiguous comment in /etc/apache2/apache2.conf" by clarifying
+    contradicting statements. (Closes: #675184)
+
+ -- Arno Töll <arno at debian.org>  Wed, 06 Jun 2012 00:10:34 +0200
+
 apache2 (2.2.22-6) unstable; urgency=low
 
   [ Stefan Fritsch ]
diff --git a/debian/config-dir/apache2.conf b/debian/config-dir/apache2.conf
index 1d0128a..76479b2 100644
--- a/debian/config-dir/apache2.conf
+++ b/debian/config-dir/apache2.conf
@@ -38,6 +38,10 @@
 #   - contain a character that is neither letter nor number nor _-.
 #   - contain .dpkg
 #
+#   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.
+#
 # * ports.conf is always included from the main configuration file. It is
 #   supposed to determine listening ports for incoming connections, and which
 #   of these ports are used for name based virtual hosts.
@@ -54,7 +58,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 included 
+#   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
 #   the default configuration, apache2 needs to be started/stopped with

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)