[game-data-packager] 76/293: upstream likes jerking me around, told NOT to include so, also fixed spelling error in launch scripts

[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 aa4bcb446eb4d3c29ca941ed11f784ed8eb8deae
Author: Jack Coulter <jscinoz at gmail.com>
Date:   Mon Jun 30 03:23:45 2008 +0000

    upstream likes jerking me around, told NOT to include so, also fixed spelling error in launch scripts
---
 debian/rules                 | 10 +++++-----
 debian/scripts/quake3        |  8 ++++----
 debian/scripts/quake3-server |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/rules b/debian/rules
index 2fae944..1bf6c2a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,17 +22,17 @@ build: build-arch
 build-arch: build-arch-stamp
 build-arch-stamp:
 	dh_testdir
-	BUILD_GAME_SO=0 BUILD_GAME_QVM=0 $(MAKE) $(BUILD_FLAGS) # so/qvm unneeded
+	BUILD_GAME_QVM=0 BUILD_GAME_SO=0 $(MAKE) $(BUILD_FLAGS) # so/qvm unneeded
 
 clean:
 	dh_testdir
 	dh_testroot
 	rm -f ioquake3 ioq3ded configure-stamp
-	rm -rf build 
+	rm -rf build
 	
 	$(MAKE) clean
 	
-	dh_clean 
+	dh_clean
 
 install: install-indep install-arch
 
@@ -55,6 +55,7 @@ install-arch: build
 	cp build/release*/ioquake3.* ioquake3
 	cp build/release*/ioq3ded.* ioq3ded
 
+
 	dh_desktop -pquake3 debian/quake3.desktop
 	dh_installman -pquake3 debian/quake3.6
 	dh_installchangelogs -pquake3 ChangeLog
@@ -63,8 +64,7 @@ install-arch: build
 	dh_installchangelogs -pquake3-server ChangeLog
 
 	dh_install -s
-
-
+	
 # Build architecture-independent files here.
 binary-indep: install-indep
 	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
diff --git a/debian/scripts/quake3 b/debian/scripts/quake3
index 7409e96..c045c30 100644
--- a/debian/scripts/quake3
+++ b/debian/scripts/quake3
@@ -13,7 +13,7 @@ Usage: quake3 [OPTION]...\n\
  +<internal command>\tPass commands to the engine\n"
 
 # ioQuake3 binaries don't understand "regular" command line parameters. Let's
-# catch them here, to avoid accidently launching the binary.
+# catch them here, to avoid accidentally launching the binary.
 
 while [ "$1" != "" ]; do {
 	if [ "$1" = "+set" -o "$1" = "+connect" ]; then
@@ -38,9 +38,9 @@ while [ "$1" != "" ]; do {
 # Ready to rumble!
 
 if [ ${QUIET} -eq 1 ]; then
-	exec ${BINARY} +set fs_basepath ${BASE_PATH} +set ttycon 0 +set vm_ui 2 $* >/dev/null 2>&1
-else # We don't include ioquake3 qvm and so, so we have to set vm_ui 2
-	exec ${BINARY} +set fs_basepath ${BASE_PATH} +set vm_ui 2 $*
+	exec ${BINARY} +set fs_basepath ${BASE_PATH} +set ttycon 0 $* >/dev/null 2>&1
+else
+	exec ${BINARY} +set fs_basepath ${BASE_PATH} $*
 fi
 
 exit $?
diff --git a/debian/scripts/quake3-server b/debian/scripts/quake3-server
index 0a85777..3d95ca9 100644
--- a/debian/scripts/quake3-server
+++ b/debian/scripts/quake3-server
@@ -13,7 +13,7 @@ Usage: quake3-server [OPTION]...\n\
  +<internal command>\tPass commands to the engine\n"
 
 # ioQuake3 binaries don't understand "regular" command line parameters. Let's
-# catch them here, to avoid accidently launching the binary.
+# catch them here, to avoid accidentally launching the binary.
 
 while [ "$1" != "" ]; do {
 	if [ "$1" = "+set" -o "$1" = "+connect" ]; then

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