[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. fc27dba553cb0c1244ccfb1baba4041da16499c4

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit 149b4971a42ba9c25febc23b9965a53c86084b37
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Thu Feb 16 02:12:14 2012 +0100

    Only include conf.d/*.conf, not conf.d/*.

diff --git a/debian/apache2.postinst b/debian/apache2.postinst
index 971da10..3b6cfe8 100755
--- a/debian/apache2.postinst
+++ b/debian/apache2.postinst
@@ -133,6 +133,7 @@ refresh_modules()
 }
 
 #XXX: Move /var/cache/apache2/mod_disk_cache to /var/cache/apache2/mod_cache_disk?
+#XXX: Handle rename of conf.d/*
 
 
 #DEBHELPER#
diff --git a/debian/changelog b/debian/changelog
index 5165d1f..e81c869 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -73,6 +73,7 @@ apache2 (2.3.16-beta-1) UNRELEASED; urgency=low
 
   [ Stefan Fritsch ]
   * Use "dh --with autotools_dev" instead of patching config.sub/config.guess.
+  * Only include conf.d/*.conf, not conf.d/*.
 
  -- Arno Töll <debian at toell.net>  Sat, 11 Feb 2012 03:30:10 +0100
 
diff --git a/debian/config-dir/apache2.conf b/debian/config-dir/apache2.conf
index cea69b5..b58a7c7 100644
--- a/debian/config-dir/apache2.conf
+++ b/debian/config-dir/apache2.conf
@@ -162,7 +162,7 @@ LogFormat "%{User-agent}i" agent
 # see README.Debian for details.
 
 # Include generic snippets of statements
-IncludeOptional conf.d/*
+IncludeOptional conf.d/*.conf
 
 # Include the virtual host configurations:
 IncludeOptional sites-enabled/*
diff --git a/debian/config-dir/conf.d/charset b/debian/config-dir/conf.d/charset.conf
similarity index 100%
rename from debian/config-dir/conf.d/charset
rename to debian/config-dir/conf.d/charset.conf
diff --git a/debian/config-dir/conf.d/localized-error-pages b/debian/config-dir/conf.d/localized-error-pages.conf
similarity index 100%
rename from debian/config-dir/conf.d/localized-error-pages
rename to debian/config-dir/conf.d/localized-error-pages.conf
diff --git a/debian/config-dir/conf.d/other-vhosts-access-log b/debian/config-dir/conf.d/other-vhosts-access-log.conf
similarity index 100%
rename from debian/config-dir/conf.d/other-vhosts-access-log
rename to debian/config-dir/conf.d/other-vhosts-access-log.conf
diff --git a/debian/config-dir/conf.d/security b/debian/config-dir/conf.d/security.conf
similarity index 100%
rename from debian/config-dir/conf.d/security
rename to debian/config-dir/conf.d/security.conf

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