[SCM] Quake 3 engine branch, master, updated. upstream/1.36+svn1788j-98-g7c04956

[Simon McVittie]

The following commit has been merged in the master branch:
commit 77bbbee07007301a54135fc7239a7a187ac6b974
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Nov 12 17:48:53 2010 +0000

    Rename q3arch.sh to q3arch

diff --git a/debian/changelog b/debian/changelog
index feca198..6d19474 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ ioquake3 (1.36+svn1802-1) UNRELEASED; urgency=low
     doesn't match the Q3 architecture name won't delete the binaries
   * Use Q3 arch name "sh" for sh4
   * Recommend x11-utils, zenity or kdebase-bin so Sys_Dialog will work
-  * Install q3arch.sh to /usr/share/ioquake3, for openarena to build-depend on
   * Move get-orig-source functionality into debian/rules
+  * Rename q3arch.sh to q3arch, and install it in ioquake3-server so
+    openarena can build-depend on it
 
  -- Simon McVittie <smcv at debian.org>  Fri, 15 Oct 2010 22:46:18 +0100
 
diff --git a/debian/ioquake3-server.install b/debian/ioquake3-server.install
index 9137541..7b44256 100644
--- a/debian/ioquake3-server.install
+++ b/debian/ioquake3-server.install
@@ -1,4 +1,4 @@
 build/ioq3ded usr/lib/ioquake3
 build/baseq3/qagame*.so usr/lib/ioquake3/baseq3
 build/missionpack/qagame*.so usr/lib/ioquake3/missionpack
-debian/q3arch.sh usr/share/ioquake3
+debian/q3arch usr/share/ioquake3
diff --git a/debian/q3arch.sh b/debian/q3arch
similarity index 98%
rename from debian/q3arch.sh
rename to debian/q3arch
index 01024a5..9fc3e7d 100755
--- a/debian/q3arch.sh
+++ b/debian/q3arch
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Usage: q3arch.sh arch|platform BUILD|HOST
+# Usage: q3arch arch|platform BUILD|HOST
 #
 # Output an architecture or platform name that Quake 3 could use for the
 # build or host CPU architecture or operating system.
diff --git a/debian/rules b/debian/rules
index 3c000bd..81cc042 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,10 +6,10 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
     MAKEFLAGS += -j$(NUMJOBS)
 endif
 
-Q3ARCH             := $(shell sh $(CURDIR)/debian/q3arch.sh arch     HOST)
-Q3PLATFORM         := $(shell sh $(CURDIR)/debian/q3arch.sh platform HOST)
-Q3COMPILE_ARCH     := $(shell sh $(CURDIR)/debian/q3arch.sh arch     BUILD)
-Q3COMPILE_PLATFORM := $(shell sh $(CURDIR)/debian/q3arch.sh platform BUILD)
+Q3ARCH             := $(shell $(CURDIR)/debian/q3arch arch     HOST)
+Q3PLATFORM         := $(shell $(CURDIR)/debian/q3arch platform HOST)
+Q3COMPILE_ARCH     := $(shell $(CURDIR)/debian/q3arch arch     BUILD)
+Q3COMPILE_PLATFORM := $(shell $(CURDIR)/debian/q3arch platform BUILD)
 distro             := $(shell lsb_release -is)
 debian_version     := $(shell dpkg-parsechangelog -c1 | sed -ne 's/^Version: //p')
 

-- 
Quake 3 engine