[SCM] team based FPS game - packaging branch, debian, updated. debian/1.1.0-4.1-11-g4d49579

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 4d495795397857cb84368a7b20d58a131f9c84f1
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Jul 17 04:31:08 2010 +0100

    Install the fixed joinserver.menu in a pk3 file with a "late" filename
    
    This means it actually overrides the buggy one in tremulous-data.

diff --git a/debian/control b/debian/control
index 34a97b9..330fca1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: contrib/games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Simon McVittie <smcv at debian.org>
-Build-Depends: debhelper (>= 5.0.0), libopenal-dev, libsdl1.2-dev
+Build-Depends: debhelper (>= 5.0.0), libopenal-dev, libsdl1.2-dev, zip
 Standards-Version: 3.7.2.0
 Vcs-Git: git://git.debian.org/git/pkg-games/tremulous.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/tremulous.git
diff --git a/debian/rules b/debian/rules
index abc24f1..123d8eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,7 @@ clean:
 	# and then it stopped
 	dh_clean
 
+	rm -f debian/*.pk3
 	rm -f build-arch-stamp
 	-$(MAKE) distclean
 	-rm -f changelog
@@ -87,10 +88,9 @@ install-arch:
 	#dh_install -ptremulous-server debian/tremulous-server.desktop usr/share/applications # FIXME: waiting for dh_desktop to do this job...
 	#dh_install -ptremulous-server debian/tremulous.xpm usr/share/pixmaps
 
-	# this would normally be in a .pk3 in tremulous-data, but as per
-	# http://patches.mercenariesguild.net/index.php?do=details&task_id=161
-	# it works fine as a loose file overriding the .pk3
-	dh_install -ptremulous ui/joinserver.menu usr/share/games/tremulous/base
+	# this would normally be in a .pk3 in tremulous-data...
+	zip -9 debian/z-debian-tremulous-ui-fixes.pk3 ui/joinserver.menu
+	dh_install -ptremulous debian/z-debian-tremulous-ui-fixes.pk3 usr/share/games/tremulous/base
 
 	dh_installman -ptremulous-server debian/tremulous-server.6
 

-- 
team based FPS game - packaging