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

Andres Mejia ceros-guest at alioth.debian.org
Sun May 11 02:56:12 UTC 2008


Author: ceros-guest
Date: 2008-05-11 02:56:12 +0000 (Sun, 11 May 2008)
New Revision: 6932

Modified:
   packages/trunk/vegastrike/debian/changelog
   packages/trunk/vegastrike/debian/patches/Makefile.diff
   packages/trunk/vegastrike/debian/patches/advertise-vsinstall.diff
   packages/trunk/vegastrike/debian/patches/alut.diff
   packages/trunk/vegastrike/debian/patches/char.diff
   packages/trunk/vegastrike/debian/patches/config_path.diff
   packages/trunk/vegastrike/debian/patches/fix-mips.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:
  * Fix patches.
  * Fix config_path patch for new config path.
  * Change vssetup patch to use x-terminal-emulator.


Modified: packages/trunk/vegastrike/debian/changelog
===================================================================
--- packages/trunk/vegastrike/debian/changelog	2008-05-11 02:55:08 UTC (rev 6931)
+++ packages/trunk/vegastrike/debian/changelog	2008-05-11 02:56:12 UTC (rev 6932)
@@ -6,6 +6,9 @@
   * Fixed up debian/rules.
   * Include use of nostrip option.
   * Don't use bootstrap patch, just call autotools from debian/rules.
+  * Fix patches.
+  * Fix config_path patch for new config path.
+  * Change vssetup patch to use x-terminal-emulator.
 
  -- Andres Mejia <mcitadel at gmail.com>  Thu, 01 May 2008 01:56:49 -0400
 

Modified: packages/trunk/vegastrike/debian/patches/Makefile.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/Makefile.diff	2008-05-11 02:55:08 UTC (rev 6931)
+++ packages/trunk/vegastrike/debian/patches/Makefile.diff	2008-05-11 02:56:12 UTC (rev 6932)
@@ -7,8 +7,8 @@
 
 Index: vegastrike-0.5~svn12126/Makefile.am
 ===================================================================
---- vegastrike-0.5~svn12126.orig/Makefile.am	2008-03-26 03:14:32.000000000 +0100
-+++ vegastrike-0.5~svn12126/Makefile.am	2008-04-12 22:08:36.000000000 +0200
+--- Makefile.am~	2008-03-26 03:14:32.000000000 +0100
++++ Makefile.am	2008-04-12 22:08:36.000000000 +0200
 @@ -480,27 +480,22 @@
    GTKUTILS_PROG=
  endif

Modified: packages/trunk/vegastrike/debian/patches/advertise-vsinstall.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/advertise-vsinstall.diff	2008-05-11 02:55:08 UTC (rev 6931)
+++ packages/trunk/vegastrike/debian/patches/advertise-vsinstall.diff	2008-05-11 02:56:12 UTC (rev 6932)
@@ -1,7 +1,7 @@
 Index: vegastrike-0.5~svn12126/src/vsfilesystem.cpp
 ===================================================================
---- vegastrike-0.5~svn12126.orig/src/vsfilesystem.cpp	2008-04-12 20:41:27.000000000 +0200
-+++ vegastrike-0.5~svn12126/src/vsfilesystem.cpp	2008-04-12 20:41:56.000000000 +0200
+--- src/vsfilesystem.cpp~	2008-04-12 20:41:27.000000000 +0200
++++ src/vsfilesystem.cpp	2008-04-12 20:41:56.000000000 +0200
 @@ -666,6 +666,7 @@
  				{
  					cerr<<"CONFIGFILE - No config found in data dir : "<<(datadir+"/"+config_file)<<endl;

Modified: packages/trunk/vegastrike/debian/patches/alut.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/alut.diff	2008-05-11 02:55:08 UTC (rev 6931)
+++ packages/trunk/vegastrike/debian/patches/alut.diff	2008-05-11 02:56:12 UTC (rev 6932)
@@ -1,7 +1,7 @@
 Index: vegastrike-0.5~svn12102/src/aldrv/al_init.cpp
 ===================================================================
---- vegastrike-0.5~svn12102.orig/src/aldrv/al_init.cpp	2007-09-02 05:39:34.000000000 +0200
-+++ vegastrike-0.5~svn12102/src/aldrv/al_init.cpp	2008-04-05 00:52:42.000000000 +0200
+--- src/aldrv/al_init.cpp~	2007-09-02 05:39:34.000000000 +0200
++++ src/aldrv/al_init.cpp	2008-04-05 00:52:42.000000000 +0200
 @@ -120,7 +120,7 @@
  static ALCdevice *dev=NULL;
  

Modified: packages/trunk/vegastrike/debian/patches/char.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/char.diff	2008-05-11 02:55:08 UTC (rev 6931)
+++ packages/trunk/vegastrike/debian/patches/char.diff	2008-05-11 02:56:12 UTC (rev 6932)
@@ -1,7 +1,7 @@
 Index: vegastrike-0.5~svn12102/src/xml_serializer.h
 ===================================================================
---- vegastrike-0.5~svn12102.orig/src/xml_serializer.h	2004-04-26 04:24:52.000000000 +0200
-+++ vegastrike-0.5~svn12102/src/xml_serializer.h	2008-04-05 00:55:33.000000000 +0200
+--- src/xml_serializer.h~	2004-04-26 04:24:52.000000000 +0200
++++ src/xml_serializer.h	2008-04-05 00:55:33.000000000 +0200
 @@ -12,7 +12,7 @@
  	unsigned int *ui;
      float *f;

Modified: packages/trunk/vegastrike/debian/patches/config_path.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/config_path.diff	2008-05-11 02:55:08 UTC (rev 6931)
+++ packages/trunk/vegastrike/debian/patches/config_path.diff	2008-05-11 02:56:12 UTC (rev 6932)
@@ -1,108 +1,108 @@
-Directory for saves is .vegastrike-0.4.x
+Directory for saves is .vegastrike-0.5.0
 
-Index: vegastrike-0.5~svn12102/src/networking/respawning_soundserver.cpp
+Index: 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
+--- src/networking/respawning_soundserver.cpp~	2004-10-22 10:12:57.000000000 +0200
++++ src/networking/respawning_soundserver.cpp	2008-04-07 21:36:26.000000000 +0200
 @@ -157,8 +157,8 @@
        chdir (pwent->pw_dir);
      }
  #endif
 -    mkdir (".vegastrike",0xffffffff);
 -    chdir (".vegastrike");
-+    mkdir (".vegastrike-0.4.x",0xffffffff);
-+    chdir (".vegastrike-0.4.x");
++    mkdir (".vegastrike-0.5.0",0xffffffff);
++    chdir (".vegastrike-0.5.0");
    }else {
      if (!paths.empty()) {
        chdir (paths.back().c_str());
-Index: vegastrike-0.5~svn12102/src/networking/soundserver.cpp
+Index: 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
+--- src/networking/soundserver.cpp~	2006-10-09 16:45:17.000000000 +0200
++++ src/networking/soundserver.cpp	2008-04-07 21:36:26.000000000 +0200
 @@ -113,7 +113,7 @@
  #endif
  	exit(1);
  }
 -std::string HOMESUBDIR=".vegastrike";
-+std::string HOMESUBDIR=".vegastrike-0.4.x";
++std::string HOMESUBDIR=".vegastrike-0.5.0";
  /******************************************************************************/
  /* The main function                                                          */
  void changehome (bool to, bool linuxhome=true) {
-Index: vegastrike-0.5~svn12102/src/vsfilesystem.cpp
+Index: 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
+--- src/vsfilesystem.cpp~	2008-03-29 13:08:22.000000000 +0100
++++ src/vsfilesystem.cpp	2008-04-07 21:36:26.000000000 +0200
 @@ -236,7 +236,7 @@
  	string config_file;
  	string weapon_list;
  	string universe_name;
 -	string HOMESUBDIR(".vegastrike");
-+	string HOMESUBDIR(".vegastrike-0.4.x");
++	string HOMESUBDIR(".vegastrike-0.5.0");
  	vector<string>		current_path;
  	vector<string>		current_directory;
  	vector<string>		current_subdirectory;
-Index: vegastrike-0.5~svn12102/launcher/saveinterface.cpp
+Index: 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
+--- launcher/saveinterface.cpp~	2008-04-07 21:36:32.000000000 +0200
++++ 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";
++std::string HOMESUBDIR= ".vegastrike-0.5.0";
  
  
  char * prog_arg=0;
-Index: vegastrike-0.5~svn12102/setup/src/c/setup.cpp
+Index: 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
+--- setup/src/c/setup.cpp~	2008-04-07 21:36:32.000000000 +0200
++++ 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";
++        string HOMESUBDIR=".vegastrike-0.5.0";
  	
  	FILE *version=fopen("Version.txt","r");
  	if (!version)
-Index: vegastrike-0.5~svn12102/src/networking/soundserver.mac.cpp
+Index: 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
+--- src/networking/soundserver.mac.cpp~	2008-04-07 21:36:32.000000000 +0200
++++ 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");
++        chdir (".vegastrike-0.5.0");
      }else {
          if (!paths.empty()) {
              chdir (paths.back().c_str());
-Index: vegastrike-0.5~svn12102/src/networking/soundserver.mac.notworking.cpp
+Index: 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
+--- src/networking/soundserver.mac.notworking.cpp~	2008-04-07 21:36:32.000000000 +0200
++++ 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");
++	chdir (".vegastrike-0.5.0");
    }else {
  	  if (!paths.empty()) {
  		chdir (paths.back().c_str());
-Index: vegastrike-0.5~svn12102/src/networking/soundserver.segfault.cpp
+Index: 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
+--- src/networking/soundserver.segfault.cpp~	2008-04-07 21:36:32.000000000 +0200
++++ 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");
++	chdir (".vegastrike-0.5.0");
    }else {
  	  if (!paths.empty()) {
  		chdir (paths.back().c_str());

Modified: packages/trunk/vegastrike/debian/patches/fix-mips.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/fix-mips.diff	2008-05-11 02:55:08 UTC (rev 6931)
+++ packages/trunk/vegastrike/debian/patches/fix-mips.diff	2008-05-11 02:56:12 UTC (rev 6932)
@@ -1,7 +1,7 @@
 Index: vegastrike-0.5~svn12126/src/gldrv/gl_texture.cpp
 ===================================================================
---- vegastrike-0.5~svn12126.orig/src/gldrv/gl_texture.cpp	2008-04-15 01:06:12.000000000 +0200
-+++ vegastrike-0.5~svn12126/src/gldrv/gl_texture.cpp	2008-04-15 01:06:26.000000000 +0200
+--- src/gldrv/gl_texture.cpp~	2008-04-15 01:06:12.000000000 +0200
++++ src/gldrv/gl_texture.cpp	2008-04-15 01:06:26.000000000 +0200
 @@ -694,9 +694,9 @@
  	int offset1 = 2;
  	char mipmapbuf[3] = {buffer[0],buffer[1],'\0'};

Modified: packages/trunk/vegastrike/debian/patches/joystick.h.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/joystick.h.diff	2008-05-11 02:55:08 UTC (rev 6931)
+++ packages/trunk/vegastrike/debian/patches/joystick.h.diff	2008-05-11 02:56:12 UTC (rev 6932)
@@ -2,8 +2,8 @@
 
 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
+--- src/in_joystick.h~	2005-12-17 03:21:05.000000000 +0100
++++ src/in_joystick.h	2008-04-05 15:55:21.000000000 +0200
 @@ -34,7 +34,7 @@
  //#include "glob.h"
  //#include "dbg.h"

Modified: packages/trunk/vegastrike/debian/patches/launcher.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/launcher.diff	2008-05-11 02:55:08 UTC (rev 6931)
+++ packages/trunk/vegastrike/debian/patches/launcher.diff	2008-05-11 02:56:12 UTC (rev 6932)
@@ -2,8 +2,8 @@
 
 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
+--- launcher/saveinterface.cpp~	2008-04-07 21:41:43.000000000 +0200
++++ 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-05-11 02:55:08 UTC (rev 6931)
+++ packages/trunk/vegastrike/debian/patches/posh.diff	2008-05-11 02:56:12 UTC (rev 6932)
@@ -2,8 +2,8 @@
 
 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
+--- src/posh.h~	2005-05-03 00:03:59.000000000 +0200
++++ 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-05-11 02:55:08 UTC (rev 6931)
+++ packages/trunk/vegastrike/debian/patches/series	2008-05-11 02:56:12 UTC (rev 6932)
@@ -1,17 +1,17 @@
-fix-mips.diff
-advertise-vsinstall.diff
+fix-mips.diff -p0
+advertise-vsinstall.diff -p0
 # bootstrap-fail-on-error.diff
-Makefile.diff
-alut.diff
+Makefile.diff -p0
+alut.diff -p0
 # gtk2.diff
-char.diff
+char.diff -p0
 # Compiles cleanly with gcc4 series:
 # gcc4.diff
 # gcc41.diff
-joystick.h.diff
+joystick.h.diff -p0
 # opengl.diff
 # path_fixes.diff
-posh.diff
+posh.diff -p0
 # alut_deprecation.diff
 config_path.diff
 launcher.diff

Modified: packages/trunk/vegastrike/debian/patches/vssetup.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/vssetup.diff	2008-05-11 02:55:08 UTC (rev 6931)
+++ packages/trunk/vegastrike/debian/patches/vssetup.diff	2008-05-11 02:56:12 UTC (rev 6932)
@@ -1,4 +1,4 @@
-Index: vegastrike-0.5~svn12102/setup/src/include/display_gtk.cpp
+Use x-terminal-emulator
 ===================================================================
 --- 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
@@ -7,7 +7,7 @@
  	int err=(int)ShellExecute(NULL,"open","documentation\\readme.txt","","",1);
  #else
 -	execlp("less", "less","readme.txt", NULL); //Will this work in Linux?
-+	execlp("xterm", "xterm","-e","less","/usr/share/games/vegastrike/README", NULL); //Will this work in Linux?
++	execlp("x-terminal-emulator", "xterminal-emulator","-e","less","/usr/share/games/vegastrike/readme.txt", NULL); //Will this work in Linux?
  #endif
  	gtk_exit(exitval);
  }




More information about the Pkg-games-commits mailing list