r18406 - in /trunk/libtext-csv-perl/debian: changelog patches/01_cvs.pm.patch patches/02_tests.patch patches/03_csv_xs.pm.patch patches/03_pod.patch patches/series
gregoa-guest at users.alioth.debian.org
gregoa-guest at users.alioth.debian.org
Tue Apr 8 17:32:07 UTC 2008
Author: gregoa-guest
Date: Tue Apr 8 17:32:03 2008
New Revision: 18406
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=18406
Log:
debian/patches: refresh & update; remove dpatch hash-bangs; add new() to
the glob-copied functions in CSV.pm, change "usage:" line in CSV_XS.pm,
rename pod patch into 03_pod.patch.
Added:
trunk/libtext-csv-perl/debian/patches/03_pod.patch
Removed:
trunk/libtext-csv-perl/debian/patches/03_csv_xs.pm.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/series
Modified: trunk/libtext-csv-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/debian/changelog?rev=18406&op=diff
==============================================================================
--- trunk/libtext-csv-perl/debian/changelog (original)
+++ trunk/libtext-csv-perl/debian/changelog Tue Apr 8 17:32:03 2008
@@ -1,8 +1,11 @@
libtext-csv-perl (0.40-1) UNRELEASED; urgency=low
* New upstream release.
-
- -- gregor herrmann <gregor+debian at comodo.priv.at> Tue, 08 Apr 2008 18:53:09 +0200
+ * debian/patches: refresh & update; remove dpatch hash-bangs; add new() to
+ the glob-copied functions in CSV.pm, change "usage:" line in CSV_XS.pm,
+ rename pod patch into 03_pod.patch.
+
+ -- gregor herrmann <gregor+debian at comodo.priv.at> Tue, 08 Apr 2008 19:30:11 +0200
libtext-csv-perl (0.37-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=18406&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 8 17:32:03 2008
@@ -1,5 +1,4 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_no_xs.patch by <gregor+debian at comodo.priv.at>
+## 01_csv.pm.patch by <gregor+debian at comodo.priv.at>
##
## create CSV.pm, containing a tiny wrapper to Text::CSV_XS
## all functions that are used directly from tests are glob-copied
@@ -7,10 +6,8 @@
## the patch of CSV_XS::error_diag() is needed so that it recognizes
## Text::CSV as 'being Text::CSV_XS'
-Index: libtext-csv-perl/CSV.pm
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libtext-csv-perl/CSV.pm 2008-03-18 10:09:31.000000000 +0200
+--- /dev/null
++++ libtext-csv-perl/CSV.pm
@@ -0,0 +1,20 @@
+
+package Text::CSV;
@@ -25,18 +22,25 @@
+
+# import functions that are called directly like
+# Text::CSV::func_name (i.e. not as object/class methods)
-+foreach( qw(PV IV NV error_diag) )
++foreach( qw(PV IV NV error_diag new) )
+{
+ *{$_} = *{ "Text::CSV_XS::$_" }{CODE};
+}
+
+
+1;
-Index: libtext-csv-perl/CSV_XS.pm
-===================================================================
---- libtext-csv-perl.orig/CSV_XS.pm 2008-03-18 10:08:11.000000000 +0200
-+++ libtext-csv-perl/CSV_XS.pm 2008-03-18 10:08:44.000000000 +0200
-@@ -261,7 +261,7 @@
+--- libtext-csv-perl.orig/CSV_XS.pm
++++ libtext-csv-perl/CSV_XS.pm
+@@ -82,7 +82,7 @@
+ sub new
+ {
+ $last_new_err =
+- "usage: my \$csv = Text::CSV_XS->new ([{ option => value, ... }]);";
++ "usage: my \$csv = Text::CSV->new ([{ option => value, ... }]);";
+ my $proto = shift;
+ my $attr = shift || {};
+ my $class = ref ($proto) || $proto or return;
+@@ -267,7 +267,7 @@
sub error_diag
{
my $self = shift;
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=18406&op=diff
==============================================================================
--- trunk/libtext-csv-perl/debian/patches/02_tests.patch (original)
+++ trunk/libtext-csv-perl/debian/patches/02_tests.patch Tue Apr 8 17:32:03 2008
@@ -1,5 +1,4 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_no_xs.patch by <gregor+debian at comodo.priv.at>
+## 02_tests.patch by <gregor+debian at comodo.priv.at>
##
## patch tests
@@ -80,6 +79,25 @@
sep_char => undef,
quote_char => undef,
escape_char => undef,
+@@ -67,12 +67,12 @@
+
+ # And test erroneous calls
+
+-is (Text::CSV_XS::new (0), undef, "new () as function");
+-is (Text::CSV_XS::error_diag (), "usage: my \$csv = Text::CSV_XS->new ([{ option => value, ... }]);",
++is (Text::CSV::new (0), undef, "new () as function");
++is (Text::CSV::error_diag (), "usage: my \$csv = Text::CSV->new ([{ option => value, ... }]);",
+ "Generic usage () message");
+-is (Text::CSV_XS->new ({ oel => "" }), undef, "typo in attr");
+-is (Text::CSV_XS::error_diag (), "Unknown attribute 'oel'", "Unsupported attr");
+-is (Text::CSV_XS->new ({ _STATUS => "" }), undef, "private attr");
+-is (Text::CSV_XS::error_diag (), "Unknown attribute '_STATUS'", "Unsupported private attr");
++is (Text::CSV->new ({ oel => "" }), undef, "typo in attr");
++is (Text::CSV::error_diag (), "Unknown attribute 'oel'", "Unsupported attr");
++is (Text::CSV->new ({ _STATUS => "" }), undef, "private attr");
++is (Text::CSV::error_diag (), "Unknown attribute '_STATUS'", "Unsupported private attr");
+
+ 1;
--- libtext-csv-perl.orig/t/15_flags.t
+++ libtext-csv-perl/t/15_flags.t
@@ -6,8 +6,8 @@
@@ -496,7 +514,7 @@
--- libtext-csv-perl.orig/t/70_rt.t
+++ libtext-csv-perl/t/70_rt.t
@@ -7,8 +7,8 @@
- use Test::More tests => 52;
+ use Test::More tests => 69;
BEGIN {
- use_ok "Text::CSV_XS", ();
@@ -542,6 +560,15 @@
sep_char => ";",
escape_char => "\\",
allow_loose_escapes => 1,
+@@ -95,7 +95,7 @@
+ open FH, ">_test.csv";
+ print FH @{$input{34474}};
+ close FH;
+- ok (my $csv = Text::CSV_XS->new (), "RT-34474: getline_hr ()");
++ ok (my $csv = Text::CSV->new (), "RT-34474: getline_hr ()");
+ is ($csv->column_names, undef, "No headers yet");
+ open FH, "<_test.csv";
+ my $row;
--- libtext-csv-perl.orig/t/80_diag.t
+++ libtext-csv-perl/t/80_diag.t
@@ -9,8 +9,8 @@
@@ -559,14 +586,23 @@
$| = 1;
--my $csv = (Text::CSV_XS->new ({ escape_char => "+", eol => "\n" }));
+-my $csv = Text::CSV_XS->new ();
-is (Text::CSV_XS::error_diag (), "", "Last failure for new () - OK");
-+my $csv = (Text::CSV->new ({ escape_char => "+", eol => "\n" }));
++my $csv = Text::CSV->new ();
+is (Text::CSV::error_diag (), "", "Last failure for new () - OK");
sub parse_err ($$)
{
-@@ -55,8 +55,8 @@
+@@ -39,7 +39,7 @@
+
+ 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");
+
+ parse_err 2010, qq{"x"\r};
+@@ -58,8 +58,8 @@
diag ("Next line should be an error message");
$csv->error_diag ();
@@ -578,3 +614,25 @@
-is (Text::CSV_XS->error_diag (), "Unknown attribute 'ecs_char'",
+is (Text::CSV->error_diag (), "Unknown attribute 'ecs_char'",
"Last failure for new () - FAIL");
+--- 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 }]) {
Added: 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=18406&op=file
==============================================================================
--- trunk/libtext-csv-perl/debian/patches/03_pod.patch (added)
+++ trunk/libtext-csv-perl/debian/patches/03_pod.patch Tue Apr 8 17:32:03 2008
@@ -1,0 +1,17 @@
+## 03_pod.patch by <gregor+debian at comodo.priv.at>
+##
+## note about "binary" in CSV_XS.pm
+
+--- libtext-csv-perl.orig/CSV_XS.pm
++++ libtext-csv-perl/CSV_XS.pm
+@@ -910,6 +910,10 @@
+ You may use the I<types ()> method for setting column types. See the
+ description below.
+
++Please note that if you expect your file to contain non-base-ASCII characters
++(this means, any accented or UTF8 character), you should set the C<binary>
++attribute to C<true>, otherwise the line will not be parsed.
++
+ =head2 getline
+
+ $colref = $csv->getline ($io);
Modified: trunk/libtext-csv-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/debian/patches/series?rev=18406&op=diff
==============================================================================
--- trunk/libtext-csv-perl/debian/patches/series (original)
+++ trunk/libtext-csv-perl/debian/patches/series Tue Apr 8 17:32:03 2008
@@ -1,3 +1,3 @@
01_cvs.pm.patch
02_tests.patch
-03_csv_xs.pm.patch
+03_pod.patch
More information about the Pkg-perl-cvs-commits
mailing list