From: Joey Hess <joey@kitenet.net>
Date: Fri, 6 May 2011 18:38:27 +0000 (-0400)
Subject: Add conflict with libyaml-libyaml-perl, since that library does not support utf8...
X-Git-Tag: 3.20110431~126
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/fc79f2252eae573fdb4fbde95700f41ddad04a40
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)
---
diff --git a/debian/changelog b/debian/changelog
index bb9f9d2f8..fc8fafc70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ 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)
-- Joey Hess <joeyh@debian.org> Thu, 05 May 2011 13:02:19 -0400
diff --git a/debian/control b/debian/control
index eaf67a37c..616963216 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
-Conflicts: ikiwiki-plugin-table
+Conflicts: ikiwiki-plugin-table, libyaml-libyaml-perl
Replaces: ikiwiki-plugin-table
Provides: ikiwiki-plugin-table
Description: a wiki compiler
diff --git a/doc/bugs/yaml_setup_file_does_not_support_UTF-8_if_XS_is_installed.mdwn b/doc/bugs/yaml_setup_file_does_not_support_UTF-8_if_XS_is_installed.mdwn
index 349464844..11032cde2 100644
--- a/doc/bugs/yaml_setup_file_does_not_support_UTF-8_if_XS_is_installed.mdwn
+++ b/doc/bugs/yaml_setup_file_does_not_support_UTF-8_if_XS_is_installed.mdwn
@@ -62,4 +62,7 @@ preferred one?
>>> these will anyway be kinda ugly, so...
>>>> I was wrong: I just experienced that bug with YAML::XS 0.34-1
->>>> too. Seems like [[!cpanrt 54683]]. --[[intrigeri]]
+>>>> too. Seems like [[!cpanrt 54683]]. --[[intrigeri]]a
+
+>>>>> Yes, [[!debbug 625713]] reports this also affects debian unstable.
+>>>>> So, I will add a conflict I guess. [[done]] --[[Joey]]