New upstream release

3 files changed, 4 insertions, 113 deletions

diff --git a/debian/changelog b/debian/changelog
index 5b2ec78..a577c37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-libtest-html-content-perl (0.08-3) UNRELEASED; urgency=medium
+libtest-html-content-perl (0.09-1) UNRELEASED; urgency=medium
 
   * Switch to copyright-format 1.0
   * Switch to debhelper compat to 8
   * Update Standards-Version (no changes)
+  * New upstream release
+    - new patch perl-5.14-stringification, integrated upstream 
 
- -- Dominic Hargreaves <dom@earth.li>  Sun, 09 Feb 2014 21:56:14 +0000
+ -- Dominic Hargreaves <dom@earth.li>  Sun, 09 Feb 2014 22:00:59 +0000
 
 libtest-html-content-perl (0.08-2) unstable; urgency=low
 
diff --git a/debian/patches/perl-5.14-stringification b/debian/patches/perl-5.14-stringification
deleted file mode 100644
index 335ea8b..0000000
--- a/debian/patches/perl-5.14-stringification
+++ /dev/null
@@ -1,110 +0,0 @@
-Subject: Fix tests with perl 5.14
-Author: gregor herrmann <gregoa@debian.org>
-Bug-Debian: http://bugs.debian.org/636520
-Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=70099
-
---- libtest-html-content-perl-0.08.orig/t/08-errors.comment.t
-+++ libtest-html-content-perl-0.08/t/08-errors.comment.t
-@@ -13,6 +13,10 @@
-   plan skip_all => "Test::Builder::Tester required for testing error messages";
- }
- 
-+# perldelta 5.14
-+# Accept both old and new-style stringification
-+my $modifiers = (qr/foobar/ =~ /\Q(?^/) ? "^" : "-xism";
-+
- sub run {
-  # Test that each exported function fails as documented
- 
-@@ -48,7 +52,7 @@
-    #} else {
-      test_diag("Saw '<!-- hidden massage -->'",
-                "Saw '<!-- hidden massage -->'",
--               "Expected no comment like '(?-xism:hidden m.ssage)'");
-+               "Expected no comment like '(?$modifiers:hidden m.ssage)'");
-    #};
-  no_comment("<!-- hidden massage --><!-- hidden massage -->",
-          qr"hidden m.ssage","Comment failure (two comments that shouldn't exist do)");
-@@ -61,7 +65,7 @@
-    #} else {
-      test_diag("Saw '<!-- hidden massage -->'",
-                "Saw '<!-- hidden massage -->'",
--               "Expected exactly 3 comments like '(?-xism:hidden m.ssage)'");
-+               "Expected exactly 3 comments like '(?$modifiers:hidden m.ssage)'");
-    #};
-  comment_count("<!-- hidden massage --><!-- hidden massage -->",
-          qr"hidden m.ssage",3,"Comment failure (too few comments)");
-@@ -74,7 +78,7 @@
-    #} else {
-      test_diag("Saw '<!-- hidden massage -->'",
-                "Saw '<!-- hidden massage -->'",
--               "Expected exactly 1 comments like '(?-xism:hidden m.ssage)'");
-+               "Expected exactly 1 comments like '(?$modifiers:hidden m.ssage)'");
-    #};
-  comment_count("<!-- hidden massage --><!-- hidden massage -->",
-          qr"hidden m.ssage",1,"Comment failure (too few comments)");
-only in patch2:
-unchanged:
---- libtest-html-content-perl-0.08.orig/t/07-errors.link.t
-+++ libtest-html-content-perl-0.08/t/07-errors.link.t
-@@ -14,6 +14,10 @@
-   }
- };
- 
-+# perldelta 5.14
-+# Accept both old and new-style stringification
-+my $modifiers = (qr/foobar/ =~ /\Q(?^/) ? "^" : "-xism";
-+
- sub run {
-   # Test that each exported function fails as documented
-   test_out("not ok 1 - Link failure (no links)");
-@@ -51,13 +55,13 @@
-   test_fail(+14);
-   if ($Test::HTML::Content::can_xpath eq 'XML::LibXML') {
-     test_diag("Expected to find no <a> tag(s) matching",
--              "  href = (?-xism:.)",
-+              "  href = (?$modifiers:.)",
-               "Got",
-               '  <a href="http://www.foo.com">foo</a>',
-               '  <a href="index.html">Home</a>');
-   } else {
-     test_diag("Expected to find no <a> tag(s) matching",
--              "  href = (?-xism:.)",
-+              "  href = (?$modifiers:.)",
-               "Got",
-               "  <a href='http://www.foo.com'>",
-               "  <a href='index.html'>");
-@@ -70,13 +74,13 @@
-   test_fail(+14);
-   if ($Test::HTML::Content::can_xpath eq 'XML::LibXML') {
-     test_diag("Expected to find exactly 3 <a> tag(s) matching",
--              "  href = (?-xism:.)",
-+              "  href = (?$modifiers:.)",
-               "Got",
-               '  <a href="http://www.foo.com">foo</a>',
-               '  <a href="index.html">Home</a>');
-   } else {
-     test_diag("Expected to find exactly 3 <a> tag(s) matching",
--              "  href = (?-xism:.)",
-+              "  href = (?$modifiers:.)",
-               "Got",
-               "  <a href='http://www.foo.com'>",
-               "  <a href='index.html'>");
-@@ -88,7 +92,7 @@
-   test_fail(+18);
-   if ($Test::HTML::Content::can_xpath eq 'XML::LibXML') {
-     test_diag("Expected to find exactly 3 <a> tag(s) matching",
--              "  href = (?-xism:.)",
-+              "  href = (?$modifiers:.)",
-               "Got",
-               '  <a href="http://www.bar.com">bar</a>',
-               '  <a href="http://www.dot.com">.</a>',
-@@ -96,7 +100,7 @@
-               '  <a href="index.html">Home</a>');
-   } else {
-     test_diag("Expected to find exactly 3 <a> tag(s) matching",
--              "  href = (?-xism:.)",
-+              "  href = (?$modifiers:.)",
-               "Got",
-               "  <a href='http://www.bar.com'>",
-               "  <a href='http://www.dot.com'>",
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ce6ad4d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-perl-5.14-stringification