[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.1-8-48-g9372e3f

[Simon McVittie]

The following commit has been merged in the master branch:
commit d9b5f5ac061e1ff0964c60c16331e0ee340a6c82
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jul 29 02:54:01 2010 +0100

    Explicitly use system everything for both builds; use system zlib
    
    We can't use the bundled zlib, because we deleted it.
    
    The game/ build shouldn't use bundled libraries anyway, but it's
    good to be sure.

diff --git a/debian/rules b/debian/rules
index eb8080d..0dd4d2e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,15 @@ CFLAGS += -fsigned-char
 
 GENERAL_OPTIONS = \
 	V=1 \
+	BUILD_STANDALONE=1 \
+	USE_CURL=1 \
+	USE_CURL_DLOPEN=0 \
+	USE_OPENAL=1 \
+	USE_OPENAL_DLOPEN=0 \
+	USE_VOIP=1 \
+	USE_INTERNAL_SPEEX=0 \
+	USE_INTERNAL_ZLIB=0 \
+	USE_LOCAL_HEADERS=0 \
 	ARCH=$(Q3ARCH) \
 	PLATFORM=$(Q3PLATFORM) \
 	COMPILE_ARCH=$(Q3COMPILE_ARCH) \
@@ -24,15 +33,7 @@ ENGINE_OPTIONS = \
 	$(GENERAL_OPTIONS) \
 	BUILD_GAME_SO=0 \
 	BUILD_GAME_QVM=0 \
-	BUILD_STANDALONE=1 \
-	USE_CURL=1 \
-	USE_CURL_DLOPEN=0 \
-	USE_OPENAL=1 \
-	USE_OPENAL_DLOPEN=0 \
-	USE_VOIP=1 \
-	USE_INTERNAL_SPEEX=0 \
 	BUILD_CLIENT_SMP=1 \
-	USE_LOCAL_HEADERS=0 \
 	DEFAULT_BASEDIR=/usr/lib/games/openarena
 
 GAME_OPTIONS = \

-- 
Packaging for the OpenArena engine