Merge commit 'origin/debian-testing' into debian-testing

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ea44081aa25f33c693d0c82b19bc081a38fbfa9d..d2f7dcc06b7eb4ef3579e33bbefb82cfdfacaa1a 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -564,7 +564,7 @@ sub urlto ($$;$) { #{{{
        }
 
        if ($absolute) {
-               return $config{url}.beautify_urlpath("/".$to);
+               return $config{url}.beautify_url("/".$to);
        }
 
        my $link = abs2rel($to, dirname(htmlpage($from)));

diff --git a/debian/changelog b/debian/changelog
index 7cd659962057b243658060ebe208635382637326..ff408c55c9acbfeb50a058f64f8ae16f6184baa8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (2.53.2) testing-proposed-updates; urgency=low
+
+  * Fix bad patch backport that broke generation of rss/atom feeds. Closes: #498224
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 08 Sep 2008 11:40:27 -0400
+
 ikiwiki (2.53.1) testing-proposed-updates; urgency=low
 
   * Backported all relevant bug fixes from mainline to debian testing.