[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 6a018463f761fc9db4ad0e2ca32df698890883f3
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jul 15 23:57:44 2010 +0100

    Apply part of upstream r785 to fix disappearing cursor on errors (Closes: #473848)

diff --git a/debian/changelog b/debian/changelog
index 8e90ba9..75b61e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ tremulous (1.1.0-5) UNRELEASED; urgency=low
   * Set dedicated cvar to 1 by default, to not advertise unconfigured servers
     to the master server; use "+set dedicated 2" to advertise your server
     (Closes: 485579)
+  * Apply part of upstream r785 to fix disappearing cursor on errors
+    (Closes: #473848)
 
  -- Simon McVittie <smcv at debian.org>  Mon, 12 Jul 2010 22:22:25 +0100
 
diff --git a/debian/patches/0007-Fix-to-disappearing-cursor-on-map-load-Com_Error-bug.patch b/debian/patches/0007-Fix-to-disappearing-cursor-on-map-load-Com_Error-bug.patch
new file mode 100644
index 0000000..41b1a40
--- /dev/null
+++ b/debian/patches/0007-Fix-to-disappearing-cursor-on-map-load-Com_Error-bug.patch
@@ -0,0 +1,23 @@
+From: Tim Angus <tma>
+Date: Thu, 15 Jul 2010 23:45:11 +0100
+Subject: [PATCH] Fix to disappearing cursor on map load Com_Error bug
+
+Origin: upstream, commit:785 (partial)
+Bug: http://bugzilla.icculus.org/show_bug.cgi?id=2699
+---
+ src/ui/ui_main.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c
+index 30b4c9f..7509d9b 100644
+--- a/src/ui/ui_main.c
++++ b/src/ui/ui_main.c
+@@ -5663,6 +5663,7 @@ void _UI_SetActiveMenu( uiMenuCommand_t menu ) {
+       }
+       Menus_CloseAll();
+       Menus_ActivateByName("main");
++      trap_Cvar_Set( "ui_loading", "0" );
+       trap_Cvar_VariableStringBuffer("com_errorMessage", buf, sizeof(buf));
+       if (strlen(buf)) {
+         if (!ui_singlePlayerActive.integer) {
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index a6d7705..64e47e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-Use-USER-as-default-player-name.patch
 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

-- 
team based FPS game - packaging