r6444 - in packages/trunk/vegastrike/debian: . patches

[Vincent Fourmond]

Author: fourmond
Date: 2008-04-05 13:59:04 +0000 (Sat, 05 Apr 2008)
New Revision: 6444

Modified:
   packages/trunk/vegastrike/debian/changelog
   packages/trunk/vegastrike/debian/patches/joystick.h.diff
   packages/trunk/vegastrike/debian/patches/series
Log:
[vegastrike] Some more patches adaptation/cleanup

Modified: packages/trunk/vegastrike/debian/changelog
===================================================================
--- packages/trunk/vegastrike/debian/changelog	2008-04-04 22:56:41 UTC (rev 6443)
+++ packages/trunk/vegastrike/debian/changelog	2008-04-05 13:59:04 UTC (rev 6444)
@@ -12,12 +12,20 @@
   * A get_upstream_svn script to retrieve an upstream SVN snapshot
   * Bumped to standards 3.7.3 with no changes.
   * New upstream release:
-    - drop makefiles.diff, structure has completely changed.
-    - Makefile.diff: apparently, now -lboost_python should be used instead
-      of -lboost_python-st
-    - disabled gtk2.diff, as there is nothing left to patch ;-)...
+    - apparently no int-vs-long problems anymore (Closes: #307992)
+    - it is now possible to quit with Escape (Closes: #297778)
+    - default fonts are now pretty readable IMHO (Closes: #453491)
+    - fixed licensing problems with the collider (Closes: #449475)
+  
+  * drop makefiles.diff, structure has completely changed.
+  * new Makefile.diff: apparently, now -lboost_python should be used 
+      instead of -lboost_python-st (Closes: #473300)
+  * disabled gtk2.diff, as there is nothing left to patch ;-)...
+  * disabled gcc4.diff and gcc41.diff as vegastrike now compiles cleanly 
+    without those
+  * Adapted joystick.h.diff
 
- -- Vincent Fourmond <fourmond at debian.org>  Sat, 05 Apr 2008 00:54:21 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Sat, 05 Apr 2008 15:55:38 +0200
 
 vegastrike (0.4.3.debian1-1) unstable; urgency=low
 

Modified: packages/trunk/vegastrike/debian/patches/joystick.h.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/joystick.h.diff	2008-04-04 22:56:41 UTC (rev 6443)
+++ packages/trunk/vegastrike/debian/patches/joystick.h.diff	2008-04-05 13:59:04 UTC (rev 6444)
@@ -1,29 +1,22 @@
---- ./src/in_joystick.h~     2004-10-19 12:51:53.000000000 +0900
-+++ ./src/in_joystick.h  2005-08-16 23:32:08.000000000 +0900
+Index: vegastrike-0.5~svn12102/src/in_joystick.h
+===================================================================
+--- vegastrike-0.5~svn12102.orig/src/in_joystick.h	2005-12-17 03:21:05.000000000 +0100
++++ vegastrike-0.5~svn12102/src/in_joystick.h	2008-04-05 15:55:21.000000000 +0200
 @@ -34,7 +34,7 @@
  //#include "glob.h"
  //#include "dbg.h"
  #include "in_kb.h"
--#define NUMJBUTTONS 16
+-#define NUMJBUTTONS 32
 +#define NUMJBUTTONS 48
-
+ 
  class JoyStick;
-
+ 
 @@ -47,7 +47,7 @@
-
- const int MAX_JOYSTICKS=11;
+ 
+ const int MAX_JOYSTICKS=16;
  const int MOUSE_JOYSTICK = MAX_JOYSTICKS-1;
--const int MAX_BUTTONS=32;
+-const int MAX_BUTTONS=48;
 +const int MAX_BUTTONS=64;
  const int MAX_DIGITAL_HATSWITCHES=4;
  const int MAX_DIGITAL_VALUES=9;
-
-@@ -77,7 +77,7 @@
-     int nr_of_axes,nr_of_buttons,nr_of_hats;
-     int hat_margin;
-     int player;
--#define MAX_AXES 8
-+#define MAX_AXES 12
-     bool axis_inverse[MAX_AXES];
-     int axis_axis[MAX_AXES];
-     float joy_axis[MAX_AXES];
+ 

Modified: packages/trunk/vegastrike/debian/patches/series
===================================================================
--- packages/trunk/vegastrike/debian/patches/series	2008-04-04 22:56:41 UTC (rev 6443)
+++ packages/trunk/vegastrike/debian/patches/series	2008-04-05 13:59:04 UTC (rev 6444)
@@ -2,8 +2,9 @@
 alut.diff
 # gtk2.diff
 char.diff
-gcc4.diff
-gcc41.diff
+# Compiles cleanly with gcc4 series:
+# gcc4.diff
+# gcc41.diff
 joystick.h.diff
 opengl.diff
 path_fixes.diff