[Pkg-sdl-commits] [SCM] Packaging of SDL_ttf branch, master, updated. debian/2.0.9-1.1-24-gc5308a4

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit f1755d64f377df897155193df48ff4c8e87fae4e
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sat Mar 3 16:16:51 2012 +0000

    Refresh, reformat all patches and fix filename in one of them

diff --git a/debian/patches/fix_bug_405378_error_reporting_upstream_b09799bf8dff b/debian/patches/fix_bug_405378_error_reporting_upstream_b09799bf8dff
index fe2f2cb..ea76288 100644
--- a/debian/patches/fix_bug_405378_error_reporting_upstream_b09799bf8dff
+++ b/debian/patches/fix_bug_405378_error_reporting_upstream_b09799bf8dff
@@ -24,9 +24,8 @@ Fixed bug 1400 - Lack of error reporting for glyph rendering errors
   into the places where it is missing, although it might be nice to know
   which glyph it was that could not be found...
 
-diff -r 077db903bfdf -r b09799bf8dff SDL_ttf.c
---- a/SDL_ttf.c	Fri Jan 20 20:35:28 2012 -0500
-+++ b/SDL_ttf.c	Sat Jan 28 10:28:54 2012 -0500
+--- a/SDL_ttf.c
++++ b/SDL_ttf.c
 @@ -1155,6 +1155,7 @@
  
  		error = Find_Glyph(font, c, CACHED_METRICS);
@@ -83,4 +82,3 @@ diff -r 077db903bfdf -r b09799bf8dff SDL_ttf.c
  		return(NULL);
  	}
  	glyph = font->current;
-
diff --git a/debian/patches/fix_bug_661987_TTF_RenderGlyph_Shaded_is_broken b/debian/patches/fix_bug_661987_TTF_RenderGlyph_Shaded_is_broken
index dcce209..fe3c813 100644
--- a/debian/patches/fix_bug_661987_TTF_RenderGlyph_Shaded_is_broken
+++ b/debian/patches/fix_bug_661987_TTF_RenderGlyph_Shaded_is_broken
@@ -3,14 +3,14 @@ Description: Fix bug report "TTF_RenderGlyph_Shaded is broken"
 Author: Unknown
 Last-Update: 2012-03-03
 Bug-Debian: http://bugs.debian.org/661987
---- SDL_ttf.c.orig      2012-02-12 16:36:41.859977617 +0100
-+++ SDL_ttf.c   2012-02-12 16:36:53.696580159 +0100
-@@ -1747,7 +1747,7 @@
-        /* Copy the character from the pixmap */
-        src = glyph->pixmap.buffer;
-        dst = (Uint8*) textbuf->pixels;
--       for ( row = 0; row < glyph->bitmap.rows; ++row ) {
-+       for ( row = 0; row < glyph->pixmap.rows; ++row ) {
-                memcpy( dst, src, glyph->pixmap.width );
-                src += glyph->pixmap.pitch;
-                dst += textbuf->pitch;
+--- a/SDL_ttf.c
++++ b/SDL_ttf.c
+@@ -1752,7 +1752,7 @@
+ 	/* Copy the character from the pixmap */
+ 	src = glyph->pixmap.buffer;
+ 	dst = (Uint8*) textbuf->pixels;
+-	for ( row = 0; row < glyph->bitmap.rows; ++row ) {
++	for ( row = 0; row < glyph->pixmap.rows; ++row ) {
+ 		memcpy( dst, src, glyph->pixmap.width );
+ 		src += glyph->pixmap.pitch;
+ 		dst += textbuf->pitch;
diff --git a/debian/patches/series b/debian/patches/series
index 565adce..83e7c9a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 link_libm_ftbfs_binutils-gold
-fix_bug_661987_TTF_RenderGlyph_Shaded_is_broken
 fix_bug_405378_error_reporting_upstream_b09799bf8dff
+fix_bug_661987_TTF_RenderGlyph_Shaded_is_broken

-- 
Packaging of SDL_ttf