[SCM] Debian packaging of libhtml-copy-perl branch, master, updated. debian/1.30-2-5-gd7a57ee

gregor herrmann gregoa at debian.org
Fri Jun 28 12:11:09 UTC 2013


The following commit has been merged in the master branch:
commit 809c07839ffd71dac7ba03e3818a9d1b1d997f10
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Jun 28 14:07:52 2013 +0200

    Drop patches, both applied upstream.

diff --git a/debian/patches/Strings_with_code_points_over_0xFF.patch b/debian/patches/Strings_with_code_points_over_0xFF.patch
deleted file mode 100644
index 0d4394e..0000000
--- a/debian/patches/Strings_with_code_points_over_0xFF.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Description: Fix test failure.
- From perldiag in 5.18:
- .
- Strings with code points over 0xFF may not be mapped into in-memory file handles
- .
-  (W utf8) You tried to open a reference to a scalar for read or append
-  where the scalar contained code points over 0xFF. In-memory files model
-  on-disk files and can only contain bytes.
-Origin: vendor
-Bug: http://rt.cpan.org/Public/Bug/Display.html?id=85949
-Bug-Debian: http://bugs.debian.org/711448
-Forwarded: http://rt.cpan.org/Public/Bug/Display.html?id=85949
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2013-06-18
-
---- a/t/parse.t
-+++ b/t/parse.t
-@@ -6,6 +6,7 @@
- use utf8;
- use File::Spec::Functions;
- #use Data::Dumper;
-+use Encode qw(encode_utf8 decode_utf8);
- 
- use Test::More tests => 16;
- 
-@@ -109,7 +110,7 @@
- ok($copy_html eq $result_html_nocharset, "copy_to no charset shift_jis");
- 
- ##== HTML with charset uft-8
--my $src_html_utf8 = <<EOT;
-+my $src_html_utf8 = encode_utf8(<<EOT);
- <!DOCTYPE html>
- <html>
- <head>
-@@ -126,7 +127,7 @@
- </html>
- EOT
- 
--my $result_html_utf8 = <<EOT;
-+my $result_html_utf8 = encode_utf8(<<EOT);
- <!DOCTYPE html>
- <html>
- <head>
-@@ -174,7 +175,7 @@
-     read_and_unlink($destination, $p);
- };
- 
--ok($copy_html eq $result_html_utf8, "copy_to giviing a file handle");
-+ok($copy_html eq decode_utf8($result_html_utf8), "copy_to giving a file handle");
- 
- ##=== copy_to gving file handles for input and output
- $copy_html = do {
-@@ -187,7 +188,7 @@
-     Encode::decode($p->encoding, $outdata);
- };
- 
--ok($copy_html eq $result_html_utf8, "copy_to giviing file handles for input and output");
-+ok($copy_html eq decode_utf8($result_html_utf8), "copy_to giving file handles for input and output");
- 
- ##=== parse_to giving a file handle
- $copy_html = do {
-@@ -196,7 +197,7 @@
-     $p->parse_to($destination);
- };
- 
--ok($copy_html eq $result_html_utf8, "copy_to giviing file handles for input and output");
-+ok($copy_html eq decode_utf8($result_html_utf8), "copy_to giving file handles for input and output");
- 
- ##=== copy_to with directory destination
- $copy_html = do {
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 15bdf10..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-Strings_with_code_points_over_0xFF.patch
-spelling.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
deleted file mode 100644
index 2953b89..0000000
--- a/debian/patches/spelling.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: add some spelling mistakes
-Origin: vendor
-Bug: https://rt.cpan.org/Ticket/Display.html?id=86206
-Forwarded: https://rt.cpan.org/Ticket/Display.html?id=86206
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2013-06-17
-
---- a/lib/HTML/Copy.pm
-+++ b/lib/HTML/Copy.pm
-@@ -112,7 +112,7 @@
- 
-     $p = HTML::Copy->new($source);
- 
--Make an instance of this module with specifing a source of HTML.
-+Make an instance of this module with specifying a source of HTML.
- 
- The argument $source can be a file path or a file handle. When a file handle is passed, you may need to indicate a file path of the passed file handle by the method L<"source_path">. If calling L<"source_path"> is omitted, it is assumed that the location of the file handle is the current working directory.
- 
-@@ -289,7 +289,7 @@
-     $p->io_layer;
-     $p->io_layer(':utf8');
- 
--Get and set PerlIO layer to read the source path and to write the destination path. Usualy it was automatically determined by $source_path's charset tag. If charset is not specified, Encode::Guess module will be used.
-+Get and set PerlIO layer to read the source path and to write the destination path. Usually it was automatically determined by $source_path's charset tag. If charset is not specified, Encode::Guess module will be used.
- 
- =cut
- 
-@@ -312,7 +312,7 @@
-     @suspects = $p->encode_sustects;
-     $p->encode_suspects(qw/shiftjis euc-jp/);
- 
--Add suspects of text encoding to guess the text encoding of the source HTML. If the source HTML have charset tag, it is not requred to add suspects.
-+Add suspects of text encoding to guess the text encoding of the source HTML. If the source HTML have charset tag, it is not required to add suspects.
- 
- =cut
- 

-- 
Debian packaging of libhtml-copy-perl



More information about the Pkg-perl-cvs-commits mailing list