[openarena] 05/07: Adjust logic for installing 0.8.1-, 0.8.5- and 0.8.8-compatible modules

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository openarena.

commit 7a1b8af64866efab0e9e53534a9d826dc63e1843
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Apr 29 10:19:51 2015 +0100

    Adjust logic for installing 0.8.1-, 0.8.5- and 0.8.8-compatible modules
    
      - on the client, move the real files for the 0.8.5/0.8.8-compatible
        version into a pak6-patch088 subdirectory, so it is a little clearer
        that it (deliberately) differs from the 0.8.1-compatible version in
        the pak0 subdirectory
      - on the client, the fallback version for unknown servers is now
        a symlink into pak6-patch088 to make it clearer which version is used
      - on the client, the pak6-patch085 version is a symlink into
        pak6-patch088 (they appear to be compatible)
      - on the server, stop installing the 0.8.1-compatible version: the
        server controls which dialect of the network protocol is used,
        so only the 0.8.8 game code is necessary (Closes: #781385)
      - on the server, stop installing cgame and ui modules: the server
        only needs the qagame module
---
 debian/changelog                | 14 ++++++++++++++
 debian/openarena-server.install |  1 -
 debian/rules                    | 27 ++++++++++++++++++++-------
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d4ebd67..c082406 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,20 @@ openarena (0.8.8-12) UNRELEASED; urgency=medium
     are re-ordered
   * Use Debian changelog date as a replacement for __DATE__, for reproducible
     builds
+  * Adjust logic for installing 0.8.1-, 0.8.5- and 0.8.8-compatible modules:
+    - on the client, move the real files for the 0.8.5/0.8.8-compatible
+      version into a pak6-patch088 subdirectory, so it is a little clearer
+      that it (deliberately) differs from the 0.8.1-compatible version in
+      the pak0 subdirectory
+    - on the client, the fallback version for unknown servers is now
+      a symlink into pak6-patch088 to make it clearer which version is used
+    - on the client, the pak6-patch085 version is a symlink into
+      pak6-patch088 (they appear to be compatible)
+    - on the server, stop installing the 0.8.1-compatible version: the
+      server controls which dialect of the network protocol is used,
+      so only the 0.8.8 game code is necessary (Closes: #781385)
+    - on the server, stop installing cgame and ui modules: the server
+      only needs the qagame module
 
  -- Simon McVittie <smcv at debian.org>  Wed, 29 Apr 2015 08:42:12 +0100
 
diff --git a/debian/openarena-server.install b/debian/openarena-server.install
index ce7b597..6cea677 100644
--- a/debian/openarena-server.install
+++ b/debian/openarena-server.install
@@ -3,4 +3,3 @@ debian/scripts/openarena-server usr/games
 debian/openarena-server at .service lib/systemd/system
 
 debian/tmp/usr/lib/openarena-server/*/*.so
-debian/tmp/usr/lib/openarena-server/*/*/*.so
diff --git a/debian/rules b/debian/rules
index 815d4b8..8715ad2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -88,20 +88,33 @@ override_dh_auto_clean:
 override_dh_auto_install:
 	install -d debian/tmp/usr/games
 	install -d debian/tmp/usr/lib/openarena/baseoa/pak0/
+	install -d debian/tmp/usr/lib/openarena/baseoa/pak6-patch085/
+	install -d debian/tmp/usr/lib/openarena/baseoa/pak6-patch088/
 	install -d debian/tmp/usr/lib/openarena/missionpack/
-	install -d debian/tmp/usr/lib/openarena-server/baseoa/pak0/
+	install -d debian/tmp/usr/lib/openarena-server/baseoa/
 	install -d debian/tmp/usr/lib/openarena-server/missionpack/
-	install -m644 build/release-$(Q3PLATFORM)-$(Q3ARCH)/baseq3/*.so \
-		debian/tmp/usr/lib/openarena/baseoa/
+	# The client currently needs two builds:
+	# * one compatible with OA 0.8.1 pure servers
+	# * one compatible with OA 0.8.5 and 0.8.8 pure servers
+	# On impure servers, we default to the latest.
 	install -m644 build-0.8.1-compat/release-$(Q3PLATFORM)-$(Q3ARCH)/baseq3/*.so \
 		debian/tmp/usr/lib/openarena/baseoa/pak0/
+	install -m644 build/release-$(Q3PLATFORM)-$(Q3ARCH)/baseq3/*.so \
+		debian/tmp/usr/lib/openarena/baseoa/pak6-patch088
+	( cd debian/tmp/usr/lib/openarena/baseoa/pak6-patch085 && \
+		ln -s ../pak6-patch088/*.so . )
+	( cd debian/tmp/usr/lib/openarena/baseoa && \
+		ln -s pak6-patch088/*.so . )
+	# The "mission pack" doesn't currently have incompatible versions so
+	# just use the latest
 	install -m644 build/release-$(Q3PLATFORM)-$(Q3ARCH)/missionpack/*.so\
 		debian/tmp/usr/lib/openarena/missionpack/
-	install -m644 build/release-$(Q3PLATFORM)-$(Q3ARCH)/baseq3/*.so \
+	# The server only needs the latest version, since it's the server
+	# that determines which version clients are expected to be
+	# compatible with
+	install -m644 build/release-$(Q3PLATFORM)-$(Q3ARCH)/baseq3/qagame*.so \
 		debian/tmp/usr/lib/openarena-server/baseoa/
-	install -m644 build-0.8.1-compat/release-$(Q3PLATFORM)-$(Q3ARCH)/baseq3/*.so \
-		debian/tmp/usr/lib/openarena-server/baseoa/pak0/
-	install -m644 build/release-$(Q3PLATFORM)-$(Q3ARCH)/missionpack/*.so\
+	install -m644 build/release-$(Q3PLATFORM)-$(Q3ARCH)/missionpack/qagame*.so\
 		debian/tmp/usr/lib/openarena-server/missionpack/
 	convert -scale 32x32 debian/openarena128.png debian/openarena32.xpm
 	sh debian/link-modules.sh $(Q3ARCH)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openarena.git