[SCM] Debian packaging of jifty branch, master, updated. 97286577237c24c0129277673635d92687a610da

[Florian Schlichting]

The following commit has been merged in the master branch:
commit 542aa153e82fe7655c24b469ad396cff6899b066
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Thu Aug 25 21:55:42 2011 +0000

    New patch: content_lacks-wants-scalar-not-regex.patch

diff --git a/debian/changelog b/debian/changelog
index 257c9cb..e4debb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ jifty (1.10518+dfsg-1) UNRELEASED; urgency=low
     libshell-command-perl)
   * One of the upstream releases fixes the RC bug (Closes: #611368)
   * Bump Standards-Version and debhelper compatibility level (no change).
+  * New patch: content_lacks-wants-scalar-not-regex.patch
 
  -- Jonathan Yu <jawnsy at cpan.org>  Fri, 15 Jul 2011 19:30:37 -0400
 
diff --git a/debian/copyright b/debian/copyright
index 64178af..d6bdf10 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -121,6 +121,7 @@ License: other-BSD
 Files: debian/*
 Copyright: 2008, 2009, AGOSTINI Yves <agostini at univ-metz.fr>
  2009-2011, gregor herrmann <gregoa at debian.org>
+ 2011, Florian Schlichting <fschlich at zedat.fu-berlin.de>
 License: Artistic or GPL-1+
 
 Files: debian/json.js
diff --git a/debian/patches/content_lacks-wants-scalar-not-regex.patch b/debian/patches/content_lacks-wants-scalar-not-regex.patch
new file mode 100644
index 0000000..ab3cc4e
--- /dev/null
+++ b/debian/patches/content_lacks-wants-scalar-not-regex.patch
@@ -0,0 +1,86 @@
+Description: from 1.34 Test::WWW:Mechanize->content_lacks() will throw a fatal 
+ error when passed a (regex-)reference instead of a scalar. As the value 
+ passed doesn't need regular expression powers, we just change it into
+ a scalar.
+Origin: vendor
+Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=70489
+Author: Florian Schlichting <fschlich at zedat.fu-berlin.de> 
+
+--- a/t/Mapper/t/01-raw-api.t
++++ b/t/Mapper/t/01-raw-api.t
+@@ -29,62 +29,62 @@
+ #### Degenerate cases
+ $mech->get("$URL/index.html?J:M-foo=");
+ $mech->content_like(qr/foo: ''/, "Nothing shows up as the empty string");
+-$mech->content_lacks(qr/J:M-foo/, "Doesn't have mapping parameter");
++$mech->content_lacks('J:M-foo', "Doesn't have mapping parameter");
+ 
+ $mech->get("$URL/index.html?J:M-foo=bar");
+ $mech->content_like(qr/foo: bar/, "String sets to value");
+-$mech->content_lacks(qr/J:M-foo/, "Doesn't have mapping parameter");
++$mech->content_lacks('J:M-foo', "Doesn't have mapping parameter");
+ 
+ 
+ #### Flat arguments
+ $mech->get("$URL/index.html?J:M-foo=A`bar");
+ $mech->content_like(qr/foo: ~/, "Passing no parameter sets to undef");
+-$mech->content_lacks(qr/J:M-foo/, "Doesn't have mapping parameter");
++$mech->content_lacks('J:M-foo', "Doesn't have mapping parameter");
+ 
+ $mech->get("$URL/index.html?J:M-foo=A`bar;bar=baz");
+ $mech->content_like(qr/foo: baz/, "Passing parameter sets to value");
+-$mech->content_lacks(qr/J:M-foo/, "Doesn't have mapping parameter");
++$mech->content_lacks('J:M-foo', "Doesn't have mapping parameter");
+ 
+ $mech->get("$URL/index.html?J:M-foo=A`bar;bar=baz;bar=troz");
+ $mech->content_like(qr/bar: &1\s*\n\s+- baz\n\s+- troz/, "Multiple parameters are list");
+ $mech->content_like(qr/foo: \*1/, "Multiple parameters are to same reference");
+-$mech->content_lacks(qr/J:M-foo/, "Doesn't have mapping parameter");
++$mech->content_lacks('J:M-foo', "Doesn't have mapping parameter");
+ 
+ 
+ #### Action results
+ $mech->get("$URL/index.html?J:M-foo=R`grail`bar");
+ $mech->content_like(qr/foo: ~/, "Action doesn't exist, sets to undef");
+-$mech->content_lacks(qr/J:M-foo/, "Doesn't have mapping parameter");
++$mech->content_lacks('J:M-foo', "Doesn't have mapping parameter");
+ 
+ $mech->get("$URL/index.html?J:M-foo=R`grail`bar;J:A-grail=GetGrail");
+ $mech->content_like(qr/foo: ~/, "Content name doesn't exist, sets to undef");
+-$mech->content_lacks(qr/J:M-foo/, "Doesn't have mapping parameter");
++$mech->content_lacks('J:M-foo', "Doesn't have mapping parameter");
+ 
+ $mech->get("$URL/index.html?J:M-foo=R`grail`castle;J:A-grail=GetGrail");
+ $mech->content_like(qr/foo: Aaaaaargh/, "Content name exists, sets to value");
+-$mech->content_lacks(qr/J:M-foo/, "Doesn't have mapping parameter");
++$mech->content_lacks('J:M-foo', "Doesn't have mapping parameter");
+ 
+ 
+ #### Action arguments
+ $mech->get("$URL/index.html?J:M-foo=A`bridge`bar");
+ $mech->content_like(qr/foo: ~/, "Action doesn't exist, sets to undef");
+-$mech->content_lacks(qr/J:M-foo/, "Doesn't have mapping parameter");
++$mech->content_lacks('J:M-foo', "Doesn't have mapping parameter");
+ 
+ $mech->get("$URL/index.html?J:M-foo=A`bridge`bar;J:A-bridge=CrossBridge");
+ $mech->content_like(qr/foo: ~/, "Argument name doesn't exist, sets to undef");
+-$mech->content_lacks(qr/J:M-foo/, "Doesn't have mapping parameter");
++$mech->content_lacks('J:M-foo', "Doesn't have mapping parameter");
+ 
+ $mech->get("$URL/index.html?J:M-foo=A`bridge`quest;J:A-bridge=CrossBridge");
+ $mech->content_like(qr/foo: ~/, "Argument is valid but missing, sets to undef");
+-$mech->content_lacks(qr/J:M-foo/, "Doesn't have mapping parameter");
++$mech->content_lacks('J:M-foo', "Doesn't have mapping parameter");
+ 
+ $mech->get("$URL/index.html?J:M-foo=A`bridge`name;J:A-bridge=CrossBridge");
+ $mech->content_like(qr/foo: ~/, "Argument is valid with default_value but missing, sets to undef");
+-$mech->content_lacks(qr/J:M-foo/, "Doesn't have mapping parameter");
++$mech->content_lacks('J:M-foo', "Doesn't have mapping parameter");
+ 
+ $mech->get("$URL/index.html?J:M-foo=A`bridge`quest;J:A-bridge=CrossBridge;J:A:F-quest-bridge=grail");
+ $mech->content_like(qr/foo: grail/, "Argument is valid, sets to submitted value");
+-$mech->content_lacks(qr/J:M-foo/, "Doesn't have mapping parameter");
++$mech->content_lacks('J:M-foo', "Doesn't have mapping parameter");
+ 
+ 1;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index cd31e32..e41c206 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+content_lacks-wants-scalar-not-regex.patch
 follow-symlink.patch
 #spelling.patch

-- 
Debian packaging of jifty