r26049 - in /trunk/libtext-formattable-perl/debian: changelog control patches/ patches/series patches/zero-width.patch rules

[dmn at users.alioth.debian.org]

Author: dmn
Date: Wed Oct 15 15:14:14 2008
New Revision: 26049

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=26049
Log:
* add zero-width.patch by Penny Leach
  Closes: #490554 -- buffycli: Can't take log of 0 at
  /usr/share/perl5/Text/FormatTable.pm line 145
* add quilt to B-D/rules

Added:
    trunk/libtext-formattable-perl/debian/patches/
    trunk/libtext-formattable-perl/debian/patches/series
    trunk/libtext-formattable-perl/debian/patches/zero-width.patch
Modified:
    trunk/libtext-formattable-perl/debian/changelog
    trunk/libtext-formattable-perl/debian/control
    trunk/libtext-formattable-perl/debian/rules

Modified: trunk/libtext-formattable-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-formattable-perl/debian/changelog?rev=26049&op=diff
==============================================================================
--- trunk/libtext-formattable-perl/debian/changelog (original)
+++ trunk/libtext-formattable-perl/debian/changelog Wed Oct 15 15:14:14 2008
@@ -1,3 +1,12 @@
+libtext-formattable-perl (1.01-3) UNRELEASED; urgency=low
+
+  * add zero-width.patch by Penny Leach
+    Closes: #490554 -- buffycli: Can't take log of 0 at
+    /usr/share/perl5/Text/FormatTable.pm line 145
+  * add quilt to B-D/rules
+
+ -- Damyan Ivanov <dmn at debian.org>  Wed, 15 Oct 2008 18:08:57 +0300
+
 libtext-formattable-perl (1.01-2) unstable; urgency=low
 
   * debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser

Modified: trunk/libtext-formattable-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-formattable-perl/debian/control?rev=26049&op=diff
==============================================================================
--- trunk/libtext-formattable-perl/debian/control (original)
+++ trunk/libtext-formattable-perl/debian/control Wed Oct 15 15:14:14 2008
@@ -1,7 +1,7 @@
 Source: libtext-formattable-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 6)
+Build-Depends: debhelper (>= 6), quilt
 Build-Depends-Indep: perl (>= 5.8.0-7)
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Damyan Ivanov <divanov at creditreform.bg>,

Added: trunk/libtext-formattable-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-formattable-perl/debian/patches/series?rev=26049&op=file
==============================================================================
--- trunk/libtext-formattable-perl/debian/patches/series (added)
+++ trunk/libtext-formattable-perl/debian/patches/series Wed Oct 15 15:14:14 2008
@@ -1,0 +1,1 @@
+zero-width.patch

Added: 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=26049&op=file
==============================================================================
--- trunk/libtext-formattable-perl/debian/patches/zero-width.patch (added)
+++ trunk/libtext-formattable-perl/debian/patches/zero-width.patch Wed Oct 15 15:14:14 2008
@@ -1,0 +1,22 @@
+# 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
+--- a/lib/Text/FormatTable.pm
++++ b/lib/Text/FormatTable.pm
+@@ -40,14 +40,14 @@ sub _min_width($)
+         my $l = length $s;
+         $min = $l if not defined $min or $l > $min;
+     }
+-    return $min;
++    return $min ? $min : 1;
+ }
+ 
+ # width of $1 if not word-wrapped
+ sub _max_width($)
+ {
+     my $str = shift;
+-    return length $str;
++    return length $str ? length $str : 1;
+ }
+ 
+ sub _max($$)

Modified: trunk/libtext-formattable-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-formattable-perl/debian/rules?rev=26049&op=diff
==============================================================================
--- trunk/libtext-formattable-perl/debian/rules (original)
+++ trunk/libtext-formattable-perl/debian/rules Wed Oct 15 15:14:14 2008
@@ -6,6 +6,8 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+
+include /usr/share/quilt/quilt.make
 
 # If set to a true value then MakeMaker's prompt function will
 # always return the default without waiting for user input.
@@ -20,7 +22,7 @@
 TMP     =$(CURDIR)/debian/$(PACKAGE)
 
 build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
@@ -29,7 +31,7 @@
 
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot