[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.5-3-4-gf84d6dd

[Simon McVittie]

The following commit has been merged in the master branch:
commit 017fef787f9705a973be0ee5144462f56af58a2e
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Aug 22 20:10:31 2010 +0100

    Install 0.8.1-compatible binaries to a subdirectory

diff --git a/debian/changelog b/debian/changelog
index b2204d6..0629bba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+openarena (0.8.5-4) UNRELEASED; urgency=low
+
+  * Build a second copy of the game logic and install it in a subdirectory.
+    It turns out that OpenArena 0.8.1 and 0.8.5 aren't network-compatible;
+    on impure servers we can't be any better than the QVMs, but on pure
+    servers we can at least load the corresponding game logic.
+    (Closes: #592965 if openarena-data is also updated)
+
+ -- Simon McVittie <smcv at debian.org>  Sat, 21 Aug 2010 00:02:54 +0100
+
 openarena (0.8.5-3) unstable; urgency=medium
 
   * Add patch from oax r203 to fix server crashes if a player joins, then
diff --git a/debian/openarena-server.install b/debian/openarena-server.install
index 714e52f..e475b7d 100644
--- a/debian/openarena-server.install
+++ b/debian/openarena-server.install
@@ -1,2 +1,3 @@
 debian/tmp/usr/games/openarena-server
 debian/tmp/usr/lib/games/openarena/*/*.so
+debian/tmp/usr/lib/games/openarena/*/*/*.so
diff --git a/debian/rules b/debian/rules
index e8216f8..67adff2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,11 +44,17 @@ GAME_OPTIONS = \
 	BUILD_GAME_SO=1 \
 	CROSS_COMPILING=1
 
+GAME_081_OPTIONS = \
+	$(GAME_OPTIONS) \
+	BUILD_DIR=build-0.8.1-compat \
+	OPENARENA_081_COMPATIBLE=1
+
 build: build-stamp
 build-stamp:
 	dh_testdir
 	$(MAKE) -C engine $(ENGINE_OPTIONS)
 	$(MAKE) -C game $(GAME_OPTIONS)
+	$(MAKE) -C game $(GAME_081_OPTIONS)
 	touch $@
 
 clean:
@@ -57,6 +63,7 @@ clean:
 	rm -f build-stamp
 	rm -rf engine/build
 	rm -rf game/build
+	rm -rf game/build-0.8.1-compat
 	rm -f debian/openarena32.xpm
 	dh_clean
 
@@ -65,7 +72,7 @@ install: build
 	dh_testroot
 	dh_clean -k
 	install -d debian/tmp/usr/games
-	install -d debian/tmp/usr/lib/games/openarena/baseoa/
+	install -d debian/tmp/usr/lib/games/openarena/baseoa/pak0/
 	install -d debian/tmp/usr/lib/games/openarena/missionpack/
 	install engine/build/release-$(Q3PLATFORM)-$(Q3ARCH)/ioquake3.$(Q3ARCH) \
 		debian/tmp/usr/games/openarena
@@ -73,6 +80,8 @@ install: build
 		debian/tmp/usr/games/openarena-server
 	install -m644 game/build/release-$(Q3PLATFORM)-$(Q3ARCH)/baseq3/*.so \
 		debian/tmp/usr/lib/games/openarena/baseoa/
+	install -m644 game/build-0.8.1-compat/release-$(Q3PLATFORM)-$(Q3ARCH)/baseq3/*.so \
+		debian/tmp/usr/lib/games/openarena/baseoa/pak0/
 	install -m644 game/build/release-$(Q3PLATFORM)-$(Q3ARCH)/missionpack/*.so\
 		debian/tmp/usr/lib/games/openarena/missionpack/
 	convert -scale 32x32 debian/openarena128.png debian/openarena32.xpm

-- 
Packaging for the OpenArena engine