Author: fourmond
Date: 2008-04-07 20:01:43 +0000 (Mon, 07 Apr 2008)
New Revision: 6479
Modified:
packages/trunk/vegastrike/debian/changelog
packages/trunk/vegastrike/debian/patches/Makefile.diff
packages/trunk/vegastrike/debian/patches/alut_deprecation.diff
packages/trunk/vegastrike/debian/patches/config_path.diff
packages/trunk/vegastrike/debian/patches/joystick.h.diff
packages/trunk/vegastrike/debian/patches/launcher.diff
packages/trunk/vegastrike/debian/patches/posh.diff
packages/trunk/vegastrike/debian/patches/series
packages/trunk/vegastrike/debian/patches/vssetup.diff
Log:
[vegastrike] Cleaned up all patches. Now, the real fun will begin !
Modified: packages/trunk/vegastrike/debian/changelog
===================================================================
--- packages/trunk/vegastrike/debian/changelog 2008-04-07 16:43:40 UTC (rev
6478)
+++ packages/trunk/vegastrike/debian/changelog 2008-04-07 20:01:43 UTC (rev
6479)
@@ -24,8 +24,22 @@
* disabled gcc4.diff and gcc41.diff as vegastrike now compiles cleanly
without those
* Adapted joystick.h.diff
+ * Removed opengl.diff, apparently useless now
+ * Disable path_fixes, as the sound server does not appear to be used
+ anymore
+ * Updated posh.diff (no need for AMD64-specific fixes, they are already
+ in now)
+ * Dropped alut_deprecation.diff, as it does not seem to be necessary
+ anymore (and does not apply anyway).
+ * Updated and extended config_path.diff
+ * Updated launcher.diff (who now only care about location
+ of executable/data)
+ * Updating vssetup.diff (vssetup/src is now at setup/src)
+ * Dropped hat_switches.diff, included upstream
+ * Dropped configure.in_modifications, as upstream build system did
+ evolve quit a fair amount !
- -- Vincent Fourmond <[EMAIL PROTECTED]> Sat, 05 Apr 2008 15:55:38 +0200
+ -- Vincent Fourmond <[EMAIL PROTECTED]> Mon, 07 Apr 2008 22:00:27 +0200
vegastrike (0.4.3.debian1-1) unstable; urgency=low
Modified: packages/trunk/vegastrike/debian/patches/Makefile.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/Makefile.diff 2008-04-07
16:43:40 UTC (rev 6478)
+++ packages/trunk/vegastrike/debian/patches/Makefile.diff 2008-04-07
20:01:43 UTC (rev 6479)
@@ -1,4 +1,5 @@
Boost-python now links with -lboost_python rather than -lboost_python-st...
+
Index: vegastrike-0.5~svn12102/Makefile.am
===================================================================
--- vegastrike-0.5~svn12102.orig/Makefile.am 2008-04-05 00:41:44.000000000
+0200
Modified: packages/trunk/vegastrike/debian/patches/alut_deprecation.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/alut_deprecation.diff
2008-04-07 16:43:40 UTC (rev 6478)
+++ packages/trunk/vegastrike/debian/patches/alut_deprecation.diff
2008-04-07 20:01:43 UTC (rev 6479)
@@ -1,3 +1,5 @@
+I'm unsure about what I should do with this patch. The first hunk could still
+apply, however, I'm unsure it actually does...
--- ./src/aldrv/al_init.cpp~ 2006-05-13 21:50:52.000000000 +0900
+++ ./src/aldrv/al_init.cpp 2006-05-14 00:25:24.000000000 +0900
@@ -168,6 +168,7 @@
Modified: packages/trunk/vegastrike/debian/patches/config_path.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/config_path.diff 2008-04-07
16:43:40 UTC (rev 6478)
+++ packages/trunk/vegastrike/debian/patches/config_path.diff 2008-04-07
20:01:43 UTC (rev 6479)
@@ -1,5 +1,9 @@
---- ./src/networking/respawning_soundserver.cpp~ 2007-04-06
18:50:20.000000000 +0200
-+++ ./src/networking/respawning_soundserver.cpp 2007-04-06
18:50:40.000000000 +0200
+Directory for saves is .vegastrike-0.4.x
+
+Index: vegastrike-0.5~svn12102/src/networking/respawning_soundserver.cpp
+===================================================================
+--- vegastrike-0.5~svn12102.orig/src/networking/respawning_soundserver.cpp
2004-10-22 10:12:57.000000000 +0200
++++ vegastrike-0.5~svn12102/src/networking/respawning_soundserver.cpp
2008-04-07 21:36:26.000000000 +0200
@@ -157,8 +157,8 @@
chdir (pwent->pw_dir);
}
@@ -11,9 +15,11 @@
}else {
if (!paths.empty()) {
chdir (paths.back().c_str());
---- ./src/networking/soundserver.cpp~ 2007-04-06 18:50:20.000000000 +0200
-+++ ./src/networking/soundserver.cpp 2007-04-06 18:50:30.000000000 +0200
-@@ -97,7 +97,7 @@
+Index: vegastrike-0.5~svn12102/src/networking/soundserver.cpp
+===================================================================
+--- vegastrike-0.5~svn12102.orig/src/networking/soundserver.cpp
2006-10-09 16:45:17.000000000 +0200
++++ vegastrike-0.5~svn12102/src/networking/soundserver.cpp 2008-04-07
21:36:26.000000000 +0200
+@@ -113,7 +113,7 @@
#endif
exit(1);
}
@@ -22,9 +28,11 @@
/******************************************************************************/
/* The main function
*/
void changehome (bool to, bool linuxhome=true) {
---- ./src/vsfilesystem.cpp~ 2007-04-06 18:50:20.000000000 +0200
-+++ ./src/vsfilesystem.cpp 2007-04-06 18:50:44.000000000 +0200
-@@ -195,7 +195,7 @@
+Index: vegastrike-0.5~svn12102/src/vsfilesystem.cpp
+===================================================================
+--- vegastrike-0.5~svn12102.orig/src/vsfilesystem.cpp 2008-03-29
13:08:22.000000000 +0100
++++ vegastrike-0.5~svn12102/src/vsfilesystem.cpp 2008-04-07
21:36:26.000000000 +0200
+@@ -236,7 +236,7 @@
string config_file;
string weapon_list;
string universe_name;
@@ -33,14 +41,68 @@
vector<string> current_path;
vector<string> current_directory;
vector<string> current_subdirectory;
---- ./vssetup/src/c/setup.cpp~ 2007-04-06 18:47:11.000000000 +0200
-+++ ./vssetup/src/c/setup.cpp 2007-04-06 18:47:21.000000000 +0200
-@@ -57,7 +57,7 @@
+Index: vegastrike-0.5~svn12102/launcher/saveinterface.cpp
+===================================================================
+--- vegastrike-0.5~svn12102.orig/launcher/saveinterface.cpp 2008-04-07
21:36:32.000000000 +0200
++++ vegastrike-0.5~svn12102/launcher/saveinterface.cpp 2008-04-07
21:36:52.000000000 +0200
+@@ -39,7 +39,7 @@
+ "|RECOVER AUTOSAVE BUTTON|\nThis button allows a player to recover their
most recently\nplayed game into the selected save game upon next run.\nIf the
player quits or the player docks, and then dies,\nit will restore to the last
saved position.",
+ "|CHANGE SCENERIO BUTTON|\nThis allows you to select which mission
vegastrike\nwill start the next time you press one\nof the keys below it. Most
missions do not involve\nsave games and will ignore those options,\nhowever the
default, in the mission/exploration folder will\nindeed ustilize the save games
you specify.\nIf you ignore this option you begin in the
standard\ntrading/bounty hunting mission."
+ };
+-std::string HOMESUBDIR= ".vegastrike";
++std::string HOMESUBDIR= ".vegastrike-0.4.x";
+
+
+ char * prog_arg=0;
+Index: vegastrike-0.5~svn12102/setup/src/c/setup.cpp
+===================================================================
+--- vegastrike-0.5~svn12102.orig/setup/src/c/setup.cpp 2008-04-07
21:36:32.000000000 +0200
++++ vegastrike-0.5~svn12102/setup/src/c/setup.cpp 2008-04-07
21:36:58.000000000 +0200
+@@ -118,7 +118,7 @@
#ifndef _WIN32
struct passwd *pwent;
pwent = getpwuid (getuid());
- string HOMESUBDIR=".vegastrike";
+ string HOMESUBDIR=".vegastrike-0.4.x";
+
FILE *version=fopen("Version.txt","r");
if (!version)
- version=fopen("../Version.txt","r");
+Index: vegastrike-0.5~svn12102/src/networking/soundserver.mac.cpp
+===================================================================
+--- vegastrike-0.5~svn12102.orig/src/networking/soundserver.mac.cpp
2008-04-07 21:36:32.000000000 +0200
++++ vegastrike-0.5~svn12102/src/networking/soundserver.mac.cpp 2008-04-07
21:37:17.000000000 +0200
+@@ -318,7 +318,7 @@
+ chdir (pwent->pw_dir);
+ }
+ #endif
+- chdir (".vegastrike");
++ chdir (".vegastrike-0.4.x");
+ }else {
+ if (!paths.empty()) {
+ chdir (paths.back().c_str());
+Index: vegastrike-0.5~svn12102/src/networking/soundserver.mac.notworking.cpp
+===================================================================
+--- vegastrike-0.5~svn12102.orig/src/networking/soundserver.mac.notworking.cpp
2008-04-07 21:36:32.000000000 +0200
++++ vegastrike-0.5~svn12102/src/networking/soundserver.mac.notworking.cpp
2008-04-07 21:37:12.000000000 +0200
+@@ -203,7 +203,7 @@
+ chdir (pwent->pw_dir);
+ }
+ #endif
+- chdir (".vegastrike");
++ chdir (".vegastrike-0.4.x");
+ }else {
+ if (!paths.empty()) {
+ chdir (paths.back().c_str());
+Index: vegastrike-0.5~svn12102/src/networking/soundserver.segfault.cpp
+===================================================================
+--- vegastrike-0.5~svn12102.orig/src/networking/soundserver.segfault.cpp
2008-04-07 21:36:32.000000000 +0200
++++ vegastrike-0.5~svn12102/src/networking/soundserver.segfault.cpp
2008-04-07 21:37:06.000000000 +0200
+@@ -256,7 +256,7 @@
+ chdir (pwent->pw_dir);
+ }
+ #endif
+- chdir (".vegastrike");
++ chdir (".vegastrike-0.4.x");
+ }else {
+ if (!paths.empty()) {
+ chdir (paths.back().c_str());
Modified: packages/trunk/vegastrike/debian/patches/joystick.h.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/joystick.h.diff 2008-04-07
16:43:40 UTC (rev 6478)
+++ packages/trunk/vegastrike/debian/patches/joystick.h.diff 2008-04-07
20:01:43 UTC (rev 6479)
@@ -1,3 +1,5 @@
+Push further joystick limits for unusual joysticks.
+
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
Modified: packages/trunk/vegastrike/debian/patches/launcher.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/launcher.diff 2008-04-07
16:43:40 UTC (rev 6478)
+++ packages/trunk/vegastrike/debian/patches/launcher.diff 2008-04-07
20:01:43 UTC (rev 6479)
@@ -1,14 +1,9 @@
---- ./launcher/saveinterface.cpp~ 2007-06-30 23:57:26.000000000 -0400
-+++ ./launcher/saveinterface.cpp 2007-07-01 00:01:53.000000000 -0400
-@@ -39,7 +39,7 @@
- "|RECOVER AUTOSAVE BUTTON|\nThis button allows a player to recover their
most recently\nplayed game into the selected save game upon next run.\nIf the
player quits or the player docks, and then dies,\nit will restore to the last
saved position.",
- "|CHANGE SCENERIO BUTTON|\nThis allows you to select which mission
vegastrike\nwill start the next time you press one\nof the keys below it. Most
missions do not involve\nsave games and will ignore those options,\nhowever the
default, in the mission/exploration folder will\nindeed ustilize the save games
you specify.\nIf you ignore this option you begin in the
standard\ntrading/bounty hunting mission."
- };
--std::string HOMESUBDIR= ".vegastrike";
-+std::string HOMESUBDIR= ".vegastrike-0.4.x";
-
-
- char * prog_arg=0;
+Make the launcher aware of the real path of the executable/the data
+
+Index: vegastrike-0.5~svn12102/launcher/saveinterface.cpp
+===================================================================
+--- vegastrike-0.5~svn12102.orig/launcher/saveinterface.cpp 2008-04-07
21:41:43.000000000 +0200
++++ vegastrike-0.5~svn12102/launcher/saveinterface.cpp 2008-04-07
21:41:43.000000000 +0200
@@ -174,7 +174,7 @@
stupod *s= (stupod*)lpParameter;
progress=false;
Modified: packages/trunk/vegastrike/debian/patches/posh.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/posh.diff 2008-04-07 16:43:40 UTC
(rev 6478)
+++ packages/trunk/vegastrike/debian/patches/posh.diff 2008-04-07 20:01:43 UTC
(rev 6479)
@@ -1,14 +1,9 @@
---- ./src/posh.h~ 2003-10-23 13:51:58.000000000 -0400
-+++ ./src/posh.h 2004-11-22 17:40:07.000000000 -0500
-@@ -500,7 +500,7 @@
- ** Intel x86 and AMD x86-64
- ** ------------------------------------------------------------------
- */
--#if defined __X86__ || defined __i386__ || defined i386 || defined _M_IX86 ||
defined __386__ || defined FORCE_DOXYGEN
-+#if defined __X86__ || defined __i386__ || defined i386 || defined _M_IX86 ||
defined __386__ || defined __x86_64__ || defined FORCE_DOXYGEN
- # define POSH_CPU_X86 /**<if defined, target CPU is Intel 386+ compatible */
- # if defined __x86_64__ || defined FORCE_DOXYGEN
- # define POSH_CPU_X86_64 /**<if defined, target CPU is AMD x86-64 */
+Small patch for the s390 architecture.
+
+Index: vegastrike-0.5~svn12102/src/posh.h
+===================================================================
+--- vegastrike-0.5~svn12102.orig/src/posh.h 2005-05-03 00:03:59.000000000
+0200
++++ vegastrike-0.5~svn12102/src/posh.h 2008-04-07 21:16:51.000000000 +0200
@@ -536,6 +536,17 @@
# endif
#endif
Modified: packages/trunk/vegastrike/debian/patches/series
===================================================================
--- packages/trunk/vegastrike/debian/patches/series 2008-04-07 16:43:40 UTC
(rev 6478)
+++ packages/trunk/vegastrike/debian/patches/series 2008-04-07 20:01:43 UTC
(rev 6479)
@@ -6,12 +6,12 @@
# gcc4.diff
# gcc41.diff
joystick.h.diff
-opengl.diff
-path_fixes.diff
+# opengl.diff
+# path_fixes.diff
posh.diff
-alut_deprecation.diff
+# alut_deprecation.diff
config_path.diff
launcher.diff
vssetup.diff
-hat_switches.diff
-configure.in_modifications.diff
+# hat_switches.diff
+# configure.in_modifications.diff
Modified: packages/trunk/vegastrike/debian/patches/vssetup.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/vssetup.diff 2008-04-07
16:43:40 UTC (rev 6478)
+++ packages/trunk/vegastrike/debian/patches/vssetup.diff 2008-04-07
20:01:43 UTC (rev 6479)
@@ -1,5 +1,7 @@
---- ./vssetup/src/include/display_gtk.cpp~ 2004-10-24 22:27:13.000000000
-0400
-+++ ./vssetup/src/include/display_gtk.cpp 2005-02-20 16:43:43.000000000
-0500
+Index: vegastrike-0.5~svn12102/setup/src/include/display_gtk.cpp
+===================================================================
+--- vegastrike-0.5~svn12102.orig/setup/src/include/display_gtk.cpp
2004-10-25 04:27:13.000000000 +0200
++++ vegastrike-0.5~svn12102/setup/src/include/display_gtk.cpp 2008-04-07
21:57:10.000000000 +0200
@@ -58,7 +58,7 @@
#ifdef _WIN32
int
err=(int)ShellExecute(NULL,"open","documentation\\readme.txt","","",1);
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
