r11978 - in /trunk/libtext-csv-perl/debian: changelog control patches/00list patches/01_cvs.pm.dpatch patches/01_cvs.pm.patch patches/02_tests.dpatch patches/02_tests.patch patches/03_csv_xs.pm.dpatch patches/03_csv_xs.pm.patch patches/series rules
dmn at users.alioth.debian.org
dmn at users.alioth.debian.org
Fri Jan 4 07:58:24 UTC 2008
Author: dmn
Date: Fri Jan 4 07:58:23 2008
New Revision: 11978
URL: http://svn.debian.org/wsvn/?sc=1&rev=11978
Log:
* Converted patches to quilt
+ s/dpatch/quilt/ in Build-Depends
+ s/DPATCH_STAMPFN/QUILT_STAMPFN/ in debian/rules
+ refreshed all patches
+ stripped comments accordingly
Added:
trunk/libtext-csv-perl/debian/patches/01_cvs.pm.patch (with props)
trunk/libtext-csv-perl/debian/patches/02_tests.patch (with props)
trunk/libtext-csv-perl/debian/patches/03_csv_xs.pm.patch (with props)
trunk/libtext-csv-perl/debian/patches/series
Removed:
trunk/libtext-csv-perl/debian/patches/00list
trunk/libtext-csv-perl/debian/patches/01_cvs.pm.dpatch
trunk/libtext-csv-perl/debian/patches/02_tests.dpatch
trunk/libtext-csv-perl/debian/patches/03_csv_xs.pm.dpatch
Modified:
trunk/libtext-csv-perl/debian/changelog
trunk/libtext-csv-perl/debian/control
trunk/libtext-csv-perl/debian/rules
Modified: trunk/libtext-csv-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libtext-csv-perl/debian/changelog?rev=11978&op=diff
==============================================================================
--- trunk/libtext-csv-perl/debian/changelog (original)
+++ trunk/libtext-csv-perl/debian/changelog Fri Jan 4 07:58:23 2008
@@ -1,5 +1,6 @@
libtext-csv-perl (0.33-1) unstable; urgency=low
+ [ gregor herrmann ]
* New upstream release.
* Set Standards-Version to 3.7.3 (no changes required).
* debian/watch: use dist-based URL.
@@ -10,6 +11,13 @@
* debian/copyright: update years of upstream and Debian copyright, remove
confusing link to same changelog and explicitly state license for the
packaging.
+
+ [ Damyan Ivanov ]
+ * Converted patches to quilt
+ + s/dpatch/quilt/ in Build-Depends
+ + s/DPATCH_STAMPFN/QUILT_STAMPFN/ in debian/rules
+ + refreshed all patches
+ + stripped comments accordingly
-- gregor herrmann <gregor+debian at comodo.priv.at> Fri, 04 Jan 2008 01:22:16 +0100
Modified: trunk/libtext-csv-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libtext-csv-perl/debian/control?rev=11978&op=diff
==============================================================================
--- trunk/libtext-csv-perl/debian/control (original)
+++ trunk/libtext-csv-perl/debian/control Fri Jan 4 07:58:23 2008
@@ -9,7 +9,7 @@
Homepage: http://search.cpan.org/dist/Text-CSV_XS/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libtext-csv-perl/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/
-Build-Depends: debhelper (>= 5), perl (>> 5.8.1), dpatch, libtest-pod-perl,
+Build-Depends: debhelper (>= 5), perl (>> 5.8.1), quilt, libtest-pod-perl,
libtest-pod-coverage-perl
Package: libtext-csv-perl
Added: trunk/libtext-csv-perl/debian/patches/01_cvs.pm.patch
URL: http://svn.debian.org/wsvn/trunk/libtext-csv-perl/debian/patches/01_cvs.pm.patch?rev=11978&op=file
==============================================================================
--- trunk/libtext-csv-perl/debian/patches/01_cvs.pm.patch (added)
+++ trunk/libtext-csv-perl/debian/patches/01_cvs.pm.patch Fri Jan 4 07:58:23 2008
@@ -1,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_no_xs.patch by <gregor+debian at comodo.priv.at>
+##
+## 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
+@@ -0,0 +1,14 @@
++
++package Text::CSV;
++
++use vars (@ISA);
++
++ at ISA = qw(Text::CSV_XS);
++
++use Text::CSV_XS;
++
++sub PV { 0 }
++sub IV { 1 }
++sub NV { 2 }
++
++1;
Propchange: trunk/libtext-csv-perl/debian/patches/01_cvs.pm.patch
------------------------------------------------------------------------------
svn:executable = *
Added: trunk/libtext-csv-perl/debian/patches/02_tests.patch
URL: http://svn.debian.org/wsvn/trunk/libtext-csv-perl/debian/patches/02_tests.patch?rev=11978&op=file
==============================================================================
--- trunk/libtext-csv-perl/debian/patches/02_tests.patch (added)
+++ trunk/libtext-csv-perl/debian/patches/02_tests.patch Fri Jan 4 07:58:23 2008
@@ -1,0 +1,584 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_no_xs.patch by <gregor+debian at comodo.priv.at>
+##
+## 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
+@@ -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
+@@ -6,33 +6,33 @@
+ use Test::More tests => 61;
+
+ 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 $@;
+ }
+
+ # empty subclass test
+ #
+ package Empty_Subclass;
+
+- at Empty_Subclass::ISA = qw( Text::CSV_XS );
++ at Empty_Subclass::ISA = qw( Text::CSV );
+
+ package main;
+
+-ok (new Text::CSV_XS, "Indirect object notation");
++ok (new Text::CSV, "Indirect object notation");
+
+ # Important: Do not modify these tests unless you have a good
+ # reason. This file ought to guarantee compatibility to Text::CSV.
+ #
+ my $empty = Empty_Subclass->new ();
+ is (ref $empty, "Empty_Subclass", "Empty Subclass");
+-is ($empty->version (), Text::CSV_XS->version (), "Version");
++is ($empty->version (), Text::CSV->version (), "Version");
+ ok ($empty->parse (""), "Subclass parse ()");
+ ok ($empty->combine (""), "Subclass combine ()");
+
+ ok ($empty->new, "new () based on object");
+
+ my $csv;
+-ok ($csv = Text::CSV_XS->new, "new ()");
++ok ($csv = Text::CSV->new, "new ()");
+ 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
+@@ -6,12 +6,12 @@
+ use Test::More tests => 39;
+
+ 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;
+-ok ($csv = Text::CSV_XS->new, "new ()");
++ok ($csv = Text::CSV->new, "new ()");
+
+ is ($csv->quote_char, '"', "quote_char");
+ is ($csv->escape_char, '"', "escape_char");
+@@ -46,7 +46,7 @@
+ qq{=txt \\=, "Hi!"=;=Yes=;==;=2=;;=1.09=;=\r=;\r}, "string");
+
+ # Funny settings, all three translate to \0 internally
+-$csv = Text::CSV_XS->new ({
++$csv = Text::CSV->new ({
+ 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
+@@ -6,8 +6,8 @@
+ use Test::More tests => 173;
+
+ 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 $@;
+ }
+
+ sub crnlsp
+@@ -60,7 +60,7 @@
+ ok (!$csv->parse (qq{"\r\r\n"\t \r\r\n}), "Quoted CR CR NL >TAB Space CR CR NL");
+ } # crnlsp
+
+-{ my $csv = Text::CSV_XS->new ();
++{ my $csv = Text::CSV->new ();
+ my $c99 = chr (0x99); # A random binary character
+
+ is ($csv->meta_info, undef, "meta_info () before parse ()");
+@@ -84,7 +84,7 @@
+ is ( scalar $csv->meta_info (), 0, "Hi! - meta_info () - count");
+ }
+
+-{ my $csv = Text::CSV_XS->new ({ keep_meta_info => 1 });
++{ my $csv = Text::CSV->new ({ keep_meta_info => 1 });
+
+ ok (1, "parse () tests - With flags");
+ is ( $csv->meta_info, undef, "meta_info before parse");
+@@ -114,7 +114,7 @@
+ is (($csv->meta_info ())[2], 0, "Hi! - meta_info () - field 3");
+ }
+
+-{ my $csv = Text::CSV_XS->new ({ keep_meta_info => 1, eol => "\r" });
++{ my $csv = Text::CSV->new ({ keep_meta_info => 1, eol => "\r" });
+
+ ok (1, "parse () tests - With flags");
+ is ( $csv->meta_info, undef, "meta_info before parse");
+@@ -144,7 +144,7 @@
+ is (($csv->meta_info ())[2], 0, "Hi! - meta_info () - field 3");
+ }
+
+-{ my $csv = Text::CSV_XS->new ({ keep_meta_info => 1, binary => 1 });
++{ my $csv = Text::CSV->new ({ keep_meta_info => 1, binary => 1 });
+
+ is ($csv->is_quoted (0), undef, "is_quoted () before parse");
+ is ($csv->is_binary (0), undef, "is_binary () before parse");
+@@ -173,7 +173,7 @@
+ is ($csv->is_binary (98), undef, "fflag 98 - undefined");
+ }
+
+-{ my $csv = Text::CSV_XS->new ({ escape_char => "+" });
++{ my $csv = Text::CSV->new ({ escape_char => "+" });
+
+ ok ( $csv->parse ("+"), "ESC");
+ ok (!$csv->parse ("++"), "ESC ESC");
+@@ -192,7 +192,7 @@
+ ok (!$csv->parse (qq{"+\r\n"}), "Quo ESC CR NL");
+ }
+
+-{ my $csv = Text::CSV_XS->new ({ escape_char => "+", binary => 1 });
++{ my $csv = Text::CSV->new ({ escape_char => "+", binary => 1 });
+
+ 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 @@
+ use Test::More tests => 82;
+
+ 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 $@;
+ }
+
+ 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 @@
+ is ($csv->eof, 1, "EOF");
+
+ # Edge cases
+-$csv = Text::CSV_XS->new ({ escape_char => "+" });
++$csv = Text::CSV->new ({ escape_char => "+" });
+ 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 @@
+ }
+
+ 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 $@;
+ }
+
+ use IO::Handle;
+
+ my $io;
+-my $csv = Text::CSV_XS->new ();
++my $csv = Text::CSV->new ();
+
+ ok (!$csv->print ($io, ["abc", "def\007", "ghi"]), "print bad character");
+
+@@ -110,7 +110,7 @@
+ is ($csv->eof, 1, "EOF");
+
+ # Edge cases
+-$csv = Text::CSV_XS->new ({ escape_char => "+" });
++$csv = Text::CSV->new ({ escape_char => "+" });
+ 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 @@
+ }
+
+ 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 $@;
+ }
+
+ use IO::Handle;
+
+ my $io;
+ my $io_str;
+-my $csv = Text::CSV_XS->new ();
++my $csv = Text::CSV->new ();
+
+ ok (!$csv->print ($io, ["abc", "def\007", "ghi"]), "print bad character");
+
+@@ -114,7 +114,7 @@
+ is ($csv->eof, 1, "EOF");
+
+ # Edge cases
+-$csv = Text::CSV_XS->new ({ escape_char => "+" });
++$csv = Text::CSV->new ({ escape_char => "+" });
+ 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
+@@ -6,35 +6,35 @@
+ use Test::More tests => 25;
+
+ 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 $@;
+ }
+
+ $| = 1;
+
+-my $csv = Text::CSV_XS->new ({
++my $csv = Text::CSV->new ({
+ types => [
+- Text::CSV_XS::IV (),
+- Text::CSV_XS::PV (),
+- Text::CSV_XS::NV (),
++ Text::CSV::IV (),
++ Text::CSV::PV (),
++ Text::CSV::NV (),
+ ],
+ });
+
+-ok ($csv, "CSV_XS->new ()");
++ok ($csv, "CSV->new ()");
+
+ is (@{$csv->{types}}, 3, "->{types} as hash");
+-is ($csv->{types}[0], Text::CSV_XS::IV (), "type IV");
+-is ($csv->{types}[1], Text::CSV_XS::PV (), "type PV");
+-is ($csv->{types}[2], Text::CSV_XS::NV (), "type NV");
++is ($csv->{types}[0], Text::CSV::IV (), "type IV");
++is ($csv->{types}[1], Text::CSV::PV (), "type PV");
++is ($csv->{types}[2], Text::CSV::NV (), "type NV");
+
+ is (ref ($csv->types), "ARRAY", "->types () as method");
+-is ($csv->types ()->[0], Text::CSV_XS::IV (), "type IV");
+-is ($csv->types ()->[1], Text::CSV_XS::PV (), "type PV");
+-is ($csv->types ()->[2], Text::CSV_XS::NV (), "type NV");
++is ($csv->types ()->[0], Text::CSV::IV (), "type IV");
++is ($csv->types ()->[1], Text::CSV::PV (), "type PV");
++is ($csv->types ()->[2], Text::CSV::NV (), "type NV");
+
+ is (length $csv->{_types}, 3, "->{_types}");
+ my $inp = join "", map { chr $_ }
+- Text::CSV_XS::IV (), Text::CSV_XS::PV (), Text::CSV_XS::NV ();
++ Text::CSV::IV (), Text::CSV::PV (), Text::CSV::NV ();
+ # 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
+@@ -6,8 +6,8 @@
+ use Test::More tests => 24;
+
+ BEGIN {
+- require_ok "Text::CSV_XS";
+- plan skip_all => "Cannot load Text::CSV_XS" if $@;
++ require_ok "Text::CSV";
++ plan skip_all => "Cannot load Text::CSV" if $@;
+ require "t/util.pl";
+ }
+
+@@ -15,7 +15,7 @@
+
+ my @binField = ("abc\0def\n\rghi", "ab\"ce,\032\"'", "\377");
+
+-my $csv = Text::CSV_XS->new ({ binary => 1 });
++my $csv = Text::CSV->new ({ binary => 1 });
+ ok ($csv->combine (@binField), "combine ()");
+
+ my $string;
+@@ -56,7 +56,7 @@
+
+ # Ken's test
+ ok (1, "always_quote");
+-my $csv2 = Text::CSV_XS->new ({ always_quote => 1 });
++my $csv2 = Text::CSV->new ({ always_quote => 1 });
+ 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
+@@ -6,8 +6,8 @@
+ use Test::More tests => 128;
+
+ BEGIN {
+- require_ok "Text::CSV_XS";
+- plan skip_all => "Cannot load Text::CSV_XS" if $@;
++ require_ok "Text::CSV";
++ plan skip_all => "Cannot load Text::CSV" if $@;
+ require "t/util.pl";
+ }
+
+@@ -19,7 +19,7 @@
+
+ foreach my $rs ("\n", "\r\n", "\r") {
+
+- my $csv = Text::CSV_XS->new ({ binary => 1 });
++ my $csv = Text::CSV->new ({ binary => 1 });
+ $csv->eol ($/ = $rs);
+
+ foreach my $pass (0, 1) {
+@@ -76,7 +76,7 @@
+ print FH qq{a,b,c$/}, qq{"d","e","f"$/};
+ close FH;
+ open FH, "<_eol.csv";
+- my $c = Text::CSV_XS->new ({ eol => $/ });
++ my $c = Text::CSV->new ({ eol => $/ });
+
+ 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
+@@ -15,12 +15,12 @@
+ }
+
+ BEGIN {
+- require_ok "Text::CSV_XS";
+- plan skip_all => "Cannot load Text::CSV_XS" if $@;
++ require_ok "Text::CSV";
++ plan skip_all => "Cannot load Text::CSV" if $@;
+ require "t/util.pl";
+ }
+
+-my $csv = Text::CSV_XS->new ({ binary => 1, always_quote => 1 });
++my $csv = Text::CSV->new ({ binary => 1, always_quote => 1 });
+
+ # 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
+@@ -6,12 +6,12 @@
+ use Test::More tests => 9074;
+
+ BEGIN {
+- require_ok "Text::CSV_XS";
+- plan skip_all => "Cannot load Text::CSV_XS" if $@;
++ require_ok "Text::CSV";
++ plan skip_all => "Cannot load Text::CSV" if $@;
+ require "t/util.pl";
+ }
+
+-my $csv = Text::CSV_XS->new ({ binary => 1 });
++my $csv = Text::CSV->new ({ binary => 1 });
+
+ 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
+@@ -6,15 +6,15 @@
+ use Test::More tests => 8;
+
+ 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 $@;
+ }
+
+ # Some assorted examples from the modules history
+
+ # "Pavel Kotala" <pkotala at logis.cz>
+ {
+- my $csv = Text::CSV_XS->new ({
++ my $csv = Text::CSV->new ({
+ 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
+@@ -7,8 +7,8 @@
+ use Test::More tests => 617;
+
+ 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 $@;
+ require "t/util.pl";
+ }
+
+@@ -27,7 +27,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");
+
+@@ -36,7 +36,7 @@
+ ok (my @f = $csv->fields, "$tst - fields");
+ }
+
+- #$csv = Text::CSV_XS->new ({ quote_char => '"', escape_char => "=" });
++ #$csv = Text::CSV->new ({ quote_char => '"', escape_char => "=" });
+ #ok (!$csv->parse (qq{foo,d'uh"bar}), "should fail");
+ }
+
+@@ -57,7 +57,7 @@
+
+ for (@bad) {
+ my ($tst, $valid, $bad) = @$_;
+- $csv = Text::CSV_XS->new ({ escape_char => "\\" });
++ $csv = Text::CSV->new ({ escape_char => "\\" });
+ ok ($csv, "$tst - new (ale => 0)");
+ is ($csv->parse ($bad), $valid, "$tst - parse () fail");
+
+@@ -96,7 +96,7 @@
+ my $s_eol = _readable ($eol);
+ for (@bad) {
+ my ($tst, $ok, $bad) = @$_;
+- $csv = Text::CSV_XS->new ({ eol => $eol, binary => 1 });
++ $csv = Text::CSV->new ({ eol => $eol, binary => 1 });
+ ok ($csv, "$s_eol / $tst - new - '$bad')");
+ is ($csv->parse ($bad), $ok, "$s_eol / $tst - parse () fail");
+
+@@ -135,7 +135,7 @@
+ 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 @@
+ 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)");
+ my @bad = (
+ # test, line
+@@ -178,7 +178,7 @@
+ }
+
+ { ok (1, "verbatim");
+- my $csv = Text::CSV_XS->new ({
++ my $csv = Text::CSV->new ({
+ 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
+@@ -7,8 +7,8 @@
+ use Test::More tests => 52;
+
+ 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 $rt_no;
+@@ -28,7 +28,7 @@
+
+ my @lines = @{$input{24386}};
+
+- ok (my $csv = Text::CSV_XS->new ({ sep_char => "\t" }), "RT-24386: \\t doesn't work");
++ ok (my $csv = Text::CSV->new ({ sep_char => "\t" }), "RT-24386: \\t doesn't work");
+ 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 @@
+ open FH, ">_test.csv";
+ print FH @{$input{21530}};
+ close FH;
+- ok (my $csv = Text::CSV_XS->new ({ binary => 1 }), "RT-21530: getline () return at eof");
++ ok (my $csv = Text::CSV->new ({ binary => 1 }), "RT-21530: getline () return at eof");
+ open FH, "<_test.csv";
+ my $row;
+ foreach my $line (1 .. 5) {
+@@ -62,7 +62,7 @@
+ { # http://rt.cpan.org/Ticket/Display.html?id=21530
+ # 18703: Fails to use quote_char of '~'
+ my ($csv, @fld);
+- ok ($csv = Text::CSV_XS->new ({ quote_char => "~" }), "RT-18703: Fails to use quote_char of '~'");
++ ok ($csv = Text::CSV->new ({ quote_char => "~" }), "RT-18703: Fails to use quote_char of '~'");
+ is ($csv->quote_char, "~", "quote_char is '~'");
+
+ ok ($csv->parse ($input{18703}[0]), "Line 1");
+@@ -78,7 +78,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);
+- ok ($csv = Text::CSV_XS->new ({
++ ok ($csv = Text::CSV->new ({
+ 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";
+
+ BEGIN {
+- require_ok "Text::CSV_XS";
+- plan skip_all => "Cannot load Text::CSV_XS" if $@;
++ require_ok "Text::CSV";
++ plan skip_all => "Cannot load Text::CSV" if $@;
+ require "t/util.pl";
+ }
+
+ $| = 1;
+
+-my $csv = Text::CSV_XS->new ({ escape_char => "+" });
++my $csv = Text::CSV->new ({ escape_char => "+" });
+
+ is ($csv->error_diag (), undef, "No errors yet");
+
Propchange: trunk/libtext-csv-perl/debian/patches/02_tests.patch
------------------------------------------------------------------------------
svn:executable = *
Added: trunk/libtext-csv-perl/debian/patches/03_csv_xs.pm.patch
URL: http://svn.debian.org/wsvn/trunk/libtext-csv-perl/debian/patches/03_csv_xs.pm.patch?rev=11978&op=file
==============================================================================
--- trunk/libtext-csv-perl/debian/patches/03_csv_xs.pm.patch (added)
+++ trunk/libtext-csv-perl/debian/patches/03_csv_xs.pm.patch Fri Jan 4 07:58:23 2008
@@ -1,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_no_xs.dpatch by <gregor+debian at comodo.priv.at>
+##
+## 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 @@
+ 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.
++
+ =item getline
+
+ $colref = $csv->getline ($io);
Propchange: trunk/libtext-csv-perl/debian/patches/03_csv_xs.pm.patch
------------------------------------------------------------------------------
svn:executable = *
Added: trunk/libtext-csv-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libtext-csv-perl/debian/patches/series?rev=11978&op=file
==============================================================================
--- trunk/libtext-csv-perl/debian/patches/series (added)
+++ trunk/libtext-csv-perl/debian/patches/series Fri Jan 4 07:58:23 2008
@@ -1,0 +1,3 @@
+01_cvs.pm.patch
+02_tests.patch
+03_csv_xs.pm.patch
Modified: trunk/libtext-csv-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libtext-csv-perl/debian/rules?rev=11978&op=diff
==============================================================================
--- trunk/libtext-csv-perl/debian/rules (original)
+++ trunk/libtext-csv-perl/debian/rules Fri Jan 4 07:58:23 2008
@@ -11,7 +11,7 @@
CFLAGS += -O2
endif
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
PERL ?= /usr/bin/perl
@@ -19,7 +19,7 @@
prefix := $(CURDIR)/debian/$(package)/usr
build: build-stamp
-build-stamp: $(DPATCH_STAMPFN)
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
$(PERL) Makefile.PL INSTALLDIRS=vendor PERL=$(PERL)
$(MAKE) LD_RUN_PATH= OPTIMIZE="$(CFLAGS)"
More information about the Pkg-perl-cvs-commits
mailing list