summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2011-04-15 15:12:34 +0200
committerTails developers <amnesia@boum.org>2011-04-15 15:12:34 +0200
commitc37977e4586464572600bd38b4cd045dfbb4d24e (patch)
treeb4811b68c412685352465db1390d9c83ab64b98e
parent93d16c805f1b4ebba23e4dcd0300f91f21d69865 (diff)
Use (and depend on) the fixed YAML::XS version.
-rwxr-xr-xauto/scripts/ikiwiki-supported-languages3
-rw-r--r--debian/control3
2 files changed, 4 insertions, 2 deletions
diff --git a/auto/scripts/ikiwiki-supported-languages b/auto/scripts/ikiwiki-supported-languages
index d2da585..6eb7750 100755
--- a/auto/scripts/ikiwiki-supported-languages
+++ b/auto/scripts/ikiwiki-supported-languages
@@ -32,8 +32,7 @@ use warnings;
use 5.10.1;
use IkiWiki::Plugin::po;
-use YAML::Any qw{LoadFile};
-$YAML::Syck::ImplicitUnicode=1;
+use YAML::XS qw{LoadFile};
sub usage {
"Usage: ikiwiki-supported-languages YAML_IKIWIKI_SETUP_FILE";
diff --git a/debian/control b/debian/control
index aefa7d42..663d0d6 100644
--- a/debian/control
+++ b/debian/control
@@ -17,12 +17,15 @@ Depends: ${misc:Depends},
gettext,
ikiwiki,
libyaml-perl,
+ libyaml-libyaml-perl (>= 0.34-1~),
live-build (>= 2.0.3),
perlmagick,
po4a,
syslinux (>= 2:4.01+dfsg-1),
time,
whois
+Conflicts:
+ libyaml-libyaml-perl (< 0.34-1~)
Description: a Tor-ified, amnesic Live System
The Amnesic Incognito Live System is aimed at preserving its users' privacy:
- any outgoing connection to the Internet is forced to go through