diff -Nru ikiwiki-3.20111229ubuntu1/Bundle/IkiWiki.pm ikiwiki-3.20120115ubuntu1/Bundle/IkiWiki.pm --- ikiwiki-3.20111229ubuntu1/Bundle/IkiWiki.pm 2012-01-09 06:38:24.000000000 +0000 +++ ikiwiki-3.20120115ubuntu1/Bundle/IkiWiki.pm 2012-01-26 05:04:15.000000000 +0000 @@ -16,7 +16,7 @@ =head1 CONTENTS -Text::Markdown +Text::Markdown::Discount HTML::Scrubber HTML::Template HTML::Parser diff -Nru ikiwiki-3.20111229ubuntu1/CHANGELOG ikiwiki-3.20120115ubuntu1/CHANGELOG --- ikiwiki-3.20111229ubuntu1/CHANGELOG 2012-01-18 14:23:53.000000000 +0000 +++ ikiwiki-3.20120115ubuntu1/CHANGELOG 2012-01-27 07:47:17.000000000 +0000 @@ -1,3 +1,32 @@ +ikiwiki (3.20120115ubuntu1) precise; urgency=low + + * Merge from Debian testing. Remaining changes: + - Drop wdg-html-validator from Build-Depends field. The xmlns set in the + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + -- Angel Abad Fri, 27 Jan 2012 08:37:47 +0100 + +ikiwiki (3.20120115) unstable; urgency=low + + * Make backlink(.) work. Thanks, Giuseppe Bilotta. + * mdwn: Workaround discount's eliding of