[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.5-5+exp1-6-g4ef4aa2

[Simon McVittie]

The following commit has been merged in the master branch:
commit 4ef4aa2c8642d852e1b5619f1329e24cd866ef35
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Nov 12 18:04:34 2010 +0000

    Follow the rename of q3arch.sh to q3arch

diff --git a/debian/changelog b/debian/changelog
index 847db2c..80a6dc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,8 @@ openarena (0.8.5-5+exp2) UNRELEASED; urgency=low
   * Create a Debian-openarena user and install an init script (off by default)
     (Closes: #503106)
   * Add a README.Debian explaining alternative ways to run the server
-  * Depend on an ioquake3-server new enough to have q3arch.sh, and use it
+  * Depend on an ioquake3-server new enough to install q3arch, and run that
+    instead of having our own copy
   * Depend on debhelper 8 and convert the rules file to dh style
 
  -- Simon McVittie <smcv at debian.org>  Thu, 11 Nov 2010 20:13:30 +0000
diff --git a/debian/rules b/debian/rules
index 4415853..4f4177d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,10 +6,10 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
     MAKEFLAGS += -j$(NUMJOBS)
 endif
 
-Q3ARCH             := $(shell /usr/share/ioquake3/q3arch.sh arch     HOST)
-Q3PLATFORM         := $(shell /usr/share/ioquake3/q3arch.sh platform HOST)
-Q3COMPILE_ARCH     := $(shell /usr/share/ioquake3/q3arch.sh arch     BUILD)
-Q3COMPILE_PLATFORM := $(shell /usr/share/ioquake3/q3arch.sh platform BUILD)
+Q3ARCH             := $(shell /usr/share/ioquake3/q3arch arch     HOST)
+Q3PLATFORM         := $(shell /usr/share/ioquake3/q3arch platform HOST)
+Q3COMPILE_ARCH     := $(shell /usr/share/ioquake3/q3arch arch     BUILD)
+Q3COMPILE_PLATFORM := $(shell /usr/share/ioquake3/q3arch platform BUILD)
 
 CFLAGS += -fsigned-char
 

-- 
Packaging for the OpenArena engine