[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 933855b314406ade0dede75b1b38d20be403bb9a
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Jul 17 04:18:24 2010 +0100

    Apply part of upstream r756 to fix sorting by ping, and install the modified menu to override the one in tremulous-data (Closes: #476621)

diff --git a/debian/changelog b/debian/changelog
index 75b61e8..20c140d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ tremulous (1.1.0-5) UNRELEASED; urgency=low
     (Closes: 485579)
   * Apply part of upstream r785 to fix disappearing cursor on errors
     (Closes: #473848)
+  * Apply part of upstream r756 to fix sorting by ping, and install the
+    modified menu to override the one in tremulous-data (Closes: #476621)
 
  -- Simon McVittie <smcv at debian.org>  Mon, 12 Jul 2010 22:22:25 +0100
 
diff --git a/debian/patches/0008-Fixed-sort-by-ping.patch b/debian/patches/0008-Fixed-sort-by-ping.patch
new file mode 100644
index 0000000..427e0be
--- /dev/null
+++ b/debian/patches/0008-Fixed-sort-by-ping.patch
@@ -0,0 +1,23 @@
+From: Tim Angus <tma>
+Date: Thu, 15 Jul 2010 23:57:17 +0100
+Subject: [PATCH] Fixed sort by ping
+
+Origin: upstream, commit:756
+---
+ ui/joinserver.menu |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/ui/joinserver.menu b/ui/joinserver.menu
+index 38ee1b1..37d30a9 100644
+--- a/ui/joinserver.menu
++++ b/ui/joinserver.menu
+@@ -411,7 +411,7 @@
+       action
+       {
+         play "sound/misc/menu1.wav"; 
+-        uiScript ServerSort 4; 
++        uiScript ServerSort 3; 
+       
+         setitemcolor grpColumn backcolor 0 0 0 0; 
+         setitemcolor pingColumn backcolor 0.3 1 1 0.5
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 64e47e8..337a431 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-Fix-unaligned-access-issue.patch
 0006-fix-abuse-of-strcpy-overlapping-source-and-dest.patch
 0007-Fix-to-disappearing-cursor-on-map-load-Com_Error-bug.patch
+0008-Fixed-sort-by-ping.patch
diff --git a/debian/rules b/debian/rules
index 9b5a6d9..abc24f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,6 +87,11 @@ 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
+
 	dh_installman -ptremulous-server debian/tremulous-server.6
 
 	dh_install -s

-- 
team based FPS game - packaging