[game-data-packager] 77/293: Changed launcher scripts to match any arg starting with +, rather than just +set and +connect

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch quake
in repository game-data-packager.

commit 8cce1deac2f5dbb236b81d48acabb2de2e8005c0
Author: Jack Coulter <jscinoz at gmail.com>
Date:   Mon Jun 30 04:42:58 2008 +0000

    Changed launcher scripts to match any arg starting with +, rather than just +set and +connect
---
 debian/control               | 3 ++-
 debian/rules                 | 2 +-
 debian/scripts/quake3        | 2 +-
 debian/scripts/quake3-server | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 5c3b31b..b35a77f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: quake3
 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/
diff --git a/debian/rules b/debian/rules
index 1bf6c2a..489024c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ build: build-arch
 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
diff --git a/debian/scripts/quake3 b/debian/scripts/quake3
index c045c30..802ef75 100644
--- a/debian/scripts/quake3
+++ b/debian/scripts/quake3
@@ -16,7 +16,7 @@ Usage: quake3 [OPTION]...\n\
 # 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
diff --git a/debian/scripts/quake3-server b/debian/scripts/quake3-server
index 3d95ca9..3b63e59 100644
--- a/debian/scripts/quake3-server
+++ b/debian/scripts/quake3-server
@@ -16,7 +16,7 @@ Usage: quake3-server [OPTION]...\n\
 # 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git