[SCM] Debian packaging of jifty branch, master, updated. debian/1.10518+dfsg-2-21-g0211523

[gregor herrmann]

The following commit has been merged in the master branch:
commit 284ef87d797ad53f2f42e20daade250855552b23
Author: gregor herrmann <gregoa at debian.org>
Date:   Tue Jun 25 20:39:44 2013 +0200

    Add patch yaml-syck.patch, taken from upstream git repo.
    
    Adjusts test suite to newer YAML::Syck.
    
    Closes: #713374

diff --git a/debian/patches/series b/debian/patches/series
index ba25012..f19d7af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ content_lacks-wants-scalar-not-regex.patch
 follow-symlink.patch
 spelling.patch
 img_tag_has_no_height_and_width.patch
+yaml-syck.patch
diff --git a/debian/patches/yaml-syck.patch b/debian/patches/yaml-syck.patch
new file mode 100644
index 0000000..28ac980
--- /dev/null
+++ b/debian/patches/yaml-syck.patch
@@ -0,0 +1,38 @@
+Origin: upstream git
+Bug: https://rt.cpan.org/Ticket/Display.html?id=86331
+Bug-Debian: http://bugs.debian.org/713374
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2013-06-25
+Applied-Upstream: https://github.com/bestpractical/jifty/commit/6015ebc
+
+From 6015ebc25e67b4b33f322df5b0c5313f91d0269e Mon Sep 17 00:00:00 2001
+From: Thomas Sibley <trs at bestpractical.com>
+Date: Mon, 24 Jun 2013 15:47:35 -0700
+Subject: [PATCH] YAML::Syck 1.22 fixed a spelling error in an error message
+ which we catch
+ .
+ As a result, we failed to catch the error and the SetupWizard tests
+ failed.  Refer to github.com/toddr/YAML-Syck.git at 28b4c69.
+ .
+ Resolves rt.cpan.org #86331.
+
+---
+ t/TestApp-Plugin-SetupWizard/lib/TestApp/Plugin/SetupWizard/Test.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/TestApp-Plugin-SetupWizard/lib/TestApp/Plugin/SetupWizard/Test.pm b/t/TestApp-Plugin-SetupWizard/lib/TestApp/Plugin/SetupWizard/Test.pm
+index f9215c9..ea103c5 100644
+--- a/t/TestApp-Plugin-SetupWizard/lib/TestApp/Plugin/SetupWizard/Test.pm
++++ b/t/TestApp-Plugin-SetupWizard/lib/TestApp/Plugin/SetupWizard/Test.pm
+@@ -34,7 +34,7 @@ sub site_config_is {
+     my $name     = shift;
+ 
+     my $got = eval { Jifty::YAML::LoadFile('etc/site_config.yml') };
+-    die $@ if $@ && $@ !~ /Cannot read from/ && $@ !~ /is empty or non-existant/; # XXX: sic from YAML::Syck
++    die $@ if $@ && $@ !~ /Cannot read from/ && $@ !~ /is empty or non-exist[ea]nt/; # Spelling error from YAML::Syck <= 1.21
+ 
+     Test::More::is_deeply($got, $expected, $name);
+ }
+-- 
+1.8.1.6
+

-- 
Debian packaging of jifty