[SCM] gmerlin/master: Drop png_set_gray.patch, fixed upstream.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit cc0fdf6c33853e14f4695b06775cece5f174ac30
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jun 11 13:06:06 2012 +0200

    Drop png_set_gray.patch, fixed upstream.

diff --git a/debian/patches/png_set_gray.patch b/debian/patches/png_set_gray.patch
deleted file mode 100644
index ccef076..0000000
--- a/debian/patches/png_set_gray.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Cristian Morales Vega <reddwarf at opensuse.org>
-Description: remove double call to (deprecated) png_set_gray_1_2_4_to_8()
-
---- gmerlin.orig/plugins/png/ir_png.c
-+++ gmerlin/plugins/png/ir_png.c
-@@ -133,7 +133,6 @@
-       png_set_expand_gray_1_2_4_to_8(png->png_ptr);
- #endif
- 
--        png_set_gray_1_2_4_to_8(png->png_ptr);
-       if (png_get_valid(png->png_ptr, png->info_ptr, PNG_INFO_tRNS))
-         {
-         png_set_tRNS_to_alpha(png->png_ptr);
diff --git a/debian/patches/series b/debian/patches/series
index 01f1667..c8189e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 desktop_files.patch
 fix_manpages.patch
 replace_bg_sem_h.patch
-png_set_gray.patch
 fix_zeroplugins.patch
 function_param_type.patch
 underlinking.patch

-- 
gmerlin packaging