r53081 - in /trunk/libhtml-tidy-perl/debian: changelog patches/remove-tidy_version.patch patches/series

[jawnsy-guest at users.alioth.debian.org]

Author: jawnsy-guest
Date: Sat Feb 20 14:09:19 2010
New Revision: 53081

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=53081
Log:
Add a patch to remove dependency on modified libtidy

Added:
    trunk/libhtml-tidy-perl/debian/patches/remove-tidy_version.patch
Modified:
    trunk/libhtml-tidy-perl/debian/changelog
    trunk/libhtml-tidy-perl/debian/patches/series

Modified: trunk/libhtml-tidy-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tidy-perl/debian/changelog?rev=53081&op=diff
==============================================================================
--- trunk/libhtml-tidy-perl/debian/changelog (original)
+++ trunk/libhtml-tidy-perl/debian/changelog Sat Feb 20 14:09:19 2010
@@ -10,6 +10,7 @@
   * Rewrite control description
   * Add myself to Uploaders and Copyright
   * Remove fix-segfault patch, it has been applied upstream
+  * Add a patch to remove dependency on modified libtidy
 
   [ Nathan Handler ]
   * debian/watch: Update to ignore development releases.

Added: trunk/libhtml-tidy-perl/debian/patches/remove-tidy_version.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tidy-perl/debian/patches/remove-tidy_version.patch?rev=53081&op=file
==============================================================================
--- trunk/libhtml-tidy-perl/debian/patches/remove-tidy_version.patch (added)
+++ trunk/libhtml-tidy-perl/debian/patches/remove-tidy_version.patch Sat Feb 20 14:09:19 2010
@@ -1,0 +1,58 @@
+Description: remove tidyVersion as it is a special call
+ to Andy Lester's modified version of libtidy. Also remove
+ the corresponding call from Perl, the documentation, and
+ the tests.
+Author: gregor herrmann <gregoa at debian.org>
+Reviewed-by: Jonathan Yu <jawnsy at cpan.org>
+Origin: vendor
+Forwarded: not-needed
+
+--- a/Tidy.xs
++++ b/Tidy.xs
+@@ -189,14 +189,3 @@
+         if ( rc < 0 ) {
+             XSRETURN_UNDEF;
+         }
+-
+-
+-SV*
+-_tidy_version()
+-    PREINIT:
+-        const char* version;
+-    CODE:
+-        version = tidyVersion();
+-        RETVAL = newSVpv(version,0); /* will be automatically "mortalized" */
+-    OUTPUT:
+-        RETVAL
+--- a/lib/HTML/Tidy.pm
++++ b/lib/HTML/Tidy.pm
+@@ -339,18 +339,6 @@
+     return 1;
+ }
+ 
+-=head2 libtidy_version()
+-
+-Returns the version of the underling tidy library.
+-
+-=cut
+-
+-sub libtidy_version {
+-    my $version_str = _tidy_version();
+-
+-    return $version_str;
+-}
+-
+ require XSLoader;
+ XSLoader::load('HTML::Tidy', $VERSION);
+ 
+--- a/t/version.t
++++ b/t/version.t
+@@ -9,6 +9,8 @@
+     use_ok( 'HTML::Tidy' );
+ }
+ 
++plan skip_all => 'Tests skipped, libtidy_version has been removed in Debian';
++
+ my $version_string = HTML::Tidy->libtidy_version();
+ like( $version_string, qr/^\d\.\d{2,}$/, 'Valid version string' );
+ 

Modified: trunk/libhtml-tidy-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tidy-perl/debian/patches/series?rev=53081&op=diff
==============================================================================
--- trunk/libhtml-tidy-perl/debian/patches/series (original)
+++ trunk/libhtml-tidy-perl/debian/patches/series Sat Feb 20 14:09:19 2010
@@ -1,1 +1,2 @@
 fix-error-message-in-webtidy
+remove-tidy_version.patch