[SCM] Debian packaging of libchart-perl branch, master, updated. debian/2.4.4-2-9-gd50821c

gregor herrmann gregoa at debian.org
Sat Mar 24 14:49:54 UTC 2012


The following commit has been merged in the master branch:
commit 38ed866901646ef11546543b487c8fc81127043a
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Mar 24 15:39:21 2012 +0100

    Drop fix_scalar_png_return.patch, applied upstream.

diff --git a/debian/patches/fix_scalar_png_return.patch b/debian/patches/fix_scalar_png_return.patch
deleted file mode 100644
index 343e391..0000000
--- a/debian/patches/fix_scalar_png_return.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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 5ae329d..5c93929 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 color.patch
-fix_scalar_png_return.patch

-- 
Debian packaging of libchart-perl



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