r17776 - in /trunk/libtext-csv-perl/debian: changelog patches/01_cvs.pm.patch patches/02_tests.patch patches/03_csv_xs.pm.patch
gregoa-guest at users.alioth.debian.org
gregoa-guest at users.alioth.debian.org
Tue Mar 18 03:23:33 UTC 2008
Author: gregoa-guest
Date: Tue Mar 18 03:23:31 2008
New Revision: 17776
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=17776
Log:
RFH: t/80_diag.t fails; either 02_tests.patch or even 01_cvs.pm.patch need
some changes. hopefully someone is more familiar with AutoLoader and
friends ...
* Refresh and update patches.
Modified:
trunk/libtext-csv-perl/debian/changelog
trunk/libtext-csv-perl/debian/patches/01_cvs.pm.patch
trunk/libtext-csv-perl/debian/patches/02_tests.patch
trunk/libtext-csv-perl/debian/patches/03_csv_xs.pm.patch
Modified: trunk/libtext-csv-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/debian/changelog?rev=17776&op=diff
==============================================================================
--- trunk/libtext-csv-perl/debian/changelog (original)
+++ trunk/libtext-csv-perl/debian/changelog Tue Mar 18 03:23:31 2008
@@ -1,11 +1,14 @@
libtext-csv-perl (0.37-1) UNRELEASED; urgency=low
- NOTE: the patches need some care. (got to run now)
+ RFH: t/80_diag.t fails; either 02_tests.patch or even 01_cvs.pm.patch need
+ some changes. hopefully someone is more familiar with AutoLoader and
+ friends ...
* New upstream release.
* debian/copyright: update/add copyright notices.
-
- -- gregor herrmann <gregor+debian at comodo.priv.at> Mon, 17 Mar 2008 21:47:51 +0100
+ * Refresh and update patches.
+
+ -- gregor herrmann <gregor+debian at comodo.priv.at> Tue, 18 Mar 2008 04:20:02 +0100
libtext-csv-perl (0.34-1) unstable; urgency=low
Modified: trunk/libtext-csv-perl/debian/patches/01_cvs.pm.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/debian/patches/01_cvs.pm.patch?rev=17776&op=diff
==============================================================================
--- trunk/libtext-csv-perl/debian/patches/01_cvs.pm.patch (original)
+++ trunk/libtext-csv-perl/debian/patches/01_cvs.pm.patch Tue Mar 18 03:23:31 2008
@@ -3,9 +3,8 @@
##
## create CSV.pm
-diff -urNad libtext-csv-perl-0.30~/CSV.pm libtext-csv-perl-0.30/CSV.pm
---- libtext-csv-perl-0.30~/CSV.pm 1970-01-01 01:00:00.000000000 +0100
-+++ libtext-csv-perl-0.30/CSV.pm 2007-07-15 15:27:52.000000000 +0200
+--- /dev/null
++++ libtext-csv-perl/CSV.pm
@@ -0,0 +1,14 @@
+
+package Text::CSV;
Modified: trunk/libtext-csv-perl/debian/patches/02_tests.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/debian/patches/02_tests.patch?rev=17776&op=diff
==============================================================================
--- trunk/libtext-csv-perl/debian/patches/02_tests.patch (original)
+++ trunk/libtext-csv-perl/debian/patches/02_tests.patch Tue Mar 18 03:23:31 2008
@@ -3,20 +3,16 @@
##
## patch tests
-Index: libtext-csv-perl/t/01_pod.t
-===================================================================
---- libtext-csv-perl.orig/t/01_pod.t 2008-01-04 09:50:09.000000000 +0200
-+++ libtext-csv-perl/t/01_pod.t 2008-01-04 09:50:30.000000000 +0200
+--- libtext-csv-perl.orig/t/01_pod.t
++++ libtext-csv-perl/t/01_pod.t
@@ -7,4 +7,4 @@
eval "use Test::Pod::Coverage tests => 1";
plan skip_all => "Test::Pod::Covarage required for testing POD Coverage" if $@;
-pod_coverage_ok ("Text::CSV_XS", "Text::CSV_XS is covered");
+pod_coverage_ok ("Text::CSV_XS", "Text::CSV is covered");
-Index: libtext-csv-perl/t/10_base.t
-===================================================================
---- libtext-csv-perl.orig/t/10_base.t 2008-01-04 09:50:09.000000000 +0200
-+++ libtext-csv-perl/t/10_base.t 2008-01-04 09:50:30.000000000 +0200
+--- libtext-csv-perl.orig/t/10_base.t
++++ libtext-csv-perl/t/10_base.t
@@ -6,33 +6,33 @@
use Test::More tests => 61;
@@ -57,12 +53,10 @@
is ($csv->fields, undef, "fields () before parse ()");
is ($csv->string, undef, "string () undef before combine");
-Index: libtext-csv-perl/t/12_acc.t
-===================================================================
---- libtext-csv-perl.orig/t/12_acc.t 2008-01-04 09:50:09.000000000 +0200
-+++ libtext-csv-perl/t/12_acc.t 2008-01-04 09:50:30.000000000 +0200
+--- libtext-csv-perl.orig/t/12_acc.t
++++ libtext-csv-perl/t/12_acc.t
@@ -6,12 +6,12 @@
- use Test::More tests => 39;
+ use Test::More tests => 44;
BEGIN {
- use_ok "Text::CSV_XS";
@@ -77,7 +71,7 @@
is ($csv->quote_char, '"', "quote_char");
is ($csv->escape_char, '"', "escape_char");
-@@ -46,7 +46,7 @@
+@@ -48,7 +48,7 @@
qq{=txt \\=, "Hi!"=;=Yes=;==;=2=;;=1.09=;=\r=;\r}, "string");
# Funny settings, all three translate to \0 internally
@@ -86,10 +80,8 @@
sep_char => undef,
quote_char => undef,
escape_char => undef,
-Index: libtext-csv-perl/t/15_flags.t
-===================================================================
---- libtext-csv-perl.orig/t/15_flags.t 2008-01-04 09:50:09.000000000 +0200
-+++ libtext-csv-perl/t/15_flags.t 2008-01-04 09:50:30.000000000 +0200
+--- libtext-csv-perl.orig/t/15_flags.t
++++ libtext-csv-perl/t/15_flags.t
@@ -6,8 +6,8 @@
use Test::More tests => 173;
@@ -155,11 +147,9 @@
ok ( $csv->parse ("+"), "ESC");
ok (!$csv->parse ("++"), "ESC ESC");
-Index: libtext-csv-perl/t/20_file.t
-===================================================================
---- libtext-csv-perl.orig/t/20_file.t 2008-01-04 09:50:09.000000000 +0200
-+++ libtext-csv-perl/t/20_file.t 2008-01-04 09:50:30.000000000 +0200
-@@ -7,13 +7,13 @@
+--- libtext-csv-perl.orig/t/20_file.t
++++ libtext-csv-perl/t/20_file.t
+@@ -7,11 +7,11 @@
use Test::More tests => 82;
BEGIN {
@@ -168,15 +158,13 @@
+ use_ok "Text::CSV";
+ plan skip_all => "Cannot load Text::CSV" if $@;
}
-
- use IO::Handle;
-my $csv = Text::CSV_XS->new ();
+my $csv = Text::CSV->new ();
ok (!$csv->print (*FH, ["abc", "def\007", "ghi"]), "print bad character");
-@@ -100,7 +100,7 @@
+@@ -98,7 +98,7 @@
is ($csv->eof, 1, "EOF");
# Edge cases
@@ -185,11 +173,9 @@
for ([ 1, 1, "\n" ],
[ 2, 1, "+\n" ],
[ 3, 1, "+" ],
-Index: libtext-csv-perl/t/21_lexicalio.t
-===================================================================
---- libtext-csv-perl.orig/t/21_lexicalio.t 2008-01-04 09:50:09.000000000 +0200
-+++ libtext-csv-perl/t/21_lexicalio.t 2008-01-04 09:50:30.000000000 +0200
-@@ -16,14 +16,14 @@
+--- libtext-csv-perl.orig/t/21_lexicalio.t
++++ libtext-csv-perl/t/21_lexicalio.t
+@@ -16,12 +16,12 @@
}
BEGIN {
@@ -198,8 +184,6 @@
+ use_ok "Text::CSV";
+ plan skip_all => "Cannot load Text::CSV" if $@;
}
-
- use IO::Handle;
my $io;
-my $csv = Text::CSV_XS->new ();
@@ -207,7 +191,7 @@
ok (!$csv->print ($io, ["abc", "def\007", "ghi"]), "print bad character");
-@@ -110,7 +110,7 @@
+@@ -108,7 +108,7 @@
is ($csv->eof, 1, "EOF");
# Edge cases
@@ -216,11 +200,9 @@
for ([ 1, 1, "\n" ],
[ 2, 1, "+\n" ],
[ 3, 1, "+" ],
-Index: libtext-csv-perl/t/22_scalario.t
-===================================================================
---- libtext-csv-perl.orig/t/22_scalario.t 2008-01-04 09:50:09.000000000 +0200
-+++ libtext-csv-perl/t/22_scalario.t 2008-01-04 09:50:30.000000000 +0200
-@@ -19,15 +19,15 @@
+--- libtext-csv-perl.orig/t/22_scalario.t
++++ libtext-csv-perl/t/22_scalario.t
+@@ -19,13 +19,13 @@
}
BEGIN {
@@ -229,8 +211,6 @@
+ use_ok "Text::CSV";
+ plan skip_all => "Cannot load Text::CSV" if $@;
}
-
- use IO::Handle;
my $io;
my $io_str;
@@ -239,7 +219,7 @@
ok (!$csv->print ($io, ["abc", "def\007", "ghi"]), "print bad character");
-@@ -114,7 +114,7 @@
+@@ -112,7 +112,7 @@
is ($csv->eof, 1, "EOF");
# Edge cases
@@ -248,10 +228,8 @@
for ([ 1, 1, "\n" ],
[ 2, 1, "+\n" ],
[ 3, 1, "+" ],
-Index: libtext-csv-perl/t/30_types.t
-===================================================================
---- libtext-csv-perl.orig/t/30_types.t 2008-01-04 09:50:09.000000000 +0200
-+++ libtext-csv-perl/t/30_types.t 2008-01-04 09:50:30.000000000 +0200
+--- libtext-csv-perl.orig/t/30_types.t
++++ libtext-csv-perl/t/30_types.t
@@ -6,35 +6,35 @@
use Test::More tests => 25;
@@ -302,10 +280,8 @@
# should be "\001\000\002"
is ($csv->{_types}, $inp, "IV PV NV");
-Index: libtext-csv-perl/t/40_misc.t
-===================================================================
---- libtext-csv-perl.orig/t/40_misc.t 2008-01-04 09:50:09.000000000 +0200
-+++ libtext-csv-perl/t/40_misc.t 2008-01-04 09:50:30.000000000 +0200
+--- libtext-csv-perl.orig/t/40_misc.t
++++ libtext-csv-perl/t/40_misc.t
@@ -6,8 +6,8 @@
use Test::More tests => 24;
@@ -335,10 +311,8 @@
ok ($csv2, "new ()");
ok ($csv2->combine ("abc","def","ghi"), "combine ()");
is ($csv2->string, '"abc","def","ghi"', "string ()");
-Index: libtext-csv-perl/t/45_eol.t
-===================================================================
---- libtext-csv-perl.orig/t/45_eol.t 2008-01-04 09:50:09.000000000 +0200
-+++ libtext-csv-perl/t/45_eol.t 2008-01-04 09:50:30.000000000 +0200
+--- libtext-csv-perl.orig/t/45_eol.t
++++ libtext-csv-perl/t/45_eol.t
@@ -6,8 +6,8 @@
use Test::More tests => 128;
@@ -350,7 +324,7 @@
require "t/util.pl";
}
-@@ -19,7 +19,7 @@
+@@ -17,7 +17,7 @@
foreach my $rs ("\n", "\r\n", "\r") {
@@ -359,7 +333,7 @@
$csv->eol ($/ = $rs);
foreach my $pass (0, 1) {
-@@ -76,7 +76,7 @@
+@@ -74,7 +74,7 @@
print FH qq{a,b,c$/}, qq{"d","e","f"$/};
close FH;
open FH, "<_eol.csv";
@@ -368,10 +342,8 @@
my $row;
local $" = " ";
-Index: libtext-csv-perl/t/50_utf8.t
-===================================================================
---- libtext-csv-perl.orig/t/50_utf8.t 2008-01-04 09:50:09.000000000 +0200
-+++ libtext-csv-perl/t/50_utf8.t 2008-01-04 09:50:30.000000000 +0200
+--- libtext-csv-perl.orig/t/50_utf8.t
++++ libtext-csv-perl/t/50_utf8.t
@@ -15,12 +15,12 @@
}
@@ -388,10 +360,8 @@
# Special characters to check:
# 0A = \n 2C = , 20 = 22 = "
-Index: libtext-csv-perl/t/55_combi.t
-===================================================================
---- libtext-csv-perl.orig/t/55_combi.t 2008-01-04 09:50:09.000000000 +0200
-+++ libtext-csv-perl/t/55_combi.t 2008-01-04 09:50:30.000000000 +0200
+--- libtext-csv-perl.orig/t/55_combi.t
++++ libtext-csv-perl/t/55_combi.t
@@ -6,12 +6,12 @@
use Test::More tests => 9074;
@@ -408,10 +378,8 @@
my @attrib = qw( quote_char escape_char sep_char );
my @special = ('"', "'", ",", ";", "\t", "\\", "~");
-Index: libtext-csv-perl/t/60_samples.t
-===================================================================
---- libtext-csv-perl.orig/t/60_samples.t 2008-01-04 09:50:09.000000000 +0200
-+++ libtext-csv-perl/t/60_samples.t 2008-01-04 09:50:30.000000000 +0200
+--- libtext-csv-perl.orig/t/60_samples.t
++++ libtext-csv-perl/t/60_samples.t
@@ -6,15 +6,15 @@
use Test::More tests => 8;
@@ -431,12 +399,10 @@
quote_char => '"',
escape_char => '\\',
sep_char => ';',
-Index: libtext-csv-perl/t/65_allow.t
-===================================================================
---- libtext-csv-perl.orig/t/65_allow.t 2008-01-04 09:50:09.000000000 +0200
-+++ libtext-csv-perl/t/65_allow.t 2008-01-04 09:50:30.000000000 +0200
+--- libtext-csv-perl.orig/t/65_allow.t
++++ libtext-csv-perl/t/65_allow.t
@@ -7,8 +7,8 @@
- use Test::More tests => 617;
+ use Test::More tests => 803;
BEGIN {
- use_ok "Text::CSV_XS", ();
@@ -486,21 +452,30 @@
my $s_eol = _readable ($eol);
for (@bad) {
my ($tst, $ok, $bad) = @$_;
-- $csv = Text::CSV_XS->new ({ eol => $eol, binary => 1, escape_char => "+" });
-+ $csv = Text::CSV->new ({ eol => $eol, binary => 1, escape_char => "+" });
- ok ($csv, "$s_eol / $tst - new - '$bad')");
- is ($csv->parse ($bad), $ok, "$s_eol / $tst - parse () fail");
-
-@@ -154,7 +154,7 @@
+- $csv = Text::CSV_XS->new ({
++ $csv = Text::CSV->new ({
+ eol => $eol,
+ binary => 1,
+ });
+@@ -165,7 +165,7 @@
+ [ 1, 1, 1, 1, "", " ", '""', 2, undef, "", undef ],
+ ) {
+ my ($aq, $aw, $bu, @expect, $str) = @$conf;
+- $csv = Text::CSV_XS->new ({ always_quote => $aq, allow_whitespace => $aw, blank_is_undef => $bu });
++ $csv = Text::CSV->new ({ always_quote => $aq, allow_whitespace => $aw, blank_is_undef => $bu });
+ ok ($csv, "new ({ aq $aq aw $aw bu $bu })");
+ ok ($csv->combine (1, "", " ", '""', 2, undef, "", undef), "combine ()");
+ ok ($str = $csv->string, "string ()");
+@@ -181,7 +181,7 @@
foreach my $bin (0, 1) {
foreach my $eol (undef, "\r") {
my $s_eol = _readable ($eol);
- my $csv = Text::CSV_XS->new ({ binary => $bin, eol => $eol });
+ my $csv = Text::CSV->new ({ binary => $bin, eol => $eol });
- ok ($csv, "$s_eol - new)");
+ ok ($csv, "$s_eol - new ()");
my @bad = (
# test, line
-@@ -178,7 +178,7 @@
+@@ -205,7 +205,7 @@
}
{ ok (1, "verbatim");
@@ -509,10 +484,17 @@
sep_char => "^",
binary => 1,
});
-Index: libtext-csv-perl/t/70_rt.t
-===================================================================
---- libtext-csv-perl.orig/t/70_rt.t 2008-01-04 09:50:09.000000000 +0200
-+++ libtext-csv-perl/t/70_rt.t 2008-01-04 09:50:30.000000000 +0200
+@@ -291,7 +291,7 @@
+
+ { ok (1, "keep_meta_info on getline ()");
+
+- my $csv = Text::CSV_XS->new ({ eol => "\n" });
++ my $csv = Text::CSV->new ({ eol => "\n" });
+
+ open FH, ">_test.csv";
+ print FH qq{1,"",,"Q",2\n};
+--- libtext-csv-perl.orig/t/70_rt.t
++++ libtext-csv-perl/t/70_rt.t
@@ -7,8 +7,8 @@
use Test::More tests => 52;
@@ -533,7 +515,7 @@
is ($csv->sep_char, "\t", "sep_char = TAB");
foreach my $line (0 .. $#lines) {
ok ($csv->parse ($lines[$line]), "parse line $line");
-@@ -45,7 +45,7 @@
+@@ -44,7 +44,7 @@
open FH, ">_test.csv";
print FH @{$input{21530}};
close FH;
@@ -542,7 +524,7 @@
open FH, "<_test.csv";
my $row;
foreach my $line (1 .. 5) {
-@@ -62,7 +62,7 @@
+@@ -61,7 +61,7 @@
{ # http://rt.cpan.org/Ticket/Display.html?id=21530
# 18703: Fails to use quote_char of '~'
my ($csv, @fld);
@@ -551,7 +533,7 @@
is ($csv->quote_char, "~", "quote_char is '~'");
ok ($csv->parse ($input{18703}[0]), "Line 1");
-@@ -78,7 +78,7 @@
+@@ -77,7 +77,7 @@
{ # http://rt.cpan.org/Ticket/Display.html?id=15076
# 15076: escape_char before characters that do not need to be escaped.
my ($csv, @fld);
@@ -560,12 +542,10 @@
sep_char => ";",
escape_char => "\\",
allow_loose_escapes => 1,
-Index: libtext-csv-perl/t/80_diag.t
-===================================================================
---- libtext-csv-perl.orig/t/80_diag.t 2008-01-04 09:50:09.000000000 +0200
-+++ libtext-csv-perl/t/80_diag.t 2008-01-04 09:50:30.000000000 +0200
-@@ -7,14 +7,14 @@
- #use Test::More "no_plan";
+--- libtext-csv-perl.orig/t/80_diag.t
++++ libtext-csv-perl/t/80_diag.t
+@@ -9,8 +9,8 @@
+ my %err;
BEGIN {
- require_ok "Text::CSV_XS";
@@ -573,12 +553,28 @@
+ require_ok "Text::CSV";
+ plan skip_all => "Cannot load Text::CSV" if $@;
require "t/util.pl";
- }
+
+ open XS, "< CSV_XS.xs" or die "Cannot read error messages from XS\n";
+@@ -21,8 +21,8 @@
$| = 1;
--my $csv = Text::CSV_XS->new ({ escape_char => "+" });
-+my $csv = Text::CSV->new ({ escape_char => "+" });
-
- is ($csv->error_diag (), undef, "No errors yet");
-
+-my $csv = (Text::CSV_XS->new ({ escape_char => "+", eol => "\n" }));
+-is (Text::CSV_XS::error_diag (), "", "Last failure for new () - OK");
++my $csv = (Text::CSV->new ({ escape_char => "+", eol => "\n" }));
++is (Text::CSV::error_diag (), "", "Last failure for new () - OK");
+
+ sub parse_err ($$)
+ {
+@@ -55,8 +55,8 @@
+ diag ("Next line should be an error message");
+ $csv->error_diag ();
+
+-is (Text::CSV_XS->new ({ ecs_char => ":" }), undef, "Unsupported option");
+-is (Text::CSV_XS::error_diag (), "Unknown attribute 'ecs_char'",
++is (Text::CSV->new ({ ecs_char => ":" }), undef, "Unsupported option");
++is (Text::CSV::error_diag (), "Unknown attribute 'ecs_char'",
+ "Last failure for new () - FAIL");
+-is (Text::CSV_XS->error_diag (), "Unknown attribute 'ecs_char'",
++is (Text::CSV->error_diag (), "Unknown attribute 'ecs_char'",
+ "Last failure for new () - FAIL");
Modified: trunk/libtext-csv-perl/debian/patches/03_csv_xs.pm.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/debian/patches/03_csv_xs.pm.patch?rev=17776&op=diff
==============================================================================
--- trunk/libtext-csv-perl/debian/patches/03_csv_xs.pm.patch (original)
+++ trunk/libtext-csv-perl/debian/patches/03_csv_xs.pm.patch Tue Mar 18 03:23:31 2008
@@ -3,11 +3,9 @@
##
## note about "binary" in CSV_XS.pm
-Index: libtext-csv-perl/CSV_XS.pm
-===================================================================
---- libtext-csv-perl.orig/CSV_XS.pm 2008-01-04 09:50:09.000000000 +0200
-+++ libtext-csv-perl/CSV_XS.pm 2008-01-04 09:50:42.000000000 +0200
-@@ -805,6 +805,10 @@
+--- libtext-csv-perl.orig/CSV_XS.pm
++++ libtext-csv-perl/CSV_XS.pm
+@@ -850,6 +850,10 @@
You may use the I<types ()> method for setting column types. See the
description below.
More information about the Pkg-perl-cvs-commits
mailing list