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

[sf at alioth.debian.org]

Author: sf
Date: Sat Dec  3 16:58:47 2011
New Revision: 1371

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1371
Log:
Correctly handle images/... style relative links when rewriting the URLs in 
the docs

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

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1371&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Sat Dec  3 16:58:47 2011
@@ -1,5 +1,6 @@
 apache2 (2.2.21-3) UNRELEASED; urgency=low
 
+  * Fix broken link in docs. Closes: #650528
   * Remove Tollef Fog Heen, Thom May, and Peter Samuelson from uploaders.
     Thanks for your work in the past.
 

Modified: trunk/apache2/convert_docs
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/convert_docs?rev=1371&op=diff
==============================================================================
--- trunk/apache2/convert_docs (original)
+++ trunk/apache2/convert_docs Sat Dec  3 16:58:47 2011
@@ -77,13 +77,13 @@
 	$file =~ s{href="([^:"]*/)"}{href="${1}index.html"}g;
 
 	# style and images now one level up
-	$file =~ s{(src|href)="../(style|images)}{$1="../../$2}g;
-	$file =~ s{(src|href)="./(style|images)}{$1="../$2}g;
+	$file =~ s{(src|href)="\.\./(style|images)}{$1="../../$2}g;
+	$file =~ s{(src|href)="(?:\./)?(style|images)}{$1="../$2}g;
 
 	foreach my $l (values %lpath) {
 		# language directories one level up
 		$file =~ s{href="\.\./$l}{href="../../$l}g;
-		$file =~ s{href="\./$l}{href="../$l}g;
+		$file =~ s{href="(?:\./)?$l}{href="../$l}g;
 	}
 
 	# Debian tweaks