r19029 - in /trunk/libtext-csv-perl/debian: changelog patches/01_cvs.pm.patch patches/02_tests.patch patches/03_pod.patch patches/04_examples.patch
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Tue Apr 22 19:27:37 UTC 2008
Author: gregoa
Date: Tue Apr 22 19:27:36 2008
New Revision: 19029
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=19029
Log:
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_pod.patch
trunk/libtext-csv-perl/debian/patches/04_examples.patch
Modified: trunk/libtext-csv-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/debian/changelog?rev=19029&op=diff
==============================================================================
--- trunk/libtext-csv-perl/debian/changelog (original)
+++ trunk/libtext-csv-perl/debian/changelog Tue Apr 22 19:27:36 2008
@@ -1,8 +1,9 @@
libtext-csv-perl (0.43-1) UNRELEASED; urgency=low
* New upstream release.
-
- -- gregor herrmann <gregoa at debian.org> Tue, 22 Apr 2008 21:11:49 +0200
+ * Refresh and update patches.
+
+ -- gregor herrmann <gregoa at debian.org> Tue, 22 Apr 2008 21:18:27 +0200
libtext-csv-perl (0.42-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=19029&op=diff
==============================================================================
--- trunk/libtext-csv-perl/debian/patches/01_cvs.pm.patch (original)
+++ trunk/libtext-csv-perl/debian/patches/01_cvs.pm.patch Tue Apr 22 19:27:36 2008
@@ -38,7 +38,7 @@
my $proto = shift;
my $attr = shift || {};
my $class = ref ($proto) || $proto or return;
-@@ -277,7 +277,7 @@
+@@ -278,7 +278,7 @@
}
my $context = wantarray;
unless (defined $context) { # Void context
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=19029&op=diff
==============================================================================
--- trunk/libtext-csv-perl/debian/patches/02_tests.patch (original)
+++ trunk/libtext-csv-perl/debian/patches/02_tests.patch Tue Apr 22 19:27:36 2008
@@ -420,7 +420,7 @@
--- libtext-csv-perl.orig/t/65_allow.t
+++ libtext-csv-perl/t/65_allow.t
@@ -7,8 +7,8 @@
- use Test::More tests => 803;
+ use Test::More tests => 829;
BEGIN {
- use_ok "Text::CSV_XS", ();
@@ -448,7 +448,16 @@
#ok (!$csv->parse (qq{foo,d'uh"bar}), "should fail");
}
-@@ -57,7 +57,7 @@
+@@ -53,7 +53,7 @@
+
+ for (@bad) {
+ my ($tst, $valid, $bad) = @$_;
+- $csv = Text::CSV_XS->new ();
++ $csv = Text::CSV->new ();
+ ok ($csv, "$tst - new (alq => 0)");
+ is ($csv->parse ($bad), $valid, "$tst - parse () fail");
+
+@@ -83,7 +83,7 @@
for (@bad) {
my ($tst, $valid, $bad) = @$_;
@@ -457,7 +466,7 @@
ok ($csv, "$tst - new (ale => 0)");
is ($csv->parse ($bad), $valid, "$tst - parse () fail");
-@@ -96,7 +96,7 @@
+@@ -122,7 +122,7 @@
my $s_eol = _readable ($eol);
for (@bad) {
my ($tst, $ok, $bad) = @$_;
@@ -466,7 +475,7 @@
ok ($csv, "$s_eol / $tst - new - '$bad')");
is ($csv->parse ($bad), $ok, "$s_eol / $tst - parse () fail");
-@@ -135,7 +135,7 @@
+@@ -161,7 +161,7 @@
my $s_eol = _readable ($eol);
for (@bad) {
my ($tst, $ok, $bad) = @$_;
@@ -475,7 +484,7 @@
eol => $eol,
binary => 1,
});
-@@ -165,7 +165,7 @@
+@@ -191,7 +191,7 @@
[ 1, 1, 1, 1, "", " ", '""', 2, undef, "", undef ],
) {
my ($aq, $aw, $bu, @expect, $str) = @$conf;
@@ -484,7 +493,7 @@
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 @@
+@@ -207,7 +207,7 @@
foreach my $bin (0, 1) {
foreach my $eol (undef, "\r") {
my $s_eol = _readable ($eol);
@@ -493,7 +502,7 @@
ok ($csv, "$s_eol - new ()");
my @bad = (
# test, line
-@@ -205,7 +205,7 @@
+@@ -231,7 +231,7 @@
}
{ ok (1, "verbatim");
@@ -502,7 +511,7 @@
sep_char => "^",
binary => 1,
});
-@@ -291,7 +291,7 @@
+@@ -317,7 +317,7 @@
{ ok (1, "keep_meta_info on getline ()");
@@ -569,6 +578,45 @@
is ($csv->column_names, undef, "No headers yet");
open FH, "<_test.csv";
my $row;
+--- libtext-csv-perl.orig/t/75_hashref.t
++++ libtext-csv-perl/t/75_hashref.t
+@@ -7,8 +7,8 @@
+ use Test::More tests => 62;
+
+ BEGIN {
+- use_ok "Text::CSV_XS", ();
+- plan skip_all => "Cannot load Text::CSV_XS" if $@;
++ use_ok "Text::CSV", ();
++ plan skip_all => "Cannot load Text::CSV" if $@;
+ }
+
+ open FH, ">_test.csv";
+@@ -21,7 +21,7 @@
+ EOC
+ close FH;
+
+-ok (my $csv = Text::CSV_XS->new (), "new");
++ok (my $csv = Text::CSV->new (), "new");
+ is ($csv->column_names, undef, "No headers yet");
+
+ foreach my $args ([\1], ["foo", \1], [{ 1 => 2 }]) {
+--- libtext-csv-perl.orig/t/76_magic.t
++++ libtext-csv-perl/t/76_magic.t
+@@ -7,11 +7,11 @@
+ use Test::More tests => 7;
+
+ BEGIN {
+- use_ok "Text::CSV_XS", ();
+- plan skip_all => "Cannot load Text::CSV_XS" if $@;
++ use_ok "Text::CSV", ();
++ plan skip_all => "Cannot load Text::CSV" if $@;
+ }
+
+-my $csv = Text::CSV_XS->new ({ binary => 1, eol => "\n" });
++my $csv = Text::CSV->new ({ binary => 1, eol => "\n" });
+
+ my $foo;
+ my @foo = ("#", 1..3);
--- libtext-csv-perl.orig/t/80_diag.t
+++ libtext-csv-perl/t/80_diag.t
@@ -9,8 +9,8 @@
@@ -590,19 +638,19 @@
-is (Text::CSV_XS::error_diag (), "", "Last failure for new () - OK");
+my $csv = Text::CSV->new ();
+is (Text::CSV::error_diag (), "", "Last failure for new () - OK");
-
- sub parse_err ($$)
- {
-@@ -39,7 +39,7 @@
-
- parse_err 2023, qq{2023,",2008-04-05,"Foo, Bar",\n}; # "
+ is_deeply ([ $csv->error_diag ], [ 0, "", 0], "OK in list context");
+
+ sub parse_err ($$$)
+@@ -41,7 +41,7 @@
+
+ parse_err 2023, 19, qq{2023,",2008-04-05,"Foo, Bar",\n}; # "
-$csv = Text::CSV_XS->new ({ escape_char => "+", eol => "\n" });
+$csv = Text::CSV->new ({ escape_char => "+", eol => "\n" });
is ($csv->error_diag (), "", "No errors yet");
- parse_err 2010, qq{"x"\r};
-@@ -58,29 +58,29 @@
+ parse_err 2010, 3, qq{"x"\r};
+@@ -60,29 +60,29 @@
diag ("Next line should be an error message");
$csv->error_diag ();
@@ -641,25 +689,3 @@
"Unknown attribute 'ecs_char'", "Last failure for new () - FAIL");
1;
---- libtext-csv-perl.orig/t/75_hashref.t
-+++ libtext-csv-perl/t/75_hashref.t
-@@ -7,8 +7,8 @@
- use Test::More tests => 62;
-
- BEGIN {
-- use_ok "Text::CSV_XS", ();
-- plan skip_all => "Cannot load Text::CSV_XS" if $@;
-+ use_ok "Text::CSV", ();
-+ plan skip_all => "Cannot load Text::CSV" if $@;
- }
-
- open FH, ">_test.csv";
-@@ -21,7 +21,7 @@
- EOC
- close FH;
-
--ok (my $csv = Text::CSV_XS->new (), "new");
-+ok (my $csv = Text::CSV->new (), "new");
- is ($csv->column_names, undef, "No headers yet");
-
- foreach my $args ([\1], ["foo", \1], [{ 1 => 2 }]) {
Modified: trunk/libtext-csv-perl/debian/patches/03_pod.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/debian/patches/03_pod.patch?rev=19029&op=diff
==============================================================================
--- trunk/libtext-csv-perl/debian/patches/03_pod.patch (original)
+++ trunk/libtext-csv-perl/debian/patches/03_pod.patch Tue Apr 22 19:27:36 2008
@@ -4,7 +4,7 @@
--- libtext-csv-perl.orig/CSV_XS.pm
+++ libtext-csv-perl/CSV_XS.pm
-@@ -916,6 +916,10 @@
+@@ -929,6 +929,10 @@
You may use the I<types ()> method for setting column types. See the
description below.
Modified: trunk/libtext-csv-perl/debian/patches/04_examples.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/debian/patches/04_examples.patch?rev=19029&op=diff
==============================================================================
--- trunk/libtext-csv-perl/debian/patches/04_examples.patch (original)
+++ trunk/libtext-csv-perl/debian/patches/04_examples.patch Tue Apr 22 19:27:36 2008
@@ -13,7 +13,7 @@
use Date::Calc qw( Delta_Days Days_in_Month );
use Spreadsheet::WriteExcel;
use Spreadsheet::WriteExcel::Big;
-@@ -106,7 +106,7 @@
+@@ -104,7 +104,7 @@
last;
}
}
@@ -46,3 +46,23 @@
my $sample_input_string =
qq{"I said, ""Hi!""",Yes,"",2.34,,"1.09","\x{20ac}",};
+--- libtext-csv-perl.orig/examples/csv-check
++++ libtext-csv-perl/examples/csv-check
+@@ -27,7 +27,7 @@
+ "q=s" => \$quo,
+ ) or usage (1);
+
+-use Text::CSV_XS;
++use Text::CSV;
+
+ my ($bin, $rows, %cols, $firstline) = (0, 0);
+ unless ($sep) { # No sep char passed, try to auto-detect;
+@@ -50,7 +50,7 @@
+ }
+ }
+
+-my $csv = Text::CSV_XS-> new ({
++my $csv = Text::CSV-> new ({
+ sep_char => $sep,
+ quote_char => $quo,
+ binary => 1,
More information about the Pkg-perl-cvs-commits
mailing list