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

    Remove patch joystick_crash.diff, it was backported from upstream (changeset 3590 493f252a455c)

diff --git a/debian/patches/joystick_crash.diff b/debian/patches/joystick_crash.diff
deleted file mode 100644
index 949e18b..0000000
--- a/debian/patches/joystick_crash.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fix crash with joystick detection.
-Index: libsdl1.2-1.2.14/src/joystick/linux/SDL_sysjoystick.c
-===================================================================
---- libsdl1.2-1.2.14.orig/src/joystick/linux/SDL_sysjoystick.c	2010-01-12 12:37:36.000000000 -0500
-+++ libsdl1.2-1.2.14/src/joystick/linux/SDL_sysjoystick.c	2010-01-12 12:38:27.000000000 -0500
-@@ -700,7 +700,7 @@
- 				continue;
- 			}
- 			if ( test_bit(i, absbit) ) {
--				int values[5];
-+				int values[6];
- 
- 				if ( ioctl(fd, EVIOCGABS(i), values) < 0 )
- 					continue;
diff --git a/debian/patches/series b/debian/patches/series
index 3719ad7..8881f7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@ relibtoolize.diff
 kfreebsd_gnu.diff
 x11_keytounicode.diff
 check_SDL_NOKBD_environment_variable.diff
-joystick_crash.diff
 dont_propagate_lpthread.diff

-- 
Debian packaging of SDL 1.2