[libhtml-tidy-perl] 04/13: Add new tidy-not-tidyp.patch

[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 810184c8993641456f1e2a19cb5bcfc9288bcd15
Author: Florian Schlichting <fsfs at debian.org>
Date:   Fri Oct 4 23:29:37 2013 +0200

    Add new tidy-not-tidyp.patch
---
 debian/patches/series               |    1 +
 debian/patches/tidy-not-tidyp.patch |   36 +++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index a6b6500..57718d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix-error-message-in-webtidy
 remove-tidy_version.patch
+tidy-not-tidyp.patch
diff --git a/debian/patches/tidy-not-tidyp.patch b/debian/patches/tidy-not-tidyp.patch
new file mode 100644
index 0000000..1b781cd
--- /dev/null
+++ b/debian/patches/tidy-not-tidyp.patch
@@ -0,0 +1,36 @@
+Description: look for and use tidy.h in /usr/include/tidy (from libtidy-dev)
+Author: Florian Schlichting <fsfs at debian.org>
+Forwarded: not-needed
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -10,7 +10,7 @@
+ use Config;
+ 
+ my $libs = '-ltidyp';
+-my $inc = "-I. -I/usr/include/tidyp -I/usr/local/include/tidyp -I$Config{usrinc}/tidyp";
++my $inc = "-I. -I/usr/include/tidy -I/usr/local/include/tidy -I$Config{usrinc}/tidy";
+ 
+ eval { require Alien::Tidyp; };
+ 
+@@ -20,8 +20,8 @@
+     $inc = Alien::Tidyp->config('INC');
+ }
+ else {
+-    print "Alien::Tidyp not found. Looking for for tidyp on your system.\n";
+-    my @vars = ExtUtils::Liblist->ext( '-L/usr/lib -L/usr/local/lib -ltidyp', 0, 1 );
++    print "Alien::Tidyp not found. Looking for for tidy on your system.\n";
++    my @vars = ExtUtils::Liblist->ext( '-L/usr/lib -L/usr/local/lib -ltidy', 0, 1 );
+     $libs = $vars[2];
+ 
+     if ( !$libs ) {
+--- a/Tidy.xs
++++ b/Tidy.xs
+@@ -2,7 +2,7 @@
+ #include "perl.h"
+ #include "XSUB.h"
+ 
+-#include <tidyp.h>
++#include <tidy.h>
+ #include <buffio.h>
+ #include <stdio.h>
+ #include <errno.h>

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