[SCM] jmeters/master: Drop 02-build_with_new_libpng.patch, adopted upstream.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5d3f4b9b101c975c9c6adddb126eca96ee43ebeb
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Apr 5 11:10:58 2012 +0200

    Drop 02-build_with_new_libpng.patch, adopted upstream.

diff --git a/debian/patches/02-build_with_new_libpng.patch b/debian/patches/02-build_with_new_libpng.patch
deleted file mode 100644
index 3a0fb24..0000000
--- a/debian/patches/02-build_with_new_libpng.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix FTBFS with libpng 1.5
-Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
-Forwarded: No
-
-Index: jmeters-0.2.0/source/mkimage.cc
-===================================================================
---- jmeters-0.2.0.orig/source/mkimage.cc	2011-08-03 23:09:25.337825443 +0200
-+++ jmeters-0.2.0/source/mkimage.cc	2011-08-03 23:10:57.478803515 +0200
-@@ -54,8 +54,14 @@
-                   PNG_TRANSFORM_STRIP_16 | PNG_TRANSFORM_PACKING | PNG_TRANSFORM_EXPAND,
-                   0);
- 
--    dx = png_info->width;
--    dy = png_info->height;
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+	dx = png_get_image_width(png_ptr, png_info);
-+	dy = png_get_image_height(png_ptr, png_info);
-+#else
-+     dx = png_info->width;
-+     dy = png_info->height;
-+#endif
-+
-     data = (const unsigned char **)(png_get_rows (png_ptr, png_info));
- 
-     image = XCreateImage (disp->dpy (),
diff --git a/debian/patches/series b/debian/patches/series
index 758a3ff..d3b72df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01-makefile.patch
-02-build_with_new_libpng.patch

-- 
jmeters packaging