Ubuntu
micropolis-activity package

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

  1. Lucid (10.04)
  2. fix-505080-ftbfs
  3. Merge into lucid
Proposed by Kamal Mostafa
Status: Merged
Merged at revision: not available
Proposed branch: lp:~kamalmostafa/ubuntu/lucid/micropolis-activity/fix-505080-ftbfs
Merge into: lp:ubuntu/lucid/micropolis-activity
Diff against target: 66 lines (+34/-1)
4 files modified
debian/changelog (+6/-0)
debian/control (+2/-1)
debian/patches/series (+1/-0)
debian/patches/sparc-siglost.patch (+25/-0)
To merge this branch: bzr merge lp:~kamalmostafa/ubuntu/lucid/micropolis-activity/fix-505080-ftbfs
Reviewer Review Type Date Requested Status
Iulian Udrea Approve
Ubuntu branches Pending
Review via email: mp+17068@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Iulian Udrea (iulian) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-12-12 13:30:40 +0000
3+++ debian/changelog 2010-01-09 09:06:18 +0000
4@@ -1,3 +1,9 @@
5+micropolis-activity (0.0.20071228-4ubuntu1) lucid; urgency=low
6+
7+ * Avoid SIGLOST==SIGPWR namespace collision on sparc (LP: #505080).
8+
9+ -- Kamal Mostafa <kamal@whence.com> Sat, 09 Jan 2010 00:41:22 -0800
10+
11 micropolis-activity (0.0.20071228-4) unstable; urgency=low
12
13 [ Christoph Egger ]
14
15=== modified file 'debian/control'
16--- debian/control 2009-12-12 13:30:40 +0000
17+++ debian/control 2010-01-09 09:06:18 +0000
18@@ -1,7 +1,8 @@
19 Source: micropolis-activity
20 Section: games
21 Priority: extra
22-Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
23+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
24+XSBC-Original-Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
25 Uploaders: Miriam Ruiz <little_miry@yahoo.es>,
26 Kenshi Muto <kmuto@debian.org>,
27 Clint Adams <schizo@debian.org>,
28
29=== modified file 'debian/patches/series'
30--- debian/patches/series 2009-12-12 13:30:40 +0000
31+++ debian/patches/series 2010-01-09 09:06:18 +0000
32@@ -1,3 +1,4 @@
33 zerfleddert.20091012.patch
34 makefile.patch
35 micropolis-path.patch
36+sparc-siglost.patch
37
38=== added file 'debian/patches/sparc-siglost.patch'
39--- debian/patches/sparc-siglost.patch 1970-01-01 00:00:00 +0000
40+++ debian/patches/sparc-siglost.patch 2010-01-09 09:06:18 +0000
41@@ -0,0 +1,25 @@
42+# Author: Kamal Mostafa <kamal@whence.com>
43+# * Avoid SIGLOST==SIGPWR namespace collision on sparc (LP: #505080).
44+
45+=== modified file 'src/tcl/tclunxst.c'
46+--- a/src/tcl/tclunxst.c 2008-12-28 00:18:24 +0000
47++++ b/src/tcl/tclunxst.c 2010-01-09 08:29:56 +0000
48+@@ -530,7 +530,7 @@
49+ #ifdef SIGKILL
50+ case SIGKILL: return "SIGKILL";
51+ #endif
52+-#if defined(SIGLOST) && (!defined(SIGIOT) || (SIGLOST != SIGIOT))
53++#if defined(SIGLOST) && (!defined(SIGIOT) || (SIGLOST != SIGIOT)) && (!defined(SIGPWR) || (SIGLOST != SIGPWR))
54+ case SIGLOST: return "SIGLOST";
55+ #endif
56+ #ifdef SIGPIPE
57+@@ -662,7 +662,7 @@
58+ #ifdef SIGKILL
59+ case SIGKILL: return "kill signal";
60+ #endif
61+-#if defined(SIGLOST) && (!defined(SIGIOT) || (SIGLOST != SIGIOT))
62++#if defined(SIGLOST) && (!defined(SIGIOT) || (SIGLOST != SIGIOT)) && (!defined(SIGPWR) || (SIGLOST != SIGPWR))
63+ case SIGLOST: return "resource lost";
64+ #endif
65+ #ifdef SIGPIPE
66+

Subscribers

People subscribed via source and target branches

to all changes: