[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.1-7-17-g7521e4f

[Simon McVittie]

The following commit has been merged in the master branch:
commit c712f0cb40b457e39e67dd846554b1724926a7c4
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Dec 1 00:39:39 2009 +0000

    debian/rules: install the shared-object game logic in openarena-server
    
    We could add an openarena-common package later if needed, but
    openarena-server is only 764K and doesn't add any dependencies, so
    there seems no point.

diff --git a/debian/control b/debian/control
index 5eba871..fbb51c6 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Homepage: http://openarena.ws/
 
 Package: openarena
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, openarena-data (>= 0.7.7)
+Depends: ${misc:Depends}, ${shlibs:Depends}, openarena-data (>= 0.7.7),
+         openarena-server (= ${binary:Version})
 Description: fast-paced 3D first-person shooter
  OpenArena is an open-source content package for ioQuake3 licensed under the
  GPL, effectively creating a free stand-alone game. Though OpenArena is a free
@@ -31,4 +32,5 @@ Description: game server for the game OpenArena
  replacement for id Software Inc.'s Quake 3 Arena, it is NOT compatible with
  the proprietary game!
  .
- This package installs the OpenArena dedicated server.
+ This package installs the OpenArena dedicated server, and the game logic files
+ needed by both the client and the server.
diff --git a/debian/openarena-server.install b/debian/openarena-server.install
index bbc79d1..714e52f 100644
--- a/debian/openarena-server.install
+++ b/debian/openarena-server.install
@@ -1 +1,2 @@
-debian/tmp/openarena-server usr/games
+debian/tmp/usr/games/openarena-server
+debian/tmp/usr/lib/games/openarena/*/*.so
diff --git a/debian/openarena.install b/debian/openarena.install
index ad712c6..40b715b 100644
--- a/debian/openarena.install
+++ b/debian/openarena.install
@@ -1,4 +1,4 @@
-debian/tmp/openarena usr/games
+debian/tmp/usr/games/openarena
 debian/openarena.desktop usr/share/applications
 debian/openarena128.png usr/share/icons/hicolor/128x128/apps
 debian/openarena32.xpm usr/share/pixmaps
diff --git a/debian/rules b/debian/rules
index 8f4e117..e42d913 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,9 +45,17 @@ install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	mkdir -p debian/tmp
-	cp build/release-$(Q3PLATFORM)-$(Q3ARCH)/openarena.$(Q3ARCH) debian/tmp/openarena
-	cp build/release-$(Q3PLATFORM)-$(Q3ARCH)/oa_ded.$(Q3ARCH) debian/tmp/openarena-server
+	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 build/release-$(Q3PLATFORM)-$(Q3ARCH)/openarena.$(Q3ARCH) \
+		debian/tmp/usr/games/openarena
+	install build/release-$(Q3PLATFORM)-$(Q3ARCH)/oa_ded.$(Q3ARCH) \
+		debian/tmp/usr/games/openarena-server
+	install -m644 build/release-$(Q3PLATFORM)-$(Q3ARCH)/baseoa/*.so \
+		debian/tmp/usr/lib/games/openarena/baseoa/
+	install -m644 build/release-$(Q3PLATFORM)-$(Q3ARCH)/missionpack/*.so\
+		debian/tmp/usr/lib/games/openarena/missionpack/
 	convert -scale 32x32 debian/openarena128.png debian/openarena32.xpm
 	dh_install
 	dh_installdirs

-- 
Packaging for the OpenArena engine