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

[Jack Coulter]

Author: jscinoz-guest
Date: 2008-06-30 03:23:45 +0000 (Mon, 30 Jun 2008)
New Revision: 7582

Modified:
   packages/trunk/quake3/debian/rules
   packages/trunk/quake3/debian/scripts/quake3
   packages/trunk/quake3/debian/scripts/quake3-server
Log:
upstream likes jerking me around, told NOT to include so, also fixed spelling error in launch scripts

Modified: packages/trunk/quake3/debian/rules
===================================================================
--- packages/trunk/quake3/debian/rules	2008-06-29 23:06:37 UTC (rev 7581)
+++ packages/trunk/quake3/debian/rules	2008-06-30 03:23:45 UTC (rev 7582)
@@ -22,17 +22,17 @@
 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 @@
 	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 @@
 	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

Modified: packages/trunk/quake3/debian/scripts/quake3
===================================================================
--- packages/trunk/quake3/debian/scripts/quake3	2008-06-29 23:06:37 UTC (rev 7581)
+++ packages/trunk/quake3/debian/scripts/quake3	2008-06-30 03:23:45 UTC (rev 7582)
@@ -13,7 +13,7 @@
  +<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 @@
 # 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 $?

Modified: packages/trunk/quake3/debian/scripts/quake3-server
===================================================================
--- packages/trunk/quake3/debian/scripts/quake3-server	2008-06-29 23:06:37 UTC (rev 7581)
+++ packages/trunk/quake3/debian/scripts/quake3-server	2008-06-30 03:23:45 UTC (rev 7582)
@@ -13,7 +13,7 @@
  +<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