[SCM] Debian packaging of libchart-perl branch, master, updated. debian/2.4.4-1-4-g3f57352

Florian Schlichting fschlich at zedat.fu-berlin.de
Mon Mar 19 21:45:56 UTC 2012


The following commit has been merged in the master branch:
commit 1fc8ab78483b386f284ff24f8a0c2e477e441242
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Mon Mar 19 20:55:08 2012 +0100

    Add fix_scalar_png_return.patch

diff --git a/debian/changelog b/debian/changelog
index ebd0f3e..35d0d58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libchart-perl (2.4.4-2) unstable; urgency=low
+
+  * Add fix_scalar_png_return.patch, restoring a sensible return value that
+    Jifty::Plugin::Chart relies upon (closes: 660379).
+
+ -- Florian Schlichting <fschlich at zedat.fu-berlin.de>  Mon, 19 Mar 2012 20:43:38 +0100
+
 libchart-perl (2.4.4-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/fix_scalar_png_return.patch b/debian/patches/fix_scalar_png_return.patch
new file mode 100644
index 0000000..343e391
--- /dev/null
+++ b/debian/patches/fix_scalar_png_return.patch
@@ -0,0 +1,28 @@
+Description: fix scalar_png() return value
+ Chart version 2.4.4 added a 'return 1' to the end of scalar_png(), 
+ which directly contradicts what the preceding comment says the method
+ is meant to return: the png image itself.
+Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
+Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=75887
+
+--- a/Chart/Base.pm
++++ b/Chart/Base.pm
+@@ -481,7 +481,7 @@
+ # this method invokes all my private methods to actually
+ # draw the chart and plot the data
+ # @param[in] $dataref Reference to the data to be plotted
+-# @return Status of the plot
++# @return png image as a scalar value
+ sub scalar_png
+ {
+     my $self    = shift;
+@@ -502,8 +502,7 @@
+ 
+     # returns the png image as a scalar value, so that
+     # the programmer/user can do whatever the she/he wants to with it
+-    $self->{'gd_obj'}->png();
+-    return 1;
++    return $self->{'gd_obj'}->png();
+ }
+ 
+ ## @method int jpeg($file,$dataref)
diff --git a/debian/patches/series b/debian/patches/series
index 5c93929..5ae329d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 color.patch
+fix_scalar_png_return.patch

-- 
Debian packaging of libchart-perl



More information about the Pkg-perl-cvs-commits mailing list