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

[Sam Hocevar]

The following commit has been merged in the master branch:
commit 856a810b8cd61fb371163a480a96c7f6c3e461a4
Author: Sam Hocevar <sam at hocevar.net>
Date:   Thu May 17 17:25:10 2012 +0200

    debian/patches/fix_joystick_misc_axes.diff: fix a joystick remapping
    bug causing some axes to malfunction.

diff --git a/debian/changelog b/debian/changelog
index 90d189c..9d808c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ libsdl1.2 (1.2.15-4) UNRELEASED; urgency=low
     (Closes: #670122)
   * Bump Standards-Version to 3.9.3, no further changes necessary.
 
+  [ Sam Hocevar ]
+  * debian/patches/fix_joystick_misc_axes.diff: fix a joystick remapping
+    bug causing some axes to malfunction.
+
  -- Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>  Tue, 10 Apr 2012 23:01:40 +0100
 
 libsdl1.2 (1.2.15-3) unstable; urgency=low
diff --git a/debian/patches/fix_joystick_misc_axes.diff b/debian/patches/fix_joystick_misc_axes.diff
new file mode 100644
index 0000000..75e3755
--- /dev/null
+++ b/debian/patches/fix_joystick_misc_axes.diff
@@ -0,0 +1,13 @@
+diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
+index ee43974..80e46e4 100644
+--- a/src/joystick/linux/SDL_sysjoystick.c
++++ b/src/joystick/linux/SDL_sysjoystick.c
+@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd)
+ 				++joystick->nbuttons;
+ 			}
+ 		}
+-		for ( i=0; i<ABS_MISC; ++i ) {
++		for ( i=0; i<ABS_MAX; ++i ) {
+ 			/* Skip hats */
+ 			if ( i == ABS_HAT0X ) {
+ 				i = ABS_HAT3Y;
diff --git a/debian/patches/series b/debian/patches/series
index 0f0f6b9..749aced 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ dont_propagate_lpthread.diff
 #check_SDL_NOKBD_environment_variable.diff
 fix_build_joystick_freebsd.diff
 fix_window_resizing.diff
+fix_joystick_misc_axes.diff

-- 
Debian packaging of SDL 1.2