r10094 - in packages/trunk/asylum/debian: . patches

[Peter De Wachter]

Author: pdewacht-guest
Date: 2009-07-28 20:33:38 +0000 (Tue, 28 Jul 2009)
New Revision: 10094

Added:
   packages/trunk/asylum/debian/patches/numeric-keypad.patch
Modified:
   packages/trunk/asylum/debian/changelog
   packages/trunk/asylum/debian/control
   packages/trunk/asylum/debian/patches/opengl-endianness.patch
   packages/trunk/asylum/debian/patches/series
Log:
Asylum: Fixed numeric keypad input (#538772). Prepared for upload.


Modified: packages/trunk/asylum/debian/changelog
===================================================================
--- packages/trunk/asylum/debian/changelog	2009-07-28 19:04:46 UTC (rev 10093)
+++ packages/trunk/asylum/debian/changelog	2009-07-28 20:33:38 UTC (rev 10094)
@@ -1,3 +1,10 @@
+asylum (0.3.0-4) unstable; urgency=low
+
+  * Recognize input from the numeric keypad. (Closes: #538772)
+  * Bumped Standards-Version to 3.8.2. No changes needed.
+
+ -- Peter De Wachter <pdewacht at gmail.com>  Tue, 28 Jul 2009 22:09:01 +0200
+
 asylum (0.3.0-3) unstable; urgency=low
 
   * Fixed endianness problems in the OpenGL rendering code. (Closes: #527568)

Modified: packages/trunk/asylum/debian/control
===================================================================
--- packages/trunk/asylum/debian/control	2009-07-28 19:04:46 UTC (rev 10093)
+++ packages/trunk/asylum/debian/control	2009-07-28 20:33:38 UTC (rev 10094)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 7), quilt,
  libsdl1.2-dev, libsdl-mixer1.2-dev,
  libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Homepage: http://sdl-asylum.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/asylum/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-games/packages/trunk/asylum/

Added: packages/trunk/asylum/debian/patches/numeric-keypad.patch
===================================================================
--- packages/trunk/asylum/debian/patches/numeric-keypad.patch	                        (rev 0)
+++ packages/trunk/asylum/debian/patches/numeric-keypad.patch	2009-07-28 20:33:38 UTC (rev 10094)
@@ -0,0 +1,20 @@
+Allows input using the numeric keypad. Debian bug #538772.
+
+--- a/menus.c
++++ b/menus.c
+@@ -497,7 +497,14 @@
+             return -1;
+         }
+         if (r1 == 0) continue;
+-        if (osbyte_81(options.firekey) == 0xff) optfire: return 0;r1 -= 48; // '1' key returns value 49
++        if (osbyte_81(options.firekey) == 0xff)
++            return 0;
++        if (r1 >= SDLK_0 && r1 <= SDLK_9)
++            r1 -= SDLK_0;
++        else if (r1 >= SDLK_KP0 && r1 <= SDLK_KP9)
++            r1 -= SDLK_KP0;
++        else
++            continue;
+     }
+     while (!((r1 >= 0) && (r1 <= maxopt)));
+    optexit:

Modified: packages/trunk/asylum/debian/patches/opengl-endianness.patch
===================================================================
--- packages/trunk/asylum/debian/patches/opengl-endianness.patch	2009-07-28 19:04:46 UTC (rev 10093)
+++ packages/trunk/asylum/debian/patches/opengl-endianness.patch	2009-07-28 20:33:38 UTC (rev 10094)
@@ -1,3 +1,5 @@
+Fixes OpenGL rendering on big-endian machines. Debian bug #527568.
+
 --- a/vdu.c
 +++ b/vdu.c
 @@ -666,11 +666,11 @@

Modified: packages/trunk/asylum/debian/patches/series
===================================================================
--- packages/trunk/asylum/debian/patches/series	2009-07-28 19:04:46 UTC (rev 10093)
+++ packages/trunk/asylum/debian/patches/series	2009-07-28 20:33:38 UTC (rev 10094)
@@ -1 +1,2 @@
 opengl-endianness.patch
+numeric-keypad.patch