[libhtml-tidy-perl] 03/13: Refresh patches

[Florian Schlichting]

This is an automated email from the git hooks/post-receive script.

fsfs pushed a commit to branch master
in repository libhtml-tidy-perl.

commit b25c6dfaf9975b2b71ad585adf908ddacd38043b
Author: Florian Schlichting <fsfs at debian.org>
Date:   Fri Oct 4 23:29:17 2013 +0200

    Refresh patches
---
 debian/patches/fix-error-message-in-webtidy |   10 +++--
 debian/patches/remove-tidy_version.patch    |   59 ++++++++++++++++++++-------
 2 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/debian/patches/fix-error-message-in-webtidy b/debian/patches/fix-error-message-in-webtidy
index c11c3dd..afdfb7c 100644
--- a/debian/patches/fix-error-message-in-webtidy
+++ b/debian/patches/fix-error-message-in-webtidy
@@ -1,11 +1,13 @@
-make it more debianish
+Description: make webtidy error message more debianish
+Author: Ryan Niebur <ryan at debian.org>
+Forwarded: not-needed
 
 --- a/bin/webtidy
 +++ b/bin/webtidy
-@@ -30,7 +30,7 @@
+@@ -29,7 +29,7 @@
+     my @lines;
      if ( $url =~ /^https?:/ ) {
-         eval { require LWP::Simple };
-         if ( $@ ) {
+         if ( !eval { require LWP::Simple; 1; } ) {
 -            warn q{Can't retrieve URLs without LWP::Simple installed};
 +            warn q{Can't retrieve URLs without the libwww-perl package installed};
              next;
diff --git a/debian/patches/remove-tidy_version.patch b/debian/patches/remove-tidy_version.patch
index 6897789..6bbeffa 100644
--- a/debian/patches/remove-tidy_version.patch
+++ b/debian/patches/remove-tidy_version.patch
@@ -16,7 +16,7 @@ Forwarded: not-needed
 -
 -
 -SV*
--_tidy_version()
+-_tidyp_version()
 -    PREINIT:
 -        const char* version;
 -    CODE:
@@ -24,20 +24,40 @@ Forwarded: not-needed
 -        RETVAL = newSVpv(version,0); /* will be automatically "mortalized" */
 -    OUTPUT:
 -        RETVAL
+--- a/t/version.t
++++ b/t/version.t
+@@ -7,7 +7,12 @@
+ 
+ use HTML::Tidy;
+ 
++SKIP: {
++    skip 'libtidy_version has been removed in Debian', 4;
++
+ for my $version_string (HTML::Tidy->tidyp_version, HTML::Tidy->libtidyp_version) {
+     like( $version_string, qr/^\d\.\d{2,}$/, 'Valid version string' );
+     cmp_ok( $version_string, '>=', '0.90', 'Version is greater than 0.90, which is the one I maintain' );
+ }
++
++}
 --- a/lib/HTML/Tidy.pm
 +++ b/lib/HTML/Tidy.pm
-@@ -339,18 +339,6 @@
+@@ -341,23 +341,6 @@
      return 1;
  }
  
--=head2 libtidy_version()
+-=head2 tidyp_version()
 -
--Returns the version of the underling tidy library.
+-=head2 libtidyp_version()
+-
+-Returns the version of the underling tidyp library.
 -
 -=cut
 -
--sub libtidy_version {
--    my $version_str = _tidy_version();
+-# backcompat
+-sub libtidyp_version { return shift->tidyp_version }
+-
+-sub tidyp_version {
+-    my $version_str = _tidyp_version();
 -
 -    return $version_str;
 -}
@@ -45,14 +65,23 @@ Forwarded: not-needed
  require XSLoader;
  XSLoader::load('HTML::Tidy', $VERSION);
  
---- a/t/version.t
-+++ b/t/version.t
-@@ -5,6 +5,8 @@
- use Test::More;
+--- a/t/00-load.t
++++ b/t/00-load.t
+@@ -8,5 +8,5 @@
+ use HTML::Tidy;
+ use HTML::Tidy::Message;
  
- BEGIN {
-+    plan skip_all => 'libtidy_version has been removed in Debian';
-+
-     plan tests => 3;
-     use_ok( 'HTML::Tidy' );
+-diag( "Testing HTML::Tidy $HTML::Tidy::VERSION, Perl $]; tidyp " . HTML::Tidy->tidyp_version() );
++diag( "Testing HTML::Tidy $HTML::Tidy::VERSION, Perl $];" );
+ pass( 'Modules loaded' );
+--- a/bin/webtidy
++++ b/bin/webtidy
+@@ -19,7 +19,7 @@
+ ) or $help = 1;
+ 
+ if ( !@ARGV || $help ) {
+-    print "webtidy v$HTML::Tidy::VERSION using tidyp v" . HTML::Tidy::tidyp_version() . "\n";
++    print "webtidy v$HTML::Tidy::VERSION \n";
+     print <DATA>;
+     exit 1;
  }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libhtml-tidy-perl.git