diff options
| author | Joey Hess <joey@kitenet.net> | 2011-05-12 17:50:25 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-05-12 17:50:25 -0400 |
| commit | 97a8d30dc1e7928253d55d12d372c0769683a865 (patch) | |
| tree | bcb5d711fa73ca96aabff04e4c3839c641a13134 /debian | |
| parent | 0c71184c42622b79b88ab64919e16c642ccc4f34 (diff) | |
| download | ikiwiki-97a8d30dc1e7928253d55d12d372c0769683a865.tar ikiwiki-97a8d30dc1e7928253d55d12d372c0769683a865.tar.gz | |
Support YAML::XS by not passing decoded unicode to Load. Closes: #625713
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 9765d5a3e..e89042e9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,9 +3,7 @@ ikiwiki (3.20110431) UNRELEASED; urgency=low * Danish translation update. Closes: #625721 * Danish underlay translation update. Closes: #625765 (Thanks, Jonas Smedegaard) - * Add conflict with libyaml-libyaml-perl, since that library does - not support utf8. Closes: #625713 - (see https://rt.cpan.org/Public/Bug/Display.html?id=54683) + * Support YAML::XS by not passing decoded unicode to Load. Closes: #625713 * openid, aggregate, pinger: Use Net::INET6Glue if available to support making ipv6 connections. (Note that if LWPx::ParanoidAgent is installed, it defeats this for openid.) diff --git a/debian/control b/debian/control index c7d7e6544..202f82db6 100644 --- a/debian/control +++ b/debian/control @@ -39,7 +39,7 @@ Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, libsparkline-php, texlive, dvipng, libtext-wikicreole-perl, libsort-naturally-perl, libtext-textile-perl, libhighlight-perl, po4a (>= 0.35-1), gettext, libnet-inet6glue-perl -Conflicts: ikiwiki-plugin-table, libyaml-libyaml-perl +Conflicts: ikiwiki-plugin-table Replaces: ikiwiki-plugin-table Provides: ikiwiki-plugin-table Description: a wiki compiler |