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

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit 2d333d1d22de7e5b4e367f0fc8e6c209e6b907b9
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Tue Apr 10 21:53:14 2012 +0100

    Refreshing patch

diff --git a/debian/patches/fix_build_joystick_freebsd.diff b/debian/patches/fix_build_joystick_freebsd.diff
index f86c443..ceecaaf 100644
--- a/debian/patches/fix_build_joystick_freebsd.diff
+++ b/debian/patches/fix_build_joystick_freebsd.diff
@@ -6,9 +6,8 @@ Description: FreeBSD compile fix.
 Origin: upstream, http://hg.libsdl.org/SDL/rev/62ff1c0a103f
 Author: Robert Millan <rmh at debian.org>
 
-diff -r 8e98c714bb2a -r 62ff1c0a103f src/joystick/bsd/SDL_sysjoystick.c
---- a/src/joystick/bsd/SDL_sysjoystick.c	Sat Feb 04 18:12:20 2012 -0500
-+++ b/src/joystick/bsd/SDL_sysjoystick.c	Wed Feb 15 21:06:08 2012 -0500
+--- a/src/joystick/bsd/SDL_sysjoystick.c
++++ b/src/joystick/bsd/SDL_sysjoystick.c
 @@ -148,7 +148,7 @@
  static int	report_alloc(struct report *, struct report_desc *, int);
  static void	report_free(struct report *);

-- 
Debian packaging of SDL 1.2