Merge lp:~kamalmostafa/ubuntu/lucid/micropolis-activity/fix-505080-ftbfs into lp:ubuntu/lucid/micropolis-activity

[Kamal Mostafa]

[Iulian Udrea (iulian)]

Looks good.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2009-12-12 13:30:40 +0000
+++ debian/changelog	2010-01-09 09:06:18 +0000
@@ -1,3 +1,9 @@
+micropolis-activity (0.0.20071228-4ubuntu1) lucid; urgency=low
+
+  * Avoid SIGLOST==SIGPWR namespace collision on sparc (LP: #505080).
+
+ -- Kamal Mostafa <[e-mail]>  Sat, 09 Jan 2010 00:41:22 -0800
+
 micropolis-activity (0.0.20071228-4) unstable; urgency=low
 
   [ Christoph Egger ]
 
=== modified file 'debian/control'
--- debian/control	2009-12-12 13:30:40 +0000
+++ debian/control	2010-01-09 09:06:18 +0000
@@ -1,7 +1,8 @@
 Source: micropolis-activity
 Section: games
 Priority: extra
-Maintainer: Debian Games Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Games Team <[e-mail]>
 Uploaders: Miriam Ruiz <[e-mail]>,
  Kenshi Muto <[e-mail]>,
  Clint Adams <[e-mail]>,
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2009-12-12 13:30:40 +0000
+++ debian/patches/series	2010-01-09 09:06:18 +0000
@@ -1,3 +1,4 @@
 zerfleddert.20091012.patch
 makefile.patch
 micropolis-path.patch
+sparc-siglost.patch
 
=== added file 'debian/patches/sparc-siglost.patch'
--- debian/patches/sparc-siglost.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/sparc-siglost.patch	2010-01-09 09:06:18 +0000
@@ -0,0 +1,25 @@
+# Author: Kamal Mostafa <[e-mail]>
+# * Avoid SIGLOST==SIGPWR namespace collision on sparc (LP: #505080).
+
+=== modified file 'src/tcl/tclunxst.c'
+--- a/src/tcl/tclunxst.c	2008-12-28 00:18:24 +0000
++++ b/src/tcl/tclunxst.c	2010-01-09 08:29:56 +0000
+@@ -530,7 +530,7 @@
+ #ifdef SIGKILL
+ 	case SIGKILL: return "SIGKILL";
+ #endif
+-#if defined(SIGLOST) && (!defined(SIGIOT) || (SIGLOST != SIGIOT))
++#if defined(SIGLOST) && (!defined(SIGIOT) || (SIGLOST != SIGIOT)) && (!defined(SIGPWR) || (SIGLOST != SIGPWR))
+ 	case SIGLOST: return "SIGLOST";
+ #endif
+ #ifdef SIGPIPE
+@@ -662,7 +662,7 @@
+ #ifdef SIGKILL
+ 	case SIGKILL: return "kill signal";
+ #endif
+-#if defined(SIGLOST) && (!defined(SIGIOT) || (SIGLOST != SIGIOT))
++#if defined(SIGLOST) && (!defined(SIGIOT) || (SIGLOST != SIGIOT)) && (!defined(SIGPWR) || (SIGLOST != SIGPWR))
+ 	case SIGLOST: return "resource lost";
+ #endif
+ #ifdef SIGPIPE
+