r18486 - in /trunk/libtext-csv-perl/debian: changelog patches/01_cvs.pm.patch patches/02_tests.patch patches/03_pod.patch patches/04_examples.patch patches/series
gregoa-guest at users.alioth.debian.org
gregoa-guest at users.alioth.debian.org
Sat Apr 12 10:53:00 UTC 2008
Author: gregoa-guest
Date: Sat Apr 12 10:52:59 2008
New Revision: 18486
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=18486
Log:
Refresh and update patches (remove changes to Text::CSV_XS::error_diag());
add new patch 04_examples.patch; change Text::CSV_XS to Text::CSV also
in the example scripts.
Added:
trunk/libtext-csv-perl/debian/patches/04_examples.patch
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/series
Modified: trunk/libtext-csv-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/debian/changelog?rev=18486&op=diff
==============================================================================
--- trunk/libtext-csv-perl/debian/changelog (original)
+++ trunk/libtext-csv-perl/debian/changelog Sat Apr 12 10:52:59 2008
@@ -1,8 +1,11 @@
libtext-csv-perl (0.41-1) UNRELEASED; urgency=low
* New upstream release.
-
- -- gregor herrmann <gregor+debian at comodo.priv.at> Sat, 12 Apr 2008 12:29:04 +0200
+ * Refresh and update patches (remove changes to Text::CSV_XS::error_diag());
+ add new patch 04_examples.patch; change Text::CSV_XS to Text::CSV also
+ in the example scripts.
+
+ -- gregor herrmann <gregor+debian at comodo.priv.at> Sat, 12 Apr 2008 12:46:28 +0200
libtext-csv-perl (0.40-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=18486&op=diff
==============================================================================
--- trunk/libtext-csv-perl/debian/patches/01_cvs.pm.patch (original)
+++ trunk/libtext-csv-perl/debian/patches/01_cvs.pm.patch Sat Apr 12 10:52:59 2008
@@ -3,8 +3,6 @@
## create CSV.pm, containing a tiny wrapper to Text::CSV_XS
## all functions that are used directly from tests are glob-copied
## too
-## the patch of CSV_XS::error_diag() is needed so that it recognizes
-## Text::CSV as 'being Text::CSV_XS'
--- /dev/null
+++ libtext-csv-perl/CSV.pm
@@ -40,12 +38,12 @@
my $proto = shift;
my $attr = shift || {};
my $class = ref ($proto) || $proto or return;
-@@ -267,7 +267,7 @@
- sub error_diag
- {
- my $self = shift;
-- $self && ref $self eq __PACKAGE__ or return $last_new_err;
-+ $self && ref $self && UNIVERSAL::isa($self, __PACKAGE__) or return $last_new_err;
- exists $self->{_ERROR_DIAG} or return;
- my $diag = $self->{_ERROR_DIAG};
+@@ -277,7 +277,7 @@
+ }
my $context = wantarray;
+ unless (defined $context) { # Void context
+- $diag[0] and print STDERR "# CSV_XS ERROR: $diag[0] - $diag[1]\n";
++ $diag[0] and print STDERR "# Text::CSV ERROR: $diag[0] - $diag[1]\n";
+ return;
+ }
+ return $context ? @diag : $diag[1];
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=18486&op=diff
==============================================================================
--- trunk/libtext-csv-perl/debian/patches/02_tests.patch (original)
+++ trunk/libtext-csv-perl/debian/patches/02_tests.patch Sat Apr 12 10:52:59 2008
@@ -595,25 +595,52 @@
{
@@ -39,7 +39,7 @@
- parse_err 2023, qq{2023,",2008-04-05,"Foo, Bar",\n};
+ parse_err 2023, 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 (), undef, "No errors yet");
+ is ($csv->error_diag (), "", "No errors yet");
parse_err 2010, qq{"x"\r};
-@@ -58,8 +58,8 @@
+@@ -58,29 +58,29 @@
diag ("Next line should be an error message");
$csv->error_diag ();
-is (Text::CSV_XS->new ({ ecs_char => ":" }), undef, "Unsupported option");
++is (Text::CSV->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");
+-is (Text::CSV_XS::error_diag (bless {}, "Foo"), "Unknown attribute 'ecs_char'",
++is (Text::CSV::error_diag (bless {}, "Foo"), "Unknown attribute 'ecs_char'",
+ "Last failure for new () - FAIL");
+
+-package Text::CSV_XS::Subclass;
++package Text::CSV::Subclass;
+
+-use base "Text::CSV_XS";
++use base "Text::CSV";
+
+ use Test::More;
+
+ ok (1, "Subclassed");
+
+-my $csvs = Text::CSV_XS::Subclass->new ();
++my $csvs = Text::CSV::Subclass->new ();
+ is ($csvs->error_diag (), "", "Last failure for new () - OK");
+
+-is (Text::CSV_XS::Subclass->new ({ ecs_char => ":" }), undef, "Unsupported option");
++is (Text::CSV::Subclass->new ({ ecs_char => ":" }), undef, "Unsupported option");
+
+-is (Text::CSV_XS::Subclass->error_diag (),
++is (Text::CSV::Subclass->error_diag (),
+ "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 @@
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=18486&op=diff
==============================================================================
--- trunk/libtext-csv-perl/debian/patches/03_pod.patch (original)
+++ trunk/libtext-csv-perl/debian/patches/03_pod.patch Sat Apr 12 10:52:59 2008
@@ -4,7 +4,7 @@
--- libtext-csv-perl.orig/CSV_XS.pm
+++ libtext-csv-perl/CSV_XS.pm
-@@ -910,6 +910,10 @@
+@@ -916,6 +916,10 @@
You may use the I<types ()> method for setting column types. See the
description below.
Added: 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=18486&op=file
==============================================================================
--- trunk/libtext-csv-perl/debian/patches/04_examples.patch (added)
+++ trunk/libtext-csv-perl/debian/patches/04_examples.patch Sat Apr 12 10:52:59 2008
@@ -1,0 +1,48 @@
+## 04_examples.patch by <gregor+debian at comodo.priv.at>
+##
+## patch examples
+
+--- libtext-csv-perl.orig/examples/csv2xls
++++ libtext-csv-perl/examples/csv2xls
+@@ -60,7 +60,7 @@
+ @ARGV && -f $ARGV[0] && -s $ARGV[0] < 5_000_000 or $swe .= "::Big";
+
+ # Don't split ourselves when modules do it _much_ better, and follow the standards
+-use Text::CSV_XS;
++use Text::CSV;
+ use Date::Calc qw( Delta_Days Days_in_Month );
+ use Spreadsheet::WriteExcel;
+ use Spreadsheet::WriteExcel::Big;
+@@ -106,7 +106,7 @@
+ last;
+ }
+ }
+-$csv = Text::CSV_XS-> new ({
++$csv = Text::CSV-> new ({
+ sep_char => $sep,
+ quote_char => $quo,
+ binary => 1,
+--- libtext-csv-perl.orig/examples/speed.pl
++++ libtext-csv-perl/examples/speed.pl
+@@ -4,10 +4,10 @@
+ use strict;
+
+ use IO::Handle;
+-use Text::CSV_XS;
++use Text::CSV;
+ use Benchmark qw(:all);
+
+-our $csv = Text::CSV_XS->new ({ eol => "\n" });
++our $csv = Text::CSV->new ({ eol => "\n" });
+
+ my $duration = int (shift || 10);
+ my $bigfile = "_file.csv";
+@@ -56,7 +56,7 @@
+ __END__
+ # The examples from the docs
+
+-{ $csv = Text::CSV_XS->new ({ keep_meta_info => 1, binary => 1 });
++{ $csv = Text::CSV->new ({ keep_meta_info => 1, binary => 1 });
+
+ my $sample_input_string =
+ qq{"I said, ""Hi!""",Yes,"",2.34,,"1.09","\x{20ac}",};
Modified: trunk/libtext-csv-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/debian/patches/series?rev=18486&op=diff
==============================================================================
--- trunk/libtext-csv-perl/debian/patches/series (original)
+++ trunk/libtext-csv-perl/debian/patches/series Sat Apr 12 10:52:59 2008
@@ -1,3 +1,4 @@
01_cvs.pm.patch
02_tests.patch
03_pod.patch
+04_examples.patch
More information about the Pkg-perl-cvs-commits
mailing list