[Pkg-apache-commits] r999 - in /trunk/apache2: changelog convert_docs

[sf at alioth.debian.org]

Author: sf
Date: Mon Jul 27 20:39:16 2009
New Revision: 999

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=999
Log:
Change references to httpd.conf in apache2-doc to apache2.conf

Modified:
    trunk/apache2/changelog
    trunk/apache2/convert_docs

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=999&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Mon Jul 27 20:39:16 2009
@@ -10,6 +10,8 @@
     README.Debian (closes #511878).
   * Make a2ensite and friends ignore the same filenames as apache does for
     included config files, even if LANG is not C.
+  * Change references to httpd.conf in apache2-doc to apache2.conf
+    (closes: #465393).
   * Remove 2.0 -> 2.2 upgrade logic from maintainer scripts.
   * Remove other_vhosts_access.log on package purge.
 

Modified: trunk/apache2/convert_docs
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/convert_docs?rev=999&op=diff
==============================================================================
--- trunk/apache2/convert_docs (original)
+++ trunk/apache2/convert_docs Mon Jul 27 20:39:16 2009
@@ -85,7 +85,10 @@
 		$file =~ s{href="\.\./$l}{href="../../$l}g;
 		$file =~ s{href="\./$l}{href="../$l}g;
 	}
-	
+
+	# Debian tweaks
+	$file =~ s{/usr/local/apache2/conf/httpd[.]conf}{/etc/apache2/apache2.conf}g
+	$file =~ s{httpd[.]conf}{apache2.conf}g
 
 	open(my $out, ">", $new);
 	print $out $file;