[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 0277dde2eb44e42269c4cd7888aa654fcb1d3fc3
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sun Jan 22 19:47:39 2012 +0000

    Document remaining patches, refresh them

diff --git a/debian/patches/check_SDL_NOKBD_environment_variable.diff b/debian/patches/check_SDL_NOKBD_environment_variable.diff
index 41888f5..6ad2e37 100644
--- a/debian/patches/check_SDL_NOKBD_environment_variable.diff
+++ b/debian/patches/check_SDL_NOKBD_environment_variable.diff
@@ -1,7 +1,15 @@
- 1.2.13-4+nmu2: Closes: #438915
----
- src/video/fbcon/SDL_fbvideo.c |   20 ++++++++++++--------
- 1 file changed, 12 insertions(+), 8 deletions(-)
+Description: disable keyboard and mouse in fbcon
+ Introduced in 1.2.13-5 (Thu, 01 Oct 2009 16:45:49 -0400).
+ .
+ Upstream will not include it:
+   Sam Lantinga 2012-01-22 10:50:19 PST
+ .
+   I'm going to pass on this patch, but feel free to continue including it with
+   Debian.
+Author: Bernhard Kauer <kauer at os.inf.tu-dresden.de>
+Last-Update: 2012-01-22
+Bug-Debian: http://bugs.debian.org/438915
+Forwarded: http://bugzilla.libsdl.org/show_bug.cgi?id=1391
 
 Index: SDL-1.2.14/src/video/fbcon/SDL_fbvideo.c
 ===================================================================
diff --git a/debian/patches/dont_propagate_lpthread.diff b/debian/patches/dont_propagate_lpthread.diff
index 052e953..0aeaca2 100644
--- a/debian/patches/dont_propagate_lpthread.diff
+++ b/debian/patches/dont_propagate_lpthread.diff
@@ -1,7 +1,19 @@
----
- sdl-config.in |    2 +-
- sdl.pc.in     |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+Description: Do not propagate -lpthread to sdl-config --libs
+ Introduced in 1.2.11-1 (Thu, 20 Jul 2006 14:17:18 +0200).
+ .
+ Upstream will not apply it at the moment:
+   Sam Lantinga 2012-01-22 10:54:21 PST
+ .
+   At some point it was required that multi-threaded programs using pthreads on
+   Linux link directly to the pthread library.  I don't remember all the details,
+   but it had something to do with initializing C runtime variables correctly.
+ .
+   I'm sure it's not an issue anymore, but I'd rather not apply this patch in 1.2.
+   I'll go ahead and make this change in 1.3 though.
+Author: Sam Hocevar <sam+deb at zoy.org>
+Last-Update: 2012-01-22
+Bug-Debian: http://bugs.debian.org/375822
+Forwarded: http://bugzilla.libsdl.org/show_bug.cgi?id=1392
 
 Index: SDL-1.2.14/sdl.pc.in
 ===================================================================
diff --git a/debian/patches/x11_keytounicode.diff b/debian/patches/x11_keytounicode.diff
index 53376a7..47ca901 100644
--- a/debian/patches/x11_keytounicode.diff
+++ b/debian/patches/x11_keytounicode.diff
@@ -1,12 +1,21 @@
----
- src/video/x11/SDL_x11events.c |    9 +++++++++
- 1 file changed, 9 insertions(+)
+Description: Export X11_KeyToUnicode() to legacy applications, but warn about such usage to stderr
+ Introduced in 1.2.11-3 (Sun, 13 Aug 2006 19:03:51 +0200).
+ .
+ Upstream accepted it:
+   Sam Lantinga 2012-01-22 10:48:43 PST
+ .
+   At this point it's fine to leave it as an exported function, but not in the
+   headers.
+   http://hg.libsdl.org/SDL/rev/900a0fae90ca
+Author: Sam Hocevar <sam+deb at zoy.org>
+Last-Update: 2012-01-22
+Bug-Debian: http://bugs.debian.org/376560
+Forwarded: http://bugzilla.libsdl.org/show_bug.cgi?id=1390
+Applied-Upstream: http://hg.libsdl.org/SDL/rev/900a0fae90ca
 
-Index: SDL-1.2.14/src/video/x11/SDL_x11events.c
-===================================================================
---- SDL-1.2.14.orig/src/video/x11/SDL_x11events.c	2009-10-12 19:07:15.000000000 -0400
-+++ SDL-1.2.14/src/video/x11/SDL_x11events.c	2009-11-28 09:19:15.000000000 -0500
-@@ -1228,8 +1228,11 @@
+--- a/src/video/x11/SDL_x11events.c
++++ b/src/video/x11/SDL_x11events.c
+@@ -1246,8 +1246,11 @@
   * sequences (dead accents, compose key sequences) will not work since the
   * state has been irrevocably lost.
   */
@@ -18,7 +27,7 @@ Index: SDL-1.2.14/src/video/x11/SDL_x11events.c
  	struct SDL_VideoDevice *this = current_video;
  	char keybuf[32];
  	int i;
-@@ -1237,6 +1240,12 @@
+@@ -1255,6 +1258,12 @@
  	XKeyEvent xkey;
  	Uint16 unicode;
  

-- 
Debian packaging of SDL 1.2