[Pkg-sdl-commits] r266 - in unstable/libsdl1.2/debian: . patches source

[Barry deFreese]

Author: bdefreese
Date: 2010-04-30 14:08:33 +0000 (Fri, 30 Apr 2010)
New Revision: 266

Added:
   unstable/libsdl1.2/debian/patches/320_disappearingcursor.diff
   unstable/libsdl1.2/debian/source/
   unstable/libsdl1.2/debian/source/format
Modified:
   unstable/libsdl1.2/debian/changelog
   unstable/libsdl1.2/debian/control
   unstable/libsdl1.2/debian/patches/series
Log:
  * Add 320_disappearingcursor.diff to fix problems with the mouse cursor
    disappearing in OpenTTD using 1.2.14-5.  Partially reverts the fix for
    upstream bug #716 (r4872); taken together with 310_fixmouseclicks,
    the upstream fix is entirely reverted.  (Closes: #578389)
    - Thanks to Adam D. Barratt!
  * Add source format 1.0 for now.
  * Bump Standards Version to 3.8.4. (No changes needed).


Modified: unstable/libsdl1.2/debian/changelog
===================================================================
--- unstable/libsdl1.2/debian/changelog	2010-04-16 21:47:54 UTC (rev 265)
+++ unstable/libsdl1.2/debian/changelog	2010-04-30 14:08:33 UTC (rev 266)
@@ -1,3 +1,15 @@
+libsdl1.2 (1.2.14-6) unstable; urgency=low
+
+  * Add 320_disappearingcursor.diff to fix problems with the mouse cursor
+    disappearing in OpenTTD using 1.2.14-5.  Partially reverts the fix for
+    upstream bug #716 (r4872); taken together with 310_fixmouseclicks,
+    the upstream fix is entirely reverted.  (Closes: #578389)
+    - Thanks to Adam D. Barratt!
+  * Add source format 1.0 for now.
+  * Bump Standards Version to 3.8.4. (No changes needed).
+
+ -- Barry deFreese <bdefreese at debian.org>  Fri, 30 Apr 2010 09:11:40 -0400
+
 libsdl1.2 (1.2.14-5) unstable; urgency=low
 
   * Add 310_fixmouseclicks.diff to fix problems with left-mouse clicks

Modified: unstable/libsdl1.2/debian/control
===================================================================
--- unstable/libsdl1.2/debian/control	2010-04-16 21:47:54 UTC (rev 265)
+++ unstable/libsdl1.2/debian/control	2010-04-30 14:08:33 UTC (rev 266)
@@ -3,7 +3,7 @@
 Section: libs
 Maintainer: Debian SDL packages maintainers <pkg-sdl-maintainers at lists.alioth.debian.org>
 Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Aurelien Jarno <aurel32 at debian.org>, Josselin Mouette <joss at debian.org>, Barry deFreese <bdefreese at debian.org>
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Build-Depends: dpkg (>= 1.13.2), debhelper (>= 5.0), quilt, nasm [i386 kfreebsd-i386], libaa1-dev, libx11-dev, libxext-dev, libxt-dev, libxv-dev, x11proto-core-dev, libaudiofile-dev, libesd0-dev, libpulse-dev, libgl1-mesa-dev, libsvga1-dev [amd64 i386], libarts1-dev, libartsc0-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudio-dev, libcaca-dev, libdirectfb-dev (>= 1.0) [!hurd-i386], libusbhid-dev [kfreebsd-i386 kfreebsd-amd64], libglu1-mesa-dev
 Vcs-Svn: svn://svn.debian.org/pkg-sdl/unstable/libsdl.2
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-sdl/unstable/libsdl1.2/

Added: unstable/libsdl1.2/debian/patches/320_disappearingcursor.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/320_disappearingcursor.diff	                        (rev 0)
+++ unstable/libsdl1.2/debian/patches/320_disappearingcursor.diff	2010-04-30 14:08:33 UTC (rev 266)
@@ -0,0 +1,17 @@
+Index: SDL-1.2.14/src/video/x11/SDL_x11events.c
+===================================================================
+--- SDL-1.2.14.orig/src/video/x11/SDL_x11events.c	2010-04-30 09:16:35.000000000 -0400
++++ SDL-1.2.14/src/video/x11/SDL_x11events.c	2010-04-30 09:16:35.000000000 -0400
+@@ -444,8 +444,10 @@
+ if ( xevent.xcrossing.mode == NotifyUngrab )
+ printf("Mode: NotifyUngrab\n");
+ #endif
+-		if ( xevent.xcrossing.detail != NotifyInferior ) {
+-			if ( this->input_grab == SDL_GRAB_OFF ) {
++		if ( (xevent.xcrossing.mode != NotifyGrab) &&
++		     (xevent.xcrossing.mode != NotifyUngrab) &&
++		     (xevent.xcrossing.detail != NotifyInferior) ) {
++               		if ( this->input_grab == SDL_GRAB_OFF ) {
+ 				posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS);
+ 			} else {
+ 				posted = SDL_PrivateMouseMotion(0, 0,

Modified: unstable/libsdl1.2/debian/patches/series
===================================================================
--- unstable/libsdl1.2/debian/patches/series	2010-04-16 21:47:54 UTC (rev 265)
+++ unstable/libsdl1.2/debian/patches/series	2010-04-30 14:08:33 UTC (rev 266)
@@ -16,3 +16,4 @@
 222_joystick_crash.diff
 300_dont_propagate_lpthread.diff
 310_fixmouseclicks
+320_disappearingcursor.diff

Added: unstable/libsdl1.2/debian/source/format
===================================================================
--- unstable/libsdl1.2/debian/source/format	                        (rev 0)
+++ unstable/libsdl1.2/debian/source/format	2010-04-30 14:08:33 UTC (rev 266)
@@ -0,0 +1 @@
+1.0