r5372 - in packages/trunk/alien-arena/debian: . patches

Andres Mejia ceros-guest at alioth.debian.org
Tue Jan 15 18:16:56 UTC 2008


Author: ceros-guest
Date: 2008-01-15 18:16:56 +0000 (Tue, 15 Jan 2008)
New Revision: 5372

Added:
   packages/trunk/alien-arena/debian/patches/fix-CVE-2007-4754-CVE-2007-4755.patch
   packages/trunk/alien-arena/debian/patches/home_as_game_dir.patch
   packages/trunk/alien-arena/debian/patches/kill-runaway-crded_tool_debianization.patch
   packages/trunk/alien-arena/debian/patches/launch-server_tool_debianization.patch
   packages/trunk/alien-arena/debian/patches/makefile_modifications.patch
   packages/trunk/alien-arena/debian/patches/rcon_tool_debianization.patch
   packages/trunk/alien-arena/debian/patches/ruby_browser.patch
   packages/trunk/alien-arena/debian/patches/series
Removed:
   packages/trunk/alien-arena/debian/patches/00list
   packages/trunk/alien-arena/debian/patches/fix-CVE-2007-4754-CVE-2007-4755.dpatch
   packages/trunk/alien-arena/debian/patches/home_as_game_dir.dpatch
   packages/trunk/alien-arena/debian/patches/kill-runaway-crded_tool_debianization.dpatch
   packages/trunk/alien-arena/debian/patches/launch-server_tool_debianization.dpatch
   packages/trunk/alien-arena/debian/patches/makefile_modifications.dpatch
   packages/trunk/alien-arena/debian/patches/rcon_tool_debianization.dpatch
   packages/trunk/alien-arena/debian/patches/ruby_browser.dpatch
Modified:
   packages/trunk/alien-arena/debian/changelog
   packages/trunk/alien-arena/debian/control
Log:
Begin moving to quilt.

Modified: packages/trunk/alien-arena/debian/changelog
===================================================================
--- packages/trunk/alien-arena/debian/changelog	2008-01-15 18:09:41 UTC (rev 5371)
+++ packages/trunk/alien-arena/debian/changelog	2008-01-15 18:16:56 UTC (rev 5372)
@@ -19,6 +19,7 @@
   * Removing watchfile as there is no suitable URL to check with uscan.
   * Moved debian/scripts/alien-arena-tarball.sh to
     debian/alien-arena-get-orig-source.
+  * Modified alien-arena-data-get-orig-source to make it easier to maintain.
 
  -- Andres Mejia <mcitadel at gmail.com>  Mon, 14 Jan 2008 18:29:39 -0500
 

Modified: packages/trunk/alien-arena/debian/control
===================================================================
--- packages/trunk/alien-arena/debian/control	2008-01-15 18:09:41 UTC (rev 5371)
+++ packages/trunk/alien-arena/debian/control	2008-01-15 18:16:56 UTC (rev 5372)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Andres Mejia <mcitadel at gmail.com>
-Build-Depends: debhelper (>= 5), dpatch, tofrodos, libsdl1.2-dev | libsdl-dev, libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev, libjpeg62-dev | libjpeg-dev, libpng12-dev | libpng-dev, libxxf86vm-dev, libxxf86dga-dev, libxext-dev, libx11-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev
+Build-Depends: debhelper (>= 5), quilt, tofrodos, libsdl1.2-dev | libsdl-dev, libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev, libjpeg62-dev | libjpeg-dev, libpng12-dev | libpng-dev, libxxf86vm-dev, libxxf86dga-dev, libxext-dev, libx11-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev
 Standards-Version: 3.7.3
 Homepage: http://red.planetarena.org
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/alien-arena/

Deleted: packages/trunk/alien-arena/debian/patches/00list
===================================================================
--- packages/trunk/alien-arena/debian/patches/00list	2008-01-15 18:09:41 UTC (rev 5371)
+++ packages/trunk/alien-arena/debian/patches/00list	2008-01-15 18:16:56 UTC (rev 5372)
@@ -1,7 +0,0 @@
-makefile_modifications.dpatch
-launch-server_tool_debianization.dpatch
-kill-runaway-crded_tool_debianization.dpatch
-rcon_tool_debianization.dpatch
-home_as_game_dir.dpatch
-fix-CVE-2007-4754-CVE-2007-4755.dpatch
-ruby_browser.dpatch

Deleted: packages/trunk/alien-arena/debian/patches/fix-CVE-2007-4754-CVE-2007-4755.dpatch
===================================================================
--- packages/trunk/alien-arena/debian/patches/fix-CVE-2007-4754-CVE-2007-4755.dpatch	2008-01-15 18:09:41 UTC (rev 5371)
+++ packages/trunk/alien-arena/debian/patches/fix-CVE-2007-4754-CVE-2007-4755.dpatch	2008-01-15 18:16:56 UTC (rev 5372)
@@ -1,49 +0,0 @@
-#! /bin/sh -e
-## fix-CVE-2007-4754-CVE-2007-4755.dpatch by Nico Golde <nion at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: CVE-2007-4754 format string vulnerability, CVE-2007-4755 DoS fixes
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
---- source/game/acesrc/acebot_cmds.c.bak	2007-11-10 16:35:28.000000000 -0500
-+++ source/game/acesrc/acebot_cmds.c	2007-11-10 16:51:15.000000000 -0500
-@@ -191,7 +191,7 @@
- 	len = vsprintf (bigbuffer,fmt,argptr);
- 	va_end (argptr);
- 	
--	gi.centerprintf(ent, bigbuffer);
-+	gi.centerprintf(ent,"%s", bigbuffer);
- 	
- }
- 
---- source/server/sv_main.c.bak	2007-11-10 16:48:42.000000000 -0500
-+++ source/server/sv_main.c	2007-11-10 16:49:56.000000000 -0500
-@@ -154,7 +154,7 @@
- 			nametxt[k]=0;
- 			//s = NET_AdrToString ( cl->netchan.remote_address); //fuck you Luigi
- 			Com_sprintf (player, sizeof(player), "%i %i \"%s\" \"127.0.0.1\"\n",
--				cl->edict->client->ps.stats[STAT_FRAGS], cl->ping, nametxt);
-+				cl->edict->client->ps.stats[STAT_FRAGS], cl->ping, nametxt, "suppressed");
- 			playerLength = strlen(player);
- 			if (statusLength + playerLength >= sizeof(status) )
- 				break;		// can't hold any more

Copied: packages/trunk/alien-arena/debian/patches/fix-CVE-2007-4754-CVE-2007-4755.patch (from rev 5370, packages/trunk/alien-arena/debian/patches/fix-CVE-2007-4754-CVE-2007-4755.dpatch)
===================================================================
--- packages/trunk/alien-arena/debian/patches/fix-CVE-2007-4754-CVE-2007-4755.patch	                        (rev 0)
+++ packages/trunk/alien-arena/debian/patches/fix-CVE-2007-4754-CVE-2007-4755.patch	2008-01-15 18:16:56 UTC (rev 5372)
@@ -0,0 +1,49 @@
+#! /bin/sh -e
+## fix-CVE-2007-4754-CVE-2007-4755.dpatch by Nico Golde <nion at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: CVE-2007-4754 format string vulnerability, CVE-2007-4755 DoS fixes
+
+dir=
+if [ $# -eq 3 -a "$2" = '-d' ]; then
+    pdir="-d $3"
+    dir="$3/"
+elif [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch)
+        patch $pdir -f --no-backup-if-mismatch -p0 < $0
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- source/game/acesrc/acebot_cmds.c.bak	2007-11-10 16:35:28.000000000 -0500
++++ source/game/acesrc/acebot_cmds.c	2007-11-10 16:51:15.000000000 -0500
+@@ -191,7 +191,7 @@
+ 	len = vsprintf (bigbuffer,fmt,argptr);
+ 	va_end (argptr);
+ 	
+-	gi.centerprintf(ent, bigbuffer);
++	gi.centerprintf(ent,"%s", bigbuffer);
+ 	
+ }
+ 
+--- source/server/sv_main.c.bak	2007-11-10 16:48:42.000000000 -0500
++++ source/server/sv_main.c	2007-11-10 16:49:56.000000000 -0500
+@@ -154,7 +154,7 @@
+ 			nametxt[k]=0;
+ 			//s = NET_AdrToString ( cl->netchan.remote_address); //fuck you Luigi
+ 			Com_sprintf (player, sizeof(player), "%i %i \"%s\" \"127.0.0.1\"\n",
+-				cl->edict->client->ps.stats[STAT_FRAGS], cl->ping, nametxt);
++				cl->edict->client->ps.stats[STAT_FRAGS], cl->ping, nametxt, "suppressed");
+ 			playerLength = strlen(player);
+ 			if (statusLength + playerLength >= sizeof(status) )
+ 				break;		// can't hold any more

Deleted: packages/trunk/alien-arena/debian/patches/home_as_game_dir.dpatch
===================================================================
--- packages/trunk/alien-arena/debian/patches/home_as_game_dir.dpatch	2008-01-15 18:09:41 UTC (rev 5371)
+++ packages/trunk/alien-arena/debian/patches/home_as_game_dir.dpatch	2008-01-15 18:16:56 UTC (rev 5372)
@@ -1,47 +0,0 @@
-#! /bin/sh -e
-## home_as_game_dir.dpatch by Andres Mejia <mcitadel at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch to set game directory used by client and server from $HOME/.codered to $HOME/.alien-arena
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
---- source/qcommon/files.c~ 2007-10-29 13:13:02.000000000 -0400
-+++ source/qcommon/files.c     2007-10-29 13:15:21.000000000 -0400
-@@ -591,7 +591,7 @@
- ================
- FS_AddHomeAsGameDirectory
- 
--Use ~/.codered/dir as fs_gamedir
-+Use ~/.alien-arena/dir as fs_gamedir
- ================
- */
- void FS_AddHomeAsGameDirectory (char *dir)
-@@ -600,7 +600,7 @@
- 	char *homedir=getenv("HOME");
- 	if(homedir)
- 	{
--		int len = snprintf(gdir,sizeof(gdir),"%s/.codered/%s/", homedir, dir);
-+		int len = snprintf(gdir,sizeof(gdir),"%s/.alien-arena/%s/", homedir, dir);
- 		Com_Printf("using %s for writing\n",gdir);
- 		FS_CreatePath (gdir);
- 

Copied: packages/trunk/alien-arena/debian/patches/home_as_game_dir.patch (from rev 5370, packages/trunk/alien-arena/debian/patches/home_as_game_dir.dpatch)
===================================================================
--- packages/trunk/alien-arena/debian/patches/home_as_game_dir.patch	                        (rev 0)
+++ packages/trunk/alien-arena/debian/patches/home_as_game_dir.patch	2008-01-15 18:16:56 UTC (rev 5372)
@@ -0,0 +1,47 @@
+#! /bin/sh -e
+## home_as_game_dir.dpatch by Andres Mejia <mcitadel at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch to set game directory used by client and server from $HOME/.codered to $HOME/.alien-arena
+
+dir=
+if [ $# -eq 3 -a "$2" = '-d' ]; then
+    pdir="-d $3"
+    dir="$3/"
+elif [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch)
+        patch $pdir -f --no-backup-if-mismatch -p0 < $0
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- source/qcommon/files.c~ 2007-10-29 13:13:02.000000000 -0400
++++ source/qcommon/files.c     2007-10-29 13:15:21.000000000 -0400
+@@ -591,7 +591,7 @@
+ ================
+ FS_AddHomeAsGameDirectory
+ 
+-Use ~/.codered/dir as fs_gamedir
++Use ~/.alien-arena/dir as fs_gamedir
+ ================
+ */
+ void FS_AddHomeAsGameDirectory (char *dir)
+@@ -600,7 +600,7 @@
+ 	char *homedir=getenv("HOME");
+ 	if(homedir)
+ 	{
+-		int len = snprintf(gdir,sizeof(gdir),"%s/.codered/%s/", homedir, dir);
++		int len = snprintf(gdir,sizeof(gdir),"%s/.alien-arena/%s/", homedir, dir);
+ 		Com_Printf("using %s for writing\n",gdir);
+ 		FS_CreatePath (gdir);
+ 

Deleted: packages/trunk/alien-arena/debian/patches/kill-runaway-crded_tool_debianization.dpatch
===================================================================
--- packages/trunk/alien-arena/debian/patches/kill-runaway-crded_tool_debianization.dpatch	2008-01-15 18:09:41 UTC (rev 5371)
+++ packages/trunk/alien-arena/debian/patches/kill-runaway-crded_tool_debianization.dpatch	2008-01-15 18:16:56 UTC (rev 5372)
@@ -1,43 +0,0 @@
-#! /bin/sh -e
-## kill-runaway-crded_tool_debianization.dpatch by Andres Mejia <mcitadel at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch to modify Tools/LinuxScripts/kill-runaway-crded script for use in a Debian based distro.
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
---- Tools/LinuxScripts/kill-runaway-crded~	2007-05-13 01:23:35.000000000 -0400
-+++ Tools/LinuxScripts/kill-runaway-crded	2007-05-13 01:23:35.000000000 -0400
-@@ -1,9 +1,9 @@
- #!/bin/sh
- 
--for TPPID in `ps -eo pid,pcpu,comm | grep crded | grep -v grep|
--awk '{print $1":"$2}' |
--awk 'BEGIN {FS=":"}{ if ($2 > 20.0){print $1} }'`
-+### This script has been patched for distribution to Debian systems.
-+
-+for TPPID in `ps -eo pid,comm | grep crded | cut -d' ' -f1`
- do
- /bin/kill -9 $TPPID
-+rm -f `ls $HOME/.alien-arena/alien-arena-server.*.pid`
- done
--

Copied: packages/trunk/alien-arena/debian/patches/kill-runaway-crded_tool_debianization.patch (from rev 5370, packages/trunk/alien-arena/debian/patches/kill-runaway-crded_tool_debianization.dpatch)
===================================================================
--- packages/trunk/alien-arena/debian/patches/kill-runaway-crded_tool_debianization.patch	                        (rev 0)
+++ packages/trunk/alien-arena/debian/patches/kill-runaway-crded_tool_debianization.patch	2008-01-15 18:16:56 UTC (rev 5372)
@@ -0,0 +1,43 @@
+#! /bin/sh -e
+## kill-runaway-crded_tool_debianization.dpatch by Andres Mejia <mcitadel at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch to modify Tools/LinuxScripts/kill-runaway-crded script for use in a Debian based distro.
+
+dir=
+if [ $# -eq 3 -a "$2" = '-d' ]; then
+    pdir="-d $3"
+    dir="$3/"
+elif [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch)
+        patch $pdir -f --no-backup-if-mismatch -p0 < $0
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- Tools/LinuxScripts/kill-runaway-crded~	2007-05-13 01:23:35.000000000 -0400
++++ Tools/LinuxScripts/kill-runaway-crded	2007-05-13 01:23:35.000000000 -0400
+@@ -1,9 +1,9 @@
+ #!/bin/sh
+ 
+-for TPPID in `ps -eo pid,pcpu,comm | grep crded | grep -v grep|
+-awk '{print $1":"$2}' |
+-awk 'BEGIN {FS=":"}{ if ($2 > 20.0){print $1} }'`
++### This script has been patched for distribution to Debian systems.
++
++for TPPID in `ps -eo pid,comm | grep crded | cut -d' ' -f1`
+ do
+ /bin/kill -9 $TPPID
++rm -f `ls $HOME/.alien-arena/alien-arena-server.*.pid`
+ done
+-

Deleted: packages/trunk/alien-arena/debian/patches/launch-server_tool_debianization.dpatch
===================================================================
--- packages/trunk/alien-arena/debian/patches/launch-server_tool_debianization.dpatch	2008-01-15 18:09:41 UTC (rev 5371)
+++ packages/trunk/alien-arena/debian/patches/launch-server_tool_debianization.dpatch	2008-01-15 18:16:56 UTC (rev 5372)
@@ -1,120 +0,0 @@
-#! /bin/sh -e
-## launch-server_tool_debianization.dpatch by Andres Mejia <mcitadel at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch to modify Tools/LinuxScripts/launch-server script for use in a Debian based distro.
-## DP: Patch also allows for server config files to be placed under any directory.
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
---- Tools/LinuxScripts/launch-server~	2007-05-17 00:38:52.000000000 -0400
-+++ Tools/LinuxScripts/launch-server	2007-05-17 01:40:07.000000000 -0400
-@@ -1,14 +1,20 @@
- #! /bin/sh
- #
-+
-+### This script has been patched from it's original source for
-+# distribution to Debian systems. The original script can be viewed and
-+# checked out from SVN.
-+
- # AA Server Cron Job (originally TeamSpeak Cron Job)
- #
--# Usage: launch-server <configfile>
--# EG:    launch-server ctf.cfg
-+# Usage: alien-arena-server -s <configfile>
-+# EG:    alien-arena-server -s ctf.cfg
- #
- # Author: Chris Childers
- # E-Mail: Chris at darkstarllc.com
- # Modified by: Fafa Paku
- # Modified by: Tony Jackson
-+# Debian patch by: Andres Mejia <mcitadel at gmail.com>
- #
- # Set the port number in the .cfg if running multiple servers.
- # Script checks the existance of the cfg file before launching.
-@@ -17,31 +23,42 @@
- #ulimit -c unlimited
- 
- ### Set your default AA Root Directory
--aadir="/home/aa/alienarena2007"
-+aadir="/usr/share/games/alien-arena"
- 
- ### Set your AA Binary Name or command string ($1 is the argument
- ### passed to the script)
--aabin="crded +set game arena +exec $1"
-+aabin="/usr/lib/games/alien-arena/crded +set game arena +exec $1"
- 
- ########## you probably don't need to change anything below here 
- ##########
- 
--
- if [ $1 ]
- then
--if test -r $aadir/arena/$1
--then
--echo "Found server config $aadir/arena/$1..."
--else
--echo "Unable to find server config $aadir/arena/$1."
--exit 0
-+	if test -r $HOME/.alien-arena/$1
-+	then
-+	echo "Found server config $HOME/.alien-arena/$1..."
-+	elif test -r $1
-+	then
-+	echo "Found server config $1..."
-+	else
-+	echo "Unable to find server config $1."
-+	exit 0
- fi
- else
--echo "Usage: launch-server <configfile>"
-+echo "Usage: alien-arena-server -s <configfile>\n\
-+<configfile> must be specified.\n\
-+<configfile> can be placed inside $HOME/.alien-arena and\n\
-+specified by its basename, or it can be specified by its full path.\n\n"
- exit 0
- fi
- 
--aapid="$1.pid"
-+if test -d $HOME/.alien-arena
-+then
-+aapid="$HOME/.alien-arena/alien-arena-server.`basename $1`.pid"
-+else
-+mkdir $HOME/.alien-arena
-+aapid="$HOME/.alien-arena/alien-arena-server.`basename $1`.pid"
-+fi
- 
- cd $aadir
- 
-@@ -59,10 +76,10 @@
- echo "Stale $aapid file, erasing..."
- echo "Attempting to Restart Alien Arena"
- rm -f $aapid
--./$aabin &
-+$aabin &
- ps aux | grep "$aabin" | grep -v grep | awk '{print $2}' > $aapid
- else
- echo "$aapid appears to be missing. Attempting to Restart Alien Arena"
--./$aabin &
-+$aabin &
- ps aux | grep "$aabin" | grep -v grep | awk '{print $2}' > $aapid
- fi

Copied: packages/trunk/alien-arena/debian/patches/launch-server_tool_debianization.patch (from rev 5370, packages/trunk/alien-arena/debian/patches/launch-server_tool_debianization.dpatch)
===================================================================
--- packages/trunk/alien-arena/debian/patches/launch-server_tool_debianization.patch	                        (rev 0)
+++ packages/trunk/alien-arena/debian/patches/launch-server_tool_debianization.patch	2008-01-15 18:16:56 UTC (rev 5372)
@@ -0,0 +1,120 @@
+#! /bin/sh -e
+## launch-server_tool_debianization.dpatch by Andres Mejia <mcitadel at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch to modify Tools/LinuxScripts/launch-server script for use in a Debian based distro.
+## DP: Patch also allows for server config files to be placed under any directory.
+
+dir=
+if [ $# -eq 3 -a "$2" = '-d' ]; then
+    pdir="-d $3"
+    dir="$3/"
+elif [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch)
+        patch $pdir -f --no-backup-if-mismatch -p0 < $0
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- Tools/LinuxScripts/launch-server~	2007-05-17 00:38:52.000000000 -0400
++++ Tools/LinuxScripts/launch-server	2007-05-17 01:40:07.000000000 -0400
+@@ -1,14 +1,20 @@
+ #! /bin/sh
+ #
++
++### This script has been patched from it's original source for
++# distribution to Debian systems. The original script can be viewed and
++# checked out from SVN.
++
+ # AA Server Cron Job (originally TeamSpeak Cron Job)
+ #
+-# Usage: launch-server <configfile>
+-# EG:    launch-server ctf.cfg
++# Usage: alien-arena-server -s <configfile>
++# EG:    alien-arena-server -s ctf.cfg
+ #
+ # Author: Chris Childers
+ # E-Mail: Chris at darkstarllc.com
+ # Modified by: Fafa Paku
+ # Modified by: Tony Jackson
++# Debian patch by: Andres Mejia <mcitadel at gmail.com>
+ #
+ # Set the port number in the .cfg if running multiple servers.
+ # Script checks the existance of the cfg file before launching.
+@@ -17,31 +23,42 @@
+ #ulimit -c unlimited
+ 
+ ### Set your default AA Root Directory
+-aadir="/home/aa/alienarena2007"
++aadir="/usr/share/games/alien-arena"
+ 
+ ### Set your AA Binary Name or command string ($1 is the argument
+ ### passed to the script)
+-aabin="crded +set game arena +exec $1"
++aabin="/usr/lib/games/alien-arena/crded +set game arena +exec $1"
+ 
+ ########## you probably don't need to change anything below here 
+ ##########
+ 
+-
+ if [ $1 ]
+ then
+-if test -r $aadir/arena/$1
+-then
+-echo "Found server config $aadir/arena/$1..."
+-else
+-echo "Unable to find server config $aadir/arena/$1."
+-exit 0
++	if test -r $HOME/.alien-arena/$1
++	then
++	echo "Found server config $HOME/.alien-arena/$1..."
++	elif test -r $1
++	then
++	echo "Found server config $1..."
++	else
++	echo "Unable to find server config $1."
++	exit 0
+ fi
+ else
+-echo "Usage: launch-server <configfile>"
++echo "Usage: alien-arena-server -s <configfile>\n\
++<configfile> must be specified.\n\
++<configfile> can be placed inside $HOME/.alien-arena and\n\
++specified by its basename, or it can be specified by its full path.\n\n"
+ exit 0
+ fi
+ 
+-aapid="$1.pid"
++if test -d $HOME/.alien-arena
++then
++aapid="$HOME/.alien-arena/alien-arena-server.`basename $1`.pid"
++else
++mkdir $HOME/.alien-arena
++aapid="$HOME/.alien-arena/alien-arena-server.`basename $1`.pid"
++fi
+ 
+ cd $aadir
+ 
+@@ -59,10 +76,10 @@
+ echo "Stale $aapid file, erasing..."
+ echo "Attempting to Restart Alien Arena"
+ rm -f $aapid
+-./$aabin &
++$aabin &
+ ps aux | grep "$aabin" | grep -v grep | awk '{print $2}' > $aapid
+ else
+ echo "$aapid appears to be missing. Attempting to Restart Alien Arena"
+-./$aabin &
++$aabin &
+ ps aux | grep "$aabin" | grep -v grep | awk '{print $2}' > $aapid
+ fi

Deleted: packages/trunk/alien-arena/debian/patches/makefile_modifications.dpatch
===================================================================
--- packages/trunk/alien-arena/debian/patches/makefile_modifications.dpatch	2008-01-15 18:09:41 UTC (rev 5371)
+++ packages/trunk/alien-arena/debian/patches/makefile_modifications.dpatch	2008-01-15 18:16:56 UTC (rev 5372)
@@ -1,113 +0,0 @@
-#! /bin/sh -e
-## makefile_modifications.dpatch by Andres Mejia <mcitadel at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch that modifies the upstream Makefile making it more useful in
-## DP: building Debian packages.
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
---- source/Makefile.bak	2008-01-15 02:25:58.000000000 -0500
-+++ source/Makefile	2008-01-15 02:33:31.000000000 -0500
-@@ -14,7 +14,7 @@
- OPTIM_LVL?=2
- 
- # Path to standard libraries (e.g. jpeg).
--LOCALBASE?=/usr/local
-+LOCALBASE?=/usr
- 
- # Path to X libraries (e.g. GL).
- X11BASE?=/usr/X11R6
-@@ -35,7 +35,7 @@
- MOUNT_DIR=		./
- 
- BUILD_RELEASE_DIR=	release
--BUILD_DEBUG_DIR=	debug
-+BUILD_DEBUG_DIR=	release
- CLIENT_DIR=		$(MOUNT_DIR)/client
- SERVER_DIR=		$(MOUNT_DIR)/server
- REF_GL_DIR=		$(MOUNT_DIR)/ref_gl
-@@ -45,50 +45,24 @@
- NULL_DIR=		$(MOUNT_DIR)/null
- ARENA_DIR=		$(GAME_DIR)
- 
--ifeq ($(ARCH),x86_64)
--	_LIB := lib64
--else
--	_LIB := lib
--endif
-+_LIB := lib
- 
--BASE_CFLAGS=$(CFLAGS) -Dstricmp=strcasecmp -D_stricmp=strcasecmp -I$(X11BASE)/include -fno-strict-aliasing -fmerge-constants
-+BASE_CFLAGS=$(CFLAGS) -Dstricmp=strcasecmp -D_stricmp=strcasecmp -I$(X11BASE)/include -Wall
- 
- RELEASE_CFLAGS=$(BASE_CFLAGS)
- 
- ifeq ($(strip $(OPTIMIZED_CFLAGS)),yes)
- RELEASE_CFLAGS+=-O$(OPTIM_LVL) -fomit-frame-pointer \
--		-ftree-vectorize -fexpensive-optimizations
--
--ifeq ($(OSTYPE),linux)
--ifeq ($(ARCH),x86_64)
--	RELEASE_CFLAGS += -march=k8
--else
--ifeq ($(ARCH),i686)
--	RELEASE_CFLAGS += -march=i686
--else
--ifeq ($(ARCH),i586)
--	RELEASE_CFLAGS += -march=i586
--else
--ifeq ($(ARCH),i486)
--	RELEASE_CFLAGS += -march=i486
--else
--ifeq ($(ARCH),i386)
--	RELEASE_CFLAGS += -march=i386
--endif
--endif
--endif
--endif
--endif
--endif
-+		-ftree-vectorize -fexpensive-optimizations -fno-strict-aliasing
- endif
- 
--ifeq ($(shell curl -V | grep -c .), 3)
-+ifeq ($(shell curl-config --version | cut -d ' ' -f 1), libcurl)
- 	BASE_CFLAGS += -DHAVE_CURL
- endif
- 
- ARENA_CFLAGS=-DARENA
- 
--DEBUG_CFLAGS=$(BASE_CFLAGS) -g -ggdb
-+DEBUG_CFLAGS=$(BASE_CFLAGS) -g
- 
- LDFLAGS+=-lm
- # In FreeBSD, dlopen() is in libc.
-@@ -102,7 +76,7 @@
- SDLLDFLAGS=$(shell sdl-config --libs)
- 
- SHLIBEXT=so
--SHLIBCFLAGS=-fPIC
-+SHLIBCFLAGS=-fPIC -D_REENTRANT
- SHLIBLDFLAGS=-shared
- 
- CURLCFLAGS=$(shell curl-config --cflags)

Copied: packages/trunk/alien-arena/debian/patches/makefile_modifications.patch (from rev 5370, packages/trunk/alien-arena/debian/patches/makefile_modifications.dpatch)
===================================================================
--- packages/trunk/alien-arena/debian/patches/makefile_modifications.patch	                        (rev 0)
+++ packages/trunk/alien-arena/debian/patches/makefile_modifications.patch	2008-01-15 18:16:56 UTC (rev 5372)
@@ -0,0 +1,113 @@
+#! /bin/sh -e
+## makefile_modifications.dpatch by Andres Mejia <mcitadel at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch that modifies the upstream Makefile making it more useful in
+## DP: building Debian packages.
+
+dir=
+if [ $# -eq 3 -a "$2" = '-d' ]; then
+    pdir="-d $3"
+    dir="$3/"
+elif [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch)
+        patch $pdir -f --no-backup-if-mismatch -p0 < $0
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- source/Makefile.bak	2008-01-15 02:25:58.000000000 -0500
++++ source/Makefile	2008-01-15 02:33:31.000000000 -0500
+@@ -14,7 +14,7 @@
+ OPTIM_LVL?=2
+ 
+ # Path to standard libraries (e.g. jpeg).
+-LOCALBASE?=/usr/local
++LOCALBASE?=/usr
+ 
+ # Path to X libraries (e.g. GL).
+ X11BASE?=/usr/X11R6
+@@ -35,7 +35,7 @@
+ MOUNT_DIR=		./
+ 
+ BUILD_RELEASE_DIR=	release
+-BUILD_DEBUG_DIR=	debug
++BUILD_DEBUG_DIR=	release
+ CLIENT_DIR=		$(MOUNT_DIR)/client
+ SERVER_DIR=		$(MOUNT_DIR)/server
+ REF_GL_DIR=		$(MOUNT_DIR)/ref_gl
+@@ -45,50 +45,24 @@
+ NULL_DIR=		$(MOUNT_DIR)/null
+ ARENA_DIR=		$(GAME_DIR)
+ 
+-ifeq ($(ARCH),x86_64)
+-	_LIB := lib64
+-else
+-	_LIB := lib
+-endif
++_LIB := lib
+ 
+-BASE_CFLAGS=$(CFLAGS) -Dstricmp=strcasecmp -D_stricmp=strcasecmp -I$(X11BASE)/include -fno-strict-aliasing -fmerge-constants
++BASE_CFLAGS=$(CFLAGS) -Dstricmp=strcasecmp -D_stricmp=strcasecmp -I$(X11BASE)/include -Wall
+ 
+ RELEASE_CFLAGS=$(BASE_CFLAGS)
+ 
+ ifeq ($(strip $(OPTIMIZED_CFLAGS)),yes)
+ RELEASE_CFLAGS+=-O$(OPTIM_LVL) -fomit-frame-pointer \
+-		-ftree-vectorize -fexpensive-optimizations
+-
+-ifeq ($(OSTYPE),linux)
+-ifeq ($(ARCH),x86_64)
+-	RELEASE_CFLAGS += -march=k8
+-else
+-ifeq ($(ARCH),i686)
+-	RELEASE_CFLAGS += -march=i686
+-else
+-ifeq ($(ARCH),i586)
+-	RELEASE_CFLAGS += -march=i586
+-else
+-ifeq ($(ARCH),i486)
+-	RELEASE_CFLAGS += -march=i486
+-else
+-ifeq ($(ARCH),i386)
+-	RELEASE_CFLAGS += -march=i386
+-endif
+-endif
+-endif
+-endif
+-endif
+-endif
++		-ftree-vectorize -fexpensive-optimizations -fno-strict-aliasing
+ endif
+ 
+-ifeq ($(shell curl -V | grep -c .), 3)
++ifeq ($(shell curl-config --version | cut -d ' ' -f 1), libcurl)
+ 	BASE_CFLAGS += -DHAVE_CURL
+ endif
+ 
+ ARENA_CFLAGS=-DARENA
+ 
+-DEBUG_CFLAGS=$(BASE_CFLAGS) -g -ggdb
++DEBUG_CFLAGS=$(BASE_CFLAGS) -g
+ 
+ LDFLAGS+=-lm
+ # In FreeBSD, dlopen() is in libc.
+@@ -102,7 +76,7 @@
+ SDLLDFLAGS=$(shell sdl-config --libs)
+ 
+ SHLIBEXT=so
+-SHLIBCFLAGS=-fPIC
++SHLIBCFLAGS=-fPIC -D_REENTRANT
+ SHLIBLDFLAGS=-shared
+ 
+ CURLCFLAGS=$(shell curl-config --cflags)

Deleted: packages/trunk/alien-arena/debian/patches/rcon_tool_debianization.dpatch
===================================================================
--- packages/trunk/alien-arena/debian/patches/rcon_tool_debianization.dpatch	2008-01-15 18:09:41 UTC (rev 5371)
+++ packages/trunk/alien-arena/debian/patches/rcon_tool_debianization.dpatch	2008-01-15 18:16:56 UTC (rev 5372)
@@ -1,53 +0,0 @@
-#! /bin/sh -e
-## rcon_tool_debianization.dpatch by Andres Mejia <mcitadel at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch to modify Tools/LinuxScripts/rcon script for use in a Debian based distro.
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
---- Tools/LinuxScripts/rcon~	2007-05-14 23:37:17.000000000 -0400
-+++ Tools/LinuxScripts/rcon	2007-05-14 23:37:17.000000000 -0400
-@@ -22,6 +22,10 @@
-     Tony Jackson can be contacted at tonyj at cooldark.com
- 	
- =end
-+=begin
-+	This script has been patched from its original source for distribution
-+	with Debian systems.
-+=end
- 
- require 'socket'
- 
-@@ -103,10 +107,10 @@
- 	puts 'RCon utility for Alien Arena servers'
- 	puts ''
- 	puts '  Usage:'
--	puts '  rcon <server:port> password <commandstring>'
-+	puts '  alien-arena-server -r <server:port> password <commandstring>'
- 	puts '  Optional arguments:'
- 	puts ''
--	puts '  --help  This message'
-+	puts '  alien-arena-server -r --help  This message'
- 	puts ''
- 	exit
- end

Copied: packages/trunk/alien-arena/debian/patches/rcon_tool_debianization.patch (from rev 5370, packages/trunk/alien-arena/debian/patches/rcon_tool_debianization.dpatch)
===================================================================
--- packages/trunk/alien-arena/debian/patches/rcon_tool_debianization.patch	                        (rev 0)
+++ packages/trunk/alien-arena/debian/patches/rcon_tool_debianization.patch	2008-01-15 18:16:56 UTC (rev 5372)
@@ -0,0 +1,53 @@
+#! /bin/sh -e
+## rcon_tool_debianization.dpatch by Andres Mejia <mcitadel at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch to modify Tools/LinuxScripts/rcon script for use in a Debian based distro.
+
+dir=
+if [ $# -eq 3 -a "$2" = '-d' ]; then
+    pdir="-d $3"
+    dir="$3/"
+elif [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch)
+        patch $pdir -f --no-backup-if-mismatch -p0 < $0
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- Tools/LinuxScripts/rcon~	2007-05-14 23:37:17.000000000 -0400
++++ Tools/LinuxScripts/rcon	2007-05-14 23:37:17.000000000 -0400
+@@ -22,6 +22,10 @@
+     Tony Jackson can be contacted at tonyj at cooldark.com
+ 	
+ =end
++=begin
++	This script has been patched from its original source for distribution
++	with Debian systems.
++=end
+ 
+ require 'socket'
+ 
+@@ -103,10 +107,10 @@
+ 	puts 'RCon utility for Alien Arena servers'
+ 	puts ''
+ 	puts '  Usage:'
+-	puts '  rcon <server:port> password <commandstring>'
++	puts '  alien-arena-server -r <server:port> password <commandstring>'
+ 	puts '  Optional arguments:'
+ 	puts ''
+-	puts '  --help  This message'
++	puts '  alien-arena-server -r --help  This message'
+ 	puts ''
+ 	exit
+ end

Deleted: packages/trunk/alien-arena/debian/patches/ruby_browser.dpatch
===================================================================
--- packages/trunk/alien-arena/debian/patches/ruby_browser.dpatch	2008-01-15 18:09:41 UTC (rev 5371)
+++ packages/trunk/alien-arena/debian/patches/ruby_browser.dpatch	2008-01-15 18:16:56 UTC (rev 5372)
@@ -1,67 +0,0 @@
-#! /bin/sh -e
-## ruby_browser.dpatch by Andres Mejia <mcitadel at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch to modify ruby browser script for use with this Debian package.
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
---- Tools/RubyBrowser/browser.rbw.bak	2007-11-10 21:54:03.000000000 -0500
-+++ Tools/RubyBrowser/browser.rbw	2007-11-10 22:35:10.000000000 -0500
-@@ -519,7 +519,7 @@
- 			shell.Run("cmd /K cd \"#{@config['gamedir']}\" & #{@config['gameexe']} +set game arena +connect #{@selectedserver}", 0, FALSE)
- 		else
- 			# Note: exec() in Linux replaces the current running process (ruby no longer runs), so using system() instead
--			system("cd #{@config['gamedir']};./#{@config['gameexe']} +set game arena +connect #{@selectedserver} &")
-+			system("cd #{@config['gamedir']};#{@config['gameexe']} +set game arena +connect #{@selectedserver} &")
- 		end		
- 	end
- 
-@@ -538,15 +538,15 @@
- 	# Load the @config hash form file, if exists, else set defaults
- 	def LoadConfig
- 		# Set up default parameters
--		parameters = {'gamedir'=>'../../', 'browser'=>'firefox'}
-+		parameters = {'gamedir'=>'/usr/share/games/alien-arena/', 'browser'=>'x-www-browser'}
- 		if DetectWindows()
--			parameters['gameexe'] = 'crx'
-+			parameters['gameexe'] = '/usr/lib/games/alien-arena/crx'
- 		else
--			parameters['gameexe'] = 'crx.sdl'
-+			parameters['gameexe'] = '/usr/lib/games/alien-arena/crx.sdl'
- 		end
- 		
- 		@config.clear # empty hash table
--		file = open('browser.ini', 'r')
-+		file = open("#{ENV['HOME']}/.alien-arena/browser.ini", 'r')
- 		file.each do
- 			|line|
- 			key = line.split('=')[0].chomp  # chomp removes any line feed present at end of line
-@@ -581,7 +581,7 @@
- 			return
- 		end
- 		
--		file = open('browser.ini', 'w')
-+		file = open("#{ENV['HOME']}/.alien-arena/browser.ini", 'w')
- 		@config.each do
- 			|key, value|
- 			file.puts key+'='+value

Copied: packages/trunk/alien-arena/debian/patches/ruby_browser.patch (from rev 5370, packages/trunk/alien-arena/debian/patches/ruby_browser.dpatch)
===================================================================
--- packages/trunk/alien-arena/debian/patches/ruby_browser.patch	                        (rev 0)
+++ packages/trunk/alien-arena/debian/patches/ruby_browser.patch	2008-01-15 18:16:56 UTC (rev 5372)
@@ -0,0 +1,67 @@
+#! /bin/sh -e
+## ruby_browser.dpatch by Andres Mejia <mcitadel at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch to modify ruby browser script for use with this Debian package.
+
+dir=
+if [ $# -eq 3 -a "$2" = '-d' ]; then
+    pdir="-d $3"
+    dir="$3/"
+elif [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch)
+        patch $pdir -f --no-backup-if-mismatch -p0 < $0
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- Tools/RubyBrowser/browser.rbw.bak	2007-11-10 21:54:03.000000000 -0500
++++ Tools/RubyBrowser/browser.rbw	2007-11-10 22:35:10.000000000 -0500
+@@ -519,7 +519,7 @@
+ 			shell.Run("cmd /K cd \"#{@config['gamedir']}\" & #{@config['gameexe']} +set game arena +connect #{@selectedserver}", 0, FALSE)
+ 		else
+ 			# Note: exec() in Linux replaces the current running process (ruby no longer runs), so using system() instead
+-			system("cd #{@config['gamedir']};./#{@config['gameexe']} +set game arena +connect #{@selectedserver} &")
++			system("cd #{@config['gamedir']};#{@config['gameexe']} +set game arena +connect #{@selectedserver} &")
+ 		end		
+ 	end
+ 
+@@ -538,15 +538,15 @@
+ 	# Load the @config hash form file, if exists, else set defaults
+ 	def LoadConfig
+ 		# Set up default parameters
+-		parameters = {'gamedir'=>'../../', 'browser'=>'firefox'}
++		parameters = {'gamedir'=>'/usr/share/games/alien-arena/', 'browser'=>'x-www-browser'}
+ 		if DetectWindows()
+-			parameters['gameexe'] = 'crx'
++			parameters['gameexe'] = '/usr/lib/games/alien-arena/crx'
+ 		else
+-			parameters['gameexe'] = 'crx.sdl'
++			parameters['gameexe'] = '/usr/lib/games/alien-arena/crx.sdl'
+ 		end
+ 		
+ 		@config.clear # empty hash table
+-		file = open('browser.ini', 'r')
++		file = open("#{ENV['HOME']}/.alien-arena/browser.ini", 'r')
+ 		file.each do
+ 			|line|
+ 			key = line.split('=')[0].chomp  # chomp removes any line feed present at end of line
+@@ -581,7 +581,7 @@
+ 			return
+ 		end
+ 		
+-		file = open('browser.ini', 'w')
++		file = open("#{ENV['HOME']}/.alien-arena/browser.ini", 'w')
+ 		@config.each do
+ 			|key, value|
+ 			file.puts key+'='+value

Copied: packages/trunk/alien-arena/debian/patches/series (from rev 5370, packages/trunk/alien-arena/debian/patches/00list)
===================================================================
--- packages/trunk/alien-arena/debian/patches/series	                        (rev 0)
+++ packages/trunk/alien-arena/debian/patches/series	2008-01-15 18:16:56 UTC (rev 5372)
@@ -0,0 +1,7 @@
+makefile_modifications.patch
+launch-server_tool_debianization.patch
+kill-runaway-crded_tool_debianization.patch
+rcon_tool_debianization.patch
+home_as_game_dir.patch
+fix-CVE-2007-4754-CVE-2007-4755.patch
+ruby_browser.patch




More information about the Pkg-games-commits mailing list