[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 0f41de667adbf23355ce444f8e6222c9b0d42658
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jul 29 20:20:24 2010 +0100

    Drop the OpenArena patch to rename the executables during build
    
    Instead, just install ioquake3/ioq3ded to the names we want.

diff --git a/debian/patches/series b/debian/patches/series
index ab02402..ef2e4d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@
 0002-Use-OpenArena-directory-names-in-HOME-on-Unix-Window.patch
 0003-Replace-the-conditionalized-hard-coded-names-in-q_sh.patch
 0004-OpenArena-adjustable-console-size.patch
-0005-Call-the-executables-oa_ded-openarena-openarena-smp.patch
 0006-Remove-punkbuster-flag-from-server-info.patch
 0007-Don-t-send-heartbeat-to-master-servers-unless-new-sv.patch
 0008-Remove-remnants-of-sv_strictAuth.patch
diff --git a/debian/rules b/debian/rules
index f7872bb..e8216f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,9 +67,9 @@ install: build
 	install -d debian/tmp/usr/games
 	install -d debian/tmp/usr/lib/games/openarena/baseoa/
 	install -d debian/tmp/usr/lib/games/openarena/missionpack/
-	install engine/build/release-$(Q3PLATFORM)-$(Q3ARCH)/openarena.$(Q3ARCH) \
+	install engine/build/release-$(Q3PLATFORM)-$(Q3ARCH)/ioquake3.$(Q3ARCH) \
 		debian/tmp/usr/games/openarena
-	install engine/build/release-$(Q3PLATFORM)-$(Q3ARCH)/oa_ded.$(Q3ARCH) \
+	install engine/build/release-$(Q3PLATFORM)-$(Q3ARCH)/ioq3ded.$(Q3ARCH) \
 		debian/tmp/usr/games/openarena-server
 	install -m644 game/build/release-$(Q3PLATFORM)-$(Q3ARCH)/baseq3/*.so \
 		debian/tmp/usr/lib/games/openarena/baseoa/
diff --git a/debian/patches/0005-Call-the-executables-oa_ded-openarena-openarena-smp.patch b/debian/unapplied/0005-Call-the-executables-oa_ded-openarena-openarena-smp.patch
similarity index 100%
rename from debian/patches/0005-Call-the-executables-oa_ded-openarena-openarena-smp.patch
rename to debian/unapplied/0005-Call-the-executables-oa_ded-openarena-openarena-smp.patch

-- 
Packaging for the OpenArena engine