r7587 - in packages/trunk/quake3/debian: . scripts

[Jack Coulter]

Author: jscinoz-guest
Date: 2008-06-30 04:42:58 +0000 (Mon, 30 Jun 2008)
New Revision: 7587

Modified:
   packages/trunk/quake3/debian/control
   packages/trunk/quake3/debian/rules
   packages/trunk/quake3/debian/scripts/quake3
   packages/trunk/quake3/debian/scripts/quake3-server
Log:
Changed launcher scripts to match any arg starting with +, rather than just +set and +connect

Modified: packages/trunk/quake3/debian/control
===================================================================
--- packages/trunk/quake3/debian/control	2008-06-30 04:42:53 UTC (rev 7586)
+++ packages/trunk/quake3/debian/control	2008-06-30 04:42:58 UTC (rev 7587)
@@ -2,7 +2,8 @@
 Section: contrib/games
 Priority: optional
 Maintainer: Jack Coulter <jscinoz at gmail.com>
-Build-Depends: debhelper (>= 5.0.51~), libopenal-dev, libsdl1.2-dev
+Build-Depends: debhelper (>= 5.0.51~), libopenal-dev, libsdl1.2-dev,
+ libspeexdsp-dev, speex
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/quake3
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/quake3/?op=log
 Homepage: http://www.ioquake3.org/

Modified: packages/trunk/quake3/debian/rules
===================================================================
--- packages/trunk/quake3/debian/rules	2008-06-30 04:42:53 UTC (rev 7586)
+++ packages/trunk/quake3/debian/rules	2008-06-30 04:42:58 UTC (rev 7587)
@@ -22,7 +22,7 @@
 build-arch: build-arch-stamp
 build-arch-stamp:
 	dh_testdir
-	BUILD_GAME_QVM=0 BUILD_GAME_SO=0 $(MAKE) $(BUILD_FLAGS) # so/qvm unneeded
+	USE_INTERNAL_SPEEX=0 BUILD_GAME_QVM=0 BUILD_GAME_SO=0 $(MAKE) $(BUILD_FLAGS) # so/qvm unneeded
 
 clean:
 	dh_testdir

Modified: packages/trunk/quake3/debian/scripts/quake3
===================================================================
--- packages/trunk/quake3/debian/scripts/quake3	2008-06-30 04:42:53 UTC (rev 7586)
+++ packages/trunk/quake3/debian/scripts/quake3	2008-06-30 04:42:58 UTC (rev 7587)
@@ -16,7 +16,7 @@
 # catch them here, to avoid accidentally launching the binary.
 
 while [ "$1" != "" ]; do {
-	if [ "$1" = "+set" -o "$1" = "+connect" ]; then
+	if [ ${1:0:1} = "+" ]; then
 		break;
 	fi
 	case "$1" in

Modified: packages/trunk/quake3/debian/scripts/quake3-server
===================================================================
--- packages/trunk/quake3/debian/scripts/quake3-server	2008-06-30 04:42:53 UTC (rev 7586)
+++ packages/trunk/quake3/debian/scripts/quake3-server	2008-06-30 04:42:58 UTC (rev 7587)
@@ -16,7 +16,7 @@
 # catch them here, to avoid accidentally launching the binary.
 
 while [ "$1" != "" ]; do {
-	if [ "$1" = "+set" -o "$1" = "+connect" ]; then
+	if [ ${1:0:1} = "+" ]; then
 		break;
 	fi
 	case "$1" in