[Pkg-sdl-commits] [SCM] Debian packaging of SDL_image 1.2 branch, master, updated. debian/1.2.11-2-9-g8c9340b

[Felix Geyer]

The following commit has been merged in the master branch:
commit 8c9340b658d321c60714b6b9db485a023ad734b4
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Tue Feb 7 11:34:32 2012 +0100

    New upstream release.
    
    Drop bug_1.2.11_corrupts_png_of_PseudoClass_type_8bit.diff,
    was backported from upstream.

diff --git a/debian/changelog b/debian/changelog
index c58b49c..ff775ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
-sdl-image1.2 (1.2.11-3) UNRELEASED; urgency=low
+sdl-image1.2 (1.2.12-1) UNRELEASED; urgency=low
 
+  * New upstream release.
+  * Drop bug_1.2.11_corrupts_png_of_PseudoClass_type_8bit.diff, was backported
+    from upstream.
   * Add a symbols file.
   * Fix typo in dh_installchangelogs override name.
 
diff --git a/debian/patches/bug_1.2.11_corrupts_png_of_PseudoClass_type_8bit.diff b/debian/patches/bug_1.2.11_corrupts_png_of_PseudoClass_type_8bit.diff
deleted file mode 100644
index 5ce1c5c..0000000
--- a/debian/patches/bug_1.2.11_corrupts_png_of_PseudoClass_type_8bit.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Sam Lantinga <slouken at libsdl.org>
-Subject: Fixed bug 1377 - SDL_image 1.2.11 corrupts png of PseudoClass type 8bit
-Origin: upstream, http://hg.libsdl.org/SDL_image/rev/7036dd36a22f
-Bug: http://bugzilla.libsdl.org/show_bug.cgi?id=1377
-Bug-Debian: http://bugs.debian.org/656927
-
-diff -r b51a5e14a456 -r 7036dd36a22f IMG_png.c
---- a/IMG_png.c	Tue Jan 03 21:37:48 2012 -0500
-+++ b/IMG_png.c	Thu Jan 19 23:19:44 2012 -0500
-@@ -453,9 +453,6 @@
- 	/* Allocate the SDL surface to hold the image */
- 	Rmask = Gmask = Bmask = Amask = 0 ;
- 	num_channels = lib.png_get_channels(png_ptr, info_ptr);
--	/* Some .png files are monochrome, with as much as 1 channel and 1 bit per pixel */
--	if( num_channels != 3 && num_channels != 4 )
--		num_channels = 3;
- 	if ( color_type != PNG_COLOR_TYPE_PALETTE ) {
- 		if ( SDL_BYTEORDER == SDL_LIL_ENDIAN ) {
- 			Rmask = 0x000000FF;
-
-
-
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c2ce660..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-bug_1.2.11_corrupts_png_of_PseudoClass_type_8bit.diff

-- 
Debian packaging of SDL_image 1.2