[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 dcb32f96da88956b4a1b6660d63619ba58a65a05
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Thu Feb 16 02:19:43 2012 +0100

    Don't create httpd.conf anymore.

diff --git a/debian/README.Debian b/debian/README.Debian
index e9ec4ac..c16c430 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -75,10 +75,6 @@ conf.d/
 	directory. He can then put symlinks to the files in conf.d
 	which he wants to enable into conf.d.enabled.
 
-httpd.conf
-
-	Empty file.
-
 magic
 
 	Patterns for mod_mime_magic. This is not compatible with the format
diff --git a/debian/apache2.postinst b/debian/apache2.postinst
index 3b6cfe8..de98cf3 100755
--- a/debian/apache2.postinst
+++ b/debian/apache2.postinst
@@ -88,8 +88,6 @@ install_default_site()
 
 install_default_files()
 {
-	[ -f /etc/apache2/httpd.conf ] || touch /etc/apache2/httpd.conf
-
 	if [ ! -e /var/www/index.html ] ; then
 		cp /usr/share/apache2/default-site/index.html /var/www/index.html
         fi
@@ -134,6 +132,7 @@ refresh_modules()
 
 #XXX: Move /var/cache/apache2/mod_disk_cache to /var/cache/apache2/mod_cache_disk?
 #XXX: Handle rename of conf.d/*
+#XXX: Move httpd.conf into conf.d if not empty, add comment what it used to be
 
 
 #DEBHELPER#
diff --git a/debian/changelog b/debian/changelog
index e81c869..11ffa4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -74,6 +74,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/*.
+  * Don't create httpd.conf anymore.
 
  -- 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 b58a7c7..c77394e 100644
--- a/debian/config-dir/apache2.conf
+++ b/debian/config-dir/apache2.conf
@@ -123,9 +123,6 @@ DocumentRoot /var/www
 IncludeOptional mods-enabled/*.load
 IncludeOptional mods-enabled/*.conf
 
-# Include all the user configurations:
-Include httpd.conf
-
 # Include ports listing
 Include ports.conf
 

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