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

[Stefan Fritsch]

The following commit has been merged in the master branch:
commit 5d452ab46479769915b0f3cfc3ec729e0f28d5a8
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon May 28 21:02:13 2012 +0200

    Note in README.Debian that future versions of the package will have the
    include statements changed to include only *.conf.

diff --git a/debian/README.Debian b/debian/README.Debian
index 5b77244..f18d22b 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -61,9 +61,12 @@ conf.d/
 	# Include generic snippets of statements
 	Include /etc/apache2/conf.d
 
+	Future versions of the package will narrow this down to only include
+	files that end with ".conf".
+
 	This is a good place to add additional configuration
 	directives. Packages should not use configuration
-	files that start with 'local-' or end with '.local'.
+	files that start with 'local-' or end with '.local.conf'.
 	The local administrator can use these filenames to make
 	sure that there are no conflicts with files provided by
 	packages.
@@ -77,9 +80,9 @@ conf.d/
 
 httpd.conf
 
-	This file used to be included by apache2.conf. If it contained
-	local configuration it has been moved to conf.d/httpd.conf during
-	upgrade.
+	This file used to be included by apache2.conf but is not anymore.
+	If it contained local modifications it has been moved to
+	conf.d/httpd.conf during upgrade.
 
 magic
 
@@ -134,6 +137,11 @@ The Include directive ignores files with names that
 - contain a character that is neither letter nor number nor _-.
 - contain .dpkg
 
+In a future version of the package, this special handling will be removed.
+Instead, the relevant Include statements (especially for sites-enabled and
+conf.d) in the configuration will be modified to only include files that end
+with ".conf".
+
 Other files
 -----------
 
diff --git a/debian/changelog b/debian/changelog
index b1fdb31..9773b29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ apache2 (2.2.22-6) UNRELEASED; urgency=low
     Closes: #402567
   * Don't create httpd.conf anymore and don't include it in apache2.conf. If
     it contains local modifications, move it to /etc/apache2/conf.d/httpd.conf
+  * Note in README.Debian that future versions of the package will have the
+    include statements changed to include only *.conf.
 
  -- Stefan Fritsch <sf at debian.org>  Mon, 28 May 2012 20:02:19 +0200
 

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