r40658 - in /trunk/libtext-formattable-perl/debian: changelog patches/zero-width.patch

[carnil-guest at users.alioth.debian.org]

Author: carnil-guest
Date: Fri Jul 24 13:47:12 2009
New Revision: 40658

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=40658
Log:
Refresh the zero-width.patch for new upstream release. 

Modified:
    trunk/libtext-formattable-perl/debian/changelog
    trunk/libtext-formattable-perl/debian/patches/zero-width.patch

Modified: trunk/libtext-formattable-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-formattable-perl/debian/changelog?rev=40658&op=diff
==============================================================================
--- trunk/libtext-formattable-perl/debian/changelog (original)
+++ trunk/libtext-formattable-perl/debian/changelog Fri Jul 24 13:47:12 2009
@@ -21,8 +21,9 @@
     extensive quilt file under /usr/share/doc/quilt/README.source. 
   * Update debian/changelog and use machine-readable debian/copyright
     format specifications from dep5 proposal. 
+  * Refresh the zero-width.patch for new upstream release. 
 
- -- Salvatore Bonaccorso <salvatore.bonaccorso at gmail.com>  Fri, 24 Jul 2009 15:35:23 +0200
+ -- Salvatore Bonaccorso <salvatore.bonaccorso at gmail.com>  Fri, 24 Jul 2009 15:46:13 +0200
 
 libtext-formattable-perl (1.01-3) unstable; urgency=low
 

Modified: trunk/libtext-formattable-perl/debian/patches/zero-width.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-formattable-perl/debian/patches/zero-width.patch?rev=40658&op=diff
==============================================================================
--- trunk/libtext-formattable-perl/debian/patches/zero-width.patch (original)
+++ trunk/libtext-formattable-perl/debian/patches/zero-width.patch Fri Jul 24 13:47:12 2009
@@ -1,10 +1,21 @@
-# do not crash when a column has zero width
-# reported upstream as http://rt.cpan.org/Public/Bug/Display.html?id=34546
-# Debian bug http://bugs.debian.org/490554
+Description: do not crash when a column has zero width
+Author: Penny Leach <penny at she.geek.nz>
+Bug: http://rt.cpan.org/Public/Bug/Display.html?id=34546
+Bug-Debian: http://bugs.debian.org/490554
+Last-Update: 2009-07-24
 --- a/lib/Text/FormatTable.pm
 +++ b/lib/Text/FormatTable.pm
-@@ -40,14 +40,14 @@ sub _min_width($)
-         my $l = length $s;
+@@ -36,7 +36,7 @@
+ {
+     my $str = shift;
+     $str =~ s/\e \[ [^m]* m//xmsg;
+-    return length $str;
++    return length $str ? length $str : 1;
+ }
+ 
+ # minimal width of $1 if word-wrapped
+@@ -48,7 +48,7 @@
+         my $l = _uncolorized_length $s;
          $min = $l if not defined $min or $l > $min;
      }
 -    return $min;
@@ -12,11 +23,3 @@
  }
  
  # width of $1 if not word-wrapped
- sub _max_width($)
- {
-     my $str = shift;
--    return length $str;
-+    return length $str ? length $str : 1;
- }
- 
- sub _max($$)