r17788 - in /trunk/libtext-csv-perl/debian: changelog patches/01_cvs.pm.patch

[dmn at users.alioth.debian.org]

Author: dmn
Date: Tue Mar 18 08:19:52 2008
New Revision: 17788

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=17788
Log:
* Modified 01_cvs.pm.patch to:
  - blindly glob-copy all functions that are used directly (not as
    class/object methods)
  - modify Text::CSV_XS::error_diag() to recognize Text::CSV as 'being
    Text::CSV_XS'

Modified:
    trunk/libtext-csv-perl/debian/changelog
    trunk/libtext-csv-perl/debian/patches/01_cvs.pm.patch

Modified: trunk/libtext-csv-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/debian/changelog?rev=17788&op=diff
==============================================================================
--- trunk/libtext-csv-perl/debian/changelog (original)
+++ trunk/libtext-csv-perl/debian/changelog Tue Mar 18 08:19:52 2008
@@ -1,12 +1,16 @@
 libtext-csv-perl (0.37-1) UNRELEASED; urgency=low
 
-  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 ...
-  
+  [ gregor herrmann ]
   * New upstream release.
   * debian/copyright: update/add copyright notices.
   * Refresh and update patches.
+
+  [ Damyan Ivanov ]
+  * Modified 01_cvs.pm.patch to:
+    - blindly glob-copy all functions that are used directly (not as
+      class/object methods)
+    - modify Text::CSV_XS::error_diag() to recognize Text::CSV as 'being
+      Text::CSV_XS'
 
  -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 18 Mar 2008 04:20:02 +0100
 

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=17788&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 08:19:52 2008
@@ -1,11 +1,17 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 01_no_xs.patch by  <gregor+debian at comodo.priv.at>
 ##
-## create CSV.pm
+## 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
-@@ -0,0 +1,14 @@
+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
+@@ -0,0 +1,20 @@
 +
 +package Text::CSV;
 +
@@ -15,8 +21,27 @@
 +
 +use Text::CSV_XS;
 +
-+sub PV { 0 }
-+sub IV { 1 }
-+sub NV { 2 }
++no strict 'refs';
++
++# 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) )
++{
++    *{$_} = *{ "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 @@
+ 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};
+     my $context = wantarray;