* Build-depend on libtext-wikiformat-perl, so that the syntax check of

   the wikiformat plugin works. Thanks, Emanuele Aina.
 * Patch from Alessandro Dotti Contra to clean up backlinks and navbar
   display, running them through pagetitle. This removes ugly underscores and
   other gunk from the display, much nicer. You may want to rebuild your wiki
   when upgrading to get the cleanup globally.

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 02dbd34bd53dd48183c461325b388bc42a21a92f..caec7f1f01999361f5f416b9f8d3a096e5adb492 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -58,7 +58,7 @@ sub backlinks ($) { #{{{
                                $p_trimmed=~s/^\Q$dir\E// &&
                                $page_trimmed=~s/^\Q$dir\E//;
                                       
-                       push @links, { url => $href, page => $p_trimmed };
+                       push @links, { url => $href, page => pagetitle($p_trimmed) };
                }
        }
 
@@ -76,7 +76,7 @@ sub parentlinks ($) { #{{{
        foreach my $dir (reverse split("/", $page)) {
                if (! $skip) {
                        $path.="../";
-                       unshift @ret, { url => "$path$dir.html", page => $dir };
+                       unshift @ret, { url => "$path$dir.html", page => pagetitle($dir) };
                }
                else {
                        $skip=0;

diff --git a/debian/changelog b/debian/changelog
index c50f52eae27e75a6a4a3e038bbc2e1f1f0ef8eed..84b806b3b03e338342ae849bf8eadd3b5f453d05 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,14 @@ ikiwiki (1.13) UNRELEASED; urgency=low
 
   * New pagestats plugin from Enrico, which can generate a table counting
     the backlinks for each page, or a del.icio.us style cloud.
-
- -- Joey Hess <joeyh@debian.org>  Sat, 29 Jul 2006 13:30:16 -0400
+  * Build-depend on libtext-wikiformat-perl, so that the syntax check of
+    the wikiformat plugin works. Thanks, Emanuele Aina.
+  * Patch from Alessandro Dotti Contra to clean up backlinks and navbar
+    display, running them through pagetitle. This removes ugly underscores and
+    other gunk from the display, much nicer. You may want to rebuild your wiki
+    when upgrading to get the cleanup globally.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 29 Jul 2006 14:22:18 -0400
 
 ikiwiki (1.12) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 6880a83844b582b532665befea2b96f666a629c8..19cdddf8eda65a71d99e3e2f220637f0e5889b1f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: ikiwiki
 Section: web
 Priority: optional
 Build-Depends: perl, debhelper (>= 5)
-Build-Depends-Indep: dpkg-dev (>= 1.9.0), markdown, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator
+Build-Depends-Indep: dpkg-dev (>= 1.9.0), markdown, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, libtext-wikiformat-perl
 Maintainer: Joey Hess <joeyh@debian.org>
 Standards-Version: 3.7.2