summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl/debian/find_html2text.diff
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-06-17 00:19:42 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-01 15:39:58 +0100
commit3f7e55baa6b65b39c5698bb58320f85876cebe23 (patch)
tree398e48b0e167f958d084ce1e8ccf25162ac9f0a8 /meta/recipes-devtools/perl/perl/debian/find_html2text.diff
parenta01d406f6b0d9e08ce6d7408c2928a433fdf1843 (diff)
downloadpoky-3f7e55baa6b65b39c5698bb58320f85876cebe23.tar.gz
perl: 5.20.0 -> 5.22.0
* Remove: - perl-5.14.3-fix-CVE-2010-4777.patch: backport - fix-FF_MORE-crash.patch: backport - perl-rprovides.inc: it was introduced by 5.8.7, the lines in it are like: RPROVIDES_perl-module-b-asmdata = "perl-module-${TARGET_SYS}-b-asmdata" If some packages do RPDEND on something like perl-module-${TARGET_SYS}-b-asmdatam, we need update the package rather than keep use RPROVIDES in perl-rprovides.inc, so remove it. - perl-rprovides_5.20.0.inc: it only has one line: RPROVIDES_perl-module-module-build, but the perl-module-module-build is gone in 5.22.0, so remove it. * Update: - debian patches from http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.20.0-1.debian.tar.xz - Makefile.SH.patch - Merge 0001-Makefile.SH-fix-do_install-failed.patch into Makefile.SH.patch - native-nopacklist.patch - config.sh * The CGI.pm and Module::Build disappear from core, so no perl-module-module-build.rpm any more, more info: http://perltricks.com/article/165/2015/4/10/A-preview-of-Perl-5-22 (From OE-Core rev: 06d43a90acbe63baea62d220659149a3ff2f9198) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/perl/debian/find_html2text.diff')
-rw-r--r--meta/recipes-devtools/perl/perl/debian/find_html2text.diff35
1 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl/debian/find_html2text.diff b/meta/recipes-devtools/perl/perl/debian/find_html2text.diff
new file mode 100644
index 0000000000..d319e7518b
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/find_html2text.diff
@@ -0,0 +1,35 @@
1From c81dbdedff9e9b4fb75ac028aa718838c0292d2f Mon Sep 17 00:00:00 2001
2From: Andreas Marschke <andreas.marschke@googlemail.com>
3Date: Sat, 17 Sep 2011 11:38:42 +0100
4Subject: Configure CPAN::Distribution with correct name of html2text
5
6Bug-Debian: http://bugs.debian.org/640479
7Patch-Name: debian/find_html2text.diff
8
9If you use cpan from Debian you usually wind up trying to read online
10documentation through it. Unfortunately cpan can't find the
11html2text.pl script even though it is installed using the Debian
12package 'html2text'.
13
14Please see the attached patch for a quick fix of this issue.
15
16[Maintainer's note: html2text in Debian is not the same implementation
17as the html2text.pl which is expected, but should provide similar
18functionality].
19---
20 cpan/CPAN/lib/CPAN/Distribution.pm | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/cpan/CPAN/lib/CPAN/Distribution.pm b/cpan/CPAN/lib/CPAN/Distribution.pm
24index 092b781..5c2bae1 100644
25--- a/cpan/CPAN/lib/CPAN/Distribution.pm
26+++ b/cpan/CPAN/lib/CPAN/Distribution.pm
27@@ -4099,7 +4099,7 @@ sub _display_url {
28 if $CPAN::DEBUG;
29
30 # should we define it in the config instead?
31- my $html_converter = "html2text.pl";
32+ my $html_converter = "html2text";
33
34 my $web_browser = $CPAN::Config->{'lynx'} || undef;
35 my $web_browser_out = $web_browser