[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 f0be2aaf04f0b00b087f2a89fd2c1485e000f73a
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sun Jan 22 18:40:15 2012 +0000

    Remove patch fixmouseclicks.diff, it was part of a fix applied upstream (same as for the patch disappearingcursor.diff)

diff --git a/debian/patches/fixmouseclicks.diff b/debian/patches/fixmouseclicks.diff
deleted file mode 100644
index 3f0177c..0000000
--- a/debian/patches/fixmouseclicks.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: libsdl1.2-1.2.14/src/video/x11/SDL_x11events.c
-===================================================================
---- libsdl1.2-1.2.14.orig/src/video/x11/SDL_x11events.c	2010-04-06 19:29:05.000000000 +0100
-+++ libsdl1.2-1.2.14/src/video/x11/SDL_x11events.c	2010-04-06 19:29:46.000000000 +0100
-@@ -423,12 +423,15 @@
- if ( xevent.xcrossing.mode == NotifyUngrab )
- printf("Mode: NotifyUngrab\n");
- #endif
--		if ( this->input_grab == SDL_GRAB_OFF ) {
--			posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
-+		if ( (xevent.xcrossing.mode != NotifyGrab) &&
-+		     (xevent.xcrossing.mode != NotifyUngrab) ) {
-+			if ( this->input_grab == SDL_GRAB_OFF ) {
-+				posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
-+			}
-+			posted = SDL_PrivateMouseMotion(0, 0,
-+					xevent.xcrossing.x,
-+					xevent.xcrossing.y);
- 		}
--		posted = SDL_PrivateMouseMotion(0, 0,
--				xevent.xcrossing.x,
--				xevent.xcrossing.y);
- 	    }
- 	    break;
- 
diff --git a/debian/patches/series b/debian/patches/series
index cec429a..ab08628 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@ x11_keytounicode.diff
 check_SDL_NOKBD_environment_variable.diff
 joystick_crash.diff
 dont_propagate_lpthread.diff
-fixmouseclicks.diff

-- 
Debian packaging of SDL 1.2