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

Fri Jul 6 05:27:26 UTC 2007

Author: ceros-guest
Date: 2007-07-06 05:27:26 +0000 (Fri, 06 Jul 2007)
New Revision: 3253

Added:
   packages/trunk/vegastrike/debian/vegastrike-setup.desktop
Modified:
   packages/trunk/vegastrike/debian/README.Debian
   packages/trunk/vegastrike/debian/changelog
   packages/trunk/vegastrike/debian/menu
   packages/trunk/vegastrike/debian/patches/vssetup.dpatch
   packages/trunk/vegastrike/debian/rules
   packages/trunk/vegastrike/debian/vegastrike.6
   packages/trunk/vegastrike/debian/vegastrike.desktop
Log:
Added desktop file for vegastrike --setup. Changed vssetup binary to display README using xterm.

Modified: packages/trunk/vegastrike/debian/README.Debian
===================================================================

--- packages/trunk/vegastrike/debian/README.Debian	2007-07-06 02:00:03 UTC (rev 3252)
+++ packages/trunk/vegastrike/debian/README.Debian	2007-07-06 05:27:26 UTC (rev 3253)
@@ -32,3 +32,6 @@
 optimal for most machines. A value of 1024 or above will heavily tax any
 computer's memory, sometimes to the point where the vegastrike process is
 killed automatically.
+
+NOTE: If there is no vegastrike.config file under ~/.vegastrike-0.4.x, you
+will need to run the command 'vsinstall' from the command line first.

Modified: packages/trunk/vegastrike/debian/changelog
===================================================================
--- packages/trunk/vegastrike/debian/changelog	2007-07-06 02:00:03 UTC (rev 3252)
+++ packages/trunk/vegastrike/debian/changelog	2007-07-06 05:27:26 UTC (rev 3253)
@@ -36,6 +36,9 @@
     + This bug cannot be reproduced, may have been fixed already.
     + I've have crashed during all attempts to fly through objects.
   * Changed build dependency to freeglut3-dev (Closes: 394504).
+  * Added .desktop file for 'vsinstall --setup'.
+  * Changed vegastrike.desktop exec parameter to vsinstall.
+  * vssetup GUI will now display xterm for viewing README.
 
   [ Emmet Hikory ]
   * Install .desktop file to /usr/share/applications/

Modified: packages/trunk/vegastrike/debian/menu
===================================================================
--- packages/trunk/vegastrike/debian/menu	2007-07-06 02:00:03 UTC (rev 3252)
+++ packages/trunk/vegastrike/debian/menu	2007-07-06 05:27:26 UTC (rev 3253)
@@ -1,3 +1,7 @@
 ?package(vegastrike):needs="X11" section="Games/Strategy"\
-  title="vegastrike" command="/usr/games/vegastrike"\
+  title="vegastrike" command="/usr/games/vsinstall >/dev/null 2>&1"\
   icon="/usr/share/pixmaps/vegastrike.xpm"
+
+?package(vegastrike):needs="X11" section="Games/Strategy"\
+  title="vegastrike" command="/usr/games/vsinstall --setup >/dev/null 2>&1"\
+  icon="/usr/share/pixmaps/vegastrike.xpm"

Modified: packages/trunk/vegastrike/debian/patches/vssetup.dpatch
===================================================================
--- packages/trunk/vegastrike/debian/patches/vssetup.dpatch	2007-07-06 02:00:03 UTC (rev 3252)
+++ packages/trunk/vegastrike/debian/patches/vssetup.dpatch	2007-07-06 05:27:26 UTC (rev 3253)
@@ -32,7 +32,7 @@
  	int err=(int)ShellExecute(NULL,"open","documentation\\readme.txt","","",1);
  #else
 -	execlp("less", "less","readme.txt", NULL); //Will this work in Linux?
-+	execlp("less", "less","/usr/share/games/vegastrike/README", NULL); //Will this work in Linux?
++	execlp("xterm", "xterm","-e","less","/usr/share/games/vegastrike/README", NULL); //Will this work in Linux?
  #endif
  	gtk_exit(exitval);
  }

Modified: packages/trunk/vegastrike/debian/rules
===================================================================
--- packages/trunk/vegastrike/debian/rules	2007-07-06 02:00:03 UTC (rev 3252)
+++ packages/trunk/vegastrike/debian/rules	2007-07-06 05:27:26 UTC (rev 3253)
@@ -84,6 +84,7 @@
 	dh_clean -k
 	dh_installdirs
 	dh_install debian/vegastrike.desktop usr/share/applications
+	dh_install debian/vegastrike-setup.desktop usr/share/applications
 	dh_install debian/vegastrike.xpm usr/share/pixmaps
 	cd vegastrike && \
 	$(MAKE) install INSTALL="$(INSTALL_PROGRAM)" \

Added: packages/trunk/vegastrike/debian/vegastrike-setup.desktop
===================================================================
--- packages/trunk/vegastrike/debian/vegastrike-setup.desktop	                        (rev 0)
+++ packages/trunk/vegastrike/debian/vegastrike-setup.desktop	2007-07-06 05:27:26 UTC (rev 3253)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Vega Strike Setup
+Comment=Setup GUI for Vega Strike
+Exec=vsinstall --setup >/dev/null 2>&1
+Icon=vegastrike
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=Application;Game;StrategyGame;

Modified: packages/trunk/vegastrike/debian/vegastrike.6
===================================================================
--- packages/trunk/vegastrike/debian/vegastrike.6	2007-07-06 02:00:03 UTC (rev 3252)
+++ packages/trunk/vegastrike/debian/vegastrike.6	2007-07-06 05:27:26 UTC (rev 3253)
@@ -37,9 +37,9 @@
 .PP
 .B vssetup
 .I binary
-This binary's sole purpose is to be called by
+This binary is called by
 .B vsinstall
-to do the initial setup of vegastrike.
+to do the initial setup of vegastrike. It can also be used again by running the command while in the directory ~/.vegastrike-0.4.x.
 .PP
 .B vssoundserver
 .I binary
@@ -50,21 +50,6 @@
 .I binary
 Begins Vega Strike with the selected XML mission file (full path necessary) and the save game appearing as the only text in ~/.vegastrike-0.4.x/save.txt
 .PP
-.SH REQUIREMENTS AND INSTALLATION
-Run the 
-.B vsinstall
-program to set up your specific config options.
-.PP
-Read the readme.txt file in
-.I "/usr/share/doc/vegastrike"
-or in color at
-.I http://vegastrike.sourceforge.net/player_tutorial/
-to learn the keybindings and walk through a tutorial.
-.br
-.br
-More information can be obtained from the Vega Strike website at
-.I http://vegastrike.sourceforge.net/
-.PP
 .SH OPTIONS
 .TP
 .I -d/my/data/dir
@@ -89,6 +74,11 @@
 (~/.vegastrike-0.4.x/vegastrike.config)
 ), which is modified by
 .B vsinstall
+using the 
+.B \-\-setup
+or
+.B setup
+switch.
 .br
 .br
 A simple illustration of how to adjust vegastrike.config and the associated keybindings and options is in the readme.txt file in

Modified: packages/trunk/vegastrike/debian/vegastrike.desktop
===================================================================
--- packages/trunk/vegastrike/debian/vegastrike.desktop	2007-07-06 02:00:03 UTC (rev 3252)
+++ packages/trunk/vegastrike/debian/vegastrike.desktop	2007-07-06 05:27:26 UTC (rev 3253)
@@ -3,9 +3,9 @@
 Name=Vega Strike
 Comment=Play a 3D space combat and simulation
 Comment[es]=Juegues un combate y una simulación del espacio 3D 
-Exec=vegastrike
+Exec=vsinstall >/dev/null 2>&1
 Icon=vegastrike
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=Application;Game;
+Categories=Application;Game;StrategyGame;


