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

[Simon McVittie]

The following commit has been merged in the master branch:
commit dd4bdd82c1d8cece1ffc89eadf930fd998c8d56f
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Nov 11 19:48:30 2010 +0000

    Move get-orig-source functionality into debian/rules

diff --git a/debian/changelog b/debian/changelog
index 34d48a9..ced0e3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ioquake3 (1.36+svn1802-1) UNRELEASED; urgency=low
   * 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
 
  -- Simon McVittie <smcv at debian.org>  Fri, 15 Oct 2010 22:46:18 +0100
 
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
deleted file mode 100755
index 65d20f6..0000000
--- a/debian/get-orig-source.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-VER=1.36
-REV=1802
-# can be made non-empty for re-repacks
-SUFFIX=
-
-if test -n "${REV}"; then
-    VER=${VER}+svn${REV}
-    svn export -r ${REV} svn://svn.icculus.org/quake3/trunk ioquake3-${VER}
-else
-    svn export svn://svn.icculus.org/quake3/tags/${VER} ioquake3-${VER}
-fi
-
-rm -rf ioquake3-${VER}/.svnignore \
-		ioquake3-${VER}/code/AL \
-		ioquake3-${VER}/code/SDL12 \
-		ioquake3-${VER}/code/tools/lcc \
-		ioquake3-${VER}/code/libcurl \
-		ioquake3-${VER}/code/libs \
-		ioquake3-${VER}/code/libspeex
-
-tar -zcvf ioquake3_${VER}${SUFFIX}.orig.tar.gz ioquake3-${VER}
-rm -rf ioquake3-${VER}
diff --git a/debian/rules b/debian/rules
index e8a0292..3c000bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,3 +64,30 @@ override_dh_auto_build:
 		< debian/wrappers/openarena.in \
 		> debian/wrappers/openarena-server
 	chmod +x debian/wrappers/openarena-server
+
+# ---------------------------------------------------------------------------
+
+ORIG_REL = 1.36
+ORIG_REV = 1802
+# SUFFIX can be made non-empty for re-repacks
+ORIG_SUFFIX =
+
+ifeq (${ORIG_REV},)
+	ORIG_VER := ${ORIG_REL}${ORIG_SUFFIX}
+	ORIG_EXPORT := svn://svn.icculus.org/quake3/tags/${ORIG_VER}
+else
+	ORIG_VER := ${ORIG_REL}+svn${ORIG_REV}${ORIG_SUFFIX}
+	ORIG_EXPORT := -r ${ORIG_REV} svn://svn.icculus.org/quake3/trunk
+endif
+
+get-orig-source:
+	svn export ${ORIG_EXPORT} ioquake3-${ORIG_VER}.orig
+	rm -rf ioquake3-${ORIG_VER}.orig/.svnignore
+	rm -rf ioquake3-${ORIG_VER}.orig/code/AL
+	rm -rf ioquake3-${ORIG_VER}.orig/code/SDL12
+	rm -rf ioquake3-${ORIG_VER}.orig/code/tools/lcc
+	rm -rf ioquake3-${ORIG_VER}.orig/code/libcurl
+	rm -rf ioquake3-${ORIG_VER}.orig/code/libs
+	rm -rf ioquake3-${ORIG_VER}.orig/code/libspeex
+	tar -zcvf ioquake3_${ORIG_VER}.orig.tar.gz ioquake3-${ORIG_VER}.orig
+	rm -rf ioquake3-${ORIG_VER}.orig

-- 
Quake 3 engine