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

[Arno Töll]

The following commit has been merged in the next branch:
commit 88f17a1b2e7d5af328fb0c39ea4bdbf0ef75d248
Author: Arno Töll <arno at debian.org>
Date:   Sun Apr 15 03:50:50 2012 +0200

    * rename usr-lib-cgi-bin.conf -> that sounds hopefully a bit more helpful
    * Remove comments from apache2.conf, we're done with it
    * Synchronize comments in 000-default.conf and default-ssl.conf
    * Provide httpd and httpd-cgi virtual packages again

diff --git a/debian/apache2.postinst b/debian/apache2.postinst
index 1b57d10..645d2d6 100644
--- a/debian/apache2.postinst
+++ b/debian/apache2.postinst
@@ -19,7 +19,7 @@ set -e
 #
 
 # XXX remove
-echo apache2.postinst $@ running
+# echo apache2.postinst $@ running
 
 OBSOLETE_CONFFILES="/etc/apache2/mods-available/authz_default.load
 /etc/apache2/mods-available/authn_default.load
@@ -221,9 +221,10 @@ enable_default_conf()
 			a2enconf -m -q $conf
 		done
 	fi
-	# This catches upgrades and new installs
-	if ! dpkg --compare-versions "$2" ge 2.4.1-4 ; then
-		a2enconf -m -q usr-lib-cgi-bin
+	# This line must catch upgrades, upgrades from Squeeze und fresh
+	# installs
+	if dpkg --compare-versions "$2" "le" "2.4.1-4" ; then
+		a2enconf -m -q serve-cgi-bin
 	fi
 }
 
diff --git a/debian/changelog b/debian/changelog
index dc4313e..ff64b29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,6 @@ apache2 (2.4.1-4) experimental; urgency=low
 
   [ Arno Töll ]
 
-  * NOT RELEASED YET
   * Drop update-alternative call in postrm. Our prerm script catches them
     already anyway.
   * Update my mail address.
@@ -18,7 +17,9 @@ apache2 (2.4.1-4) experimental; urgency=low
   * Fix apxs to import LDFLAGS from config_vars.mk. Moreover, make it possible
     to override LDFLAGS at compile time by defining LDLAGS in the environment,
     just like it is possible for CFLAGS. This also means, config_vars.mk now
-    exports hardening build flags by default
+    exports hardening build flags by default.
+  * Provide the virtual packages httpd and httpd-cgi again.
+
 
   [ Stefan Fritsch ]
 
@@ -35,7 +36,7 @@ apache2 (2.4.1-4) experimental; urgency=low
   * Change the compiled in default of DocumentRoot to /var/www by updating
     fhs_compliance.patch
 
- -- Arno Töll <arno at debian.org>  Sat, 14 Apr 2012 23:47:31 +0200
+ -- Arno Töll <arno at debian.org>  Sun, 15 Apr 2012 03:14:33 +0200
 
 apache2 (2.4.1-3) experimental; urgency=low
 
diff --git a/debian/config-dir/apache2.conf b/debian/config-dir/apache2.conf
index b0e2a80..4c8d959 100644
--- a/debian/config-dir/apache2.conf
+++ b/debian/config-dir/apache2.conf
@@ -50,9 +50,6 @@
 #   /etc/init.d/apache2 or apache2ctl. Calling /usr/bin/apache2 directly will not
 #   work with the default configuration.
 
-# TODO: Triage the following bugs involving conf changes:
-#	#340947 [w|  |  ] [apache2.2-common] apache2-common: standard path to virtual host document roots under /var/www?
-
 
 # Global configuration
 #
diff --git a/debian/config-dir/conf-available/usr-lib-cgi-bin.conf b/debian/config-dir/conf-available/serve-cgi-bin.conf
similarity index 100%
rename from debian/config-dir/conf-available/usr-lib-cgi-bin.conf
rename to debian/config-dir/conf-available/serve-cgi-bin.conf
diff --git a/debian/config-dir/sites-available/000-default.conf b/debian/config-dir/sites-available/000-default.conf
index b907859..decfca5 100644
--- a/debian/config-dir/sites-available/000-default.conf
+++ b/debian/config-dir/sites-available/000-default.conf
@@ -17,5 +17,5 @@
 	# include a it only for a particular virtual host. For example the
 	# following line enables the CGI configuration for this host
 	# only after disabling it globally with "a2disconf".
-	#Include conf-available/usr-lib-cgi-bin.conf
+	#Include conf-available/serve-cgi-bin.conf
 </VirtualHost>
diff --git a/debian/config-dir/sites-available/default-ssl.conf b/debian/config-dir/sites-available/default-ssl.conf
index ceddda9..850f1e0 100644
--- a/debian/config-dir/sites-available/default-ssl.conf
+++ b/debian/config-dir/sites-available/default-ssl.conf
@@ -13,12 +13,13 @@
 	ErrorLog ${APACHE_LOG_DIR}/error.log
 	CustomLog ${APACHE_LOG_DIR}/access.log combined
 
-	# For most configuration files from conf-available/, which are
-	# enabled or disabled at a global level, it is possible to
-	# include a it only for a particular virtual host. For example the
-	# following line enables the CGI configuration for this host
-	# only after disabling it globally with "a2disconf".
-	#Include conf-available/usr-lib-cgi-bin.conf
+
+        # For most configuration files from conf-available/, which are
+        # enabled or disabled at a global level, it is possible to
+        # include a it only for a particular virtual host. For example the
+        # following line enables the CGI configuration for this host
+        # only after disabling it globally with "a2disconf".
+        #Include conf-available/serve-cgi-bin.conf
 
 	#   SSL Engine Switch:
 	#   Enable/Disable SSL for this virtual host.
diff --git a/debian/control b/debian/control
index 456a4eb..ed772ba 100644
--- a/debian/control
+++ b/debian/control
@@ -48,7 +48,7 @@ Package: apache2-bin
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
 # MODULE_MAGIC_NUMBER_MAJOR from apache2/include/ap_mmn.h
-Provides: ${apache2:API}
+Provides: ${apache2:API}, httpd, httpd-cgi
 Suggests: www-browser, apache2-doc, apache2-suexec-pristine | apache2-suexec-custom
 Replaces: apache2.2-bin (<< 2.3~), apache2.2-common
 Conflicts: apache2.2-bin (<< 2.3~), apache2.2-common

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