[Pkg-sdl-commits] [SCM] Debian packaging of SDL 1.2 branch, master, updated. debian/1.2.15-1

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit 8effac6d05a00328d659e941bfbe31ee2ef6a85c
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sun Jan 22 10:54:43 2012 +0000

    Remove patch sdlblit_memcpy_fix.diff, it was backported from upstream

diff --git a/debian/patches/sdlblit_memcpy_fix.diff b/debian/patches/sdlblit_memcpy_fix.diff
deleted file mode 100644
index 562e198..0000000
--- a/debian/patches/sdlblit_memcpy_fix.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fixed bug #1090 (SDL_BlitCopyOverlap() assumes memcpy() operates in order)
-  The much more complete fix is in SDL 1.3, but this is a band-aid that will fix the bug for 1.2.
-Author: Sam Lantinga <slouken at libsdl.org>
-Origin: http://hg.libsdl.org/SDL/rev/d898ee5431f5
-Bug: http://bugzilla.libsdl.org/show_bug.cgi?id=1090
-Bug-Debian: http://bugs.debian.org/626048
-Bug-Ubuntu: https://launchpad.net/bugs/725044
-
---- a/src/video/SDL_blit.c
-+++ b/src/video/SDL_blit.c
-@@ -214,7 +214,7 @@
- 	dstskip = w+info->d_skip;
- 	if ( dst < src ) {
- 		while ( h-- ) {
--			SDL_memcpy(dst, src, w);
-+			SDL_memmove(dst, src, w);
- 			src += srcskip;
- 			dst += dstskip;
- 		}
diff --git a/debian/patches/series b/debian/patches/series
index 0091cfd..8226c3d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,5 +9,4 @@ joystick_crash.diff
 dont_propagate_lpthread.diff
 fixmouseclicks.diff
 disappearingcursor.diff
-sdlblit_memcpy_fix.diff
 x11_add_support_NET_WM_PID.diff

-- 
Debian packaging of SDL 1.2