[SCM] Packagaging for Micropolis branch, master, updated. debian/0.0.20071228-2-22-g1893f86

[Christoph Egger]

The following commit has been merged in the master branch:
commit 1893f86a19e078bf6c0b64f3244cf51398e18307
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date:   Sat Jan 9 19:32:40 2010 +0100

    Fix version number for last upload as was done before uploading but not commited and somehow lost
    Import updated zerfleddert patch which makes micropolis-activity build on sparc

diff --git a/debian/changelog b/debian/changelog
index 4ef81bf..c23a832 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,12 @@
 micropolis-activity (0.0.20071228-5) unstable; urgency=low
 
+  * Update zerfleddert patch fixing the sparc issue (Closes: #564319)
+    (LP: #505080), thanks to Kamal Mostafa for the report and the patch
+
+ -- Christoph Egger <christoph at debian.org>  Sat, 09 Jan 2010 19:09:30 +0100
+
+micropolis-activity (0.0.20071228-4) unstable; urgency=low
+
   [ Christoph Egger ]
   * Update Vcs-* fields to follow reality
   * Update my E-Mail Address
diff --git a/debian/patches/series b/debian/patches/series
index 8737fa1..13bf006 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-zerfleddert.20091012.patch
+zerfleddert.20100109.patch
 makefile.patch
 micropolis-path.patch
diff --git a/debian/patches/zerfleddert.20091012.patch b/debian/patches/zerfleddert.20100109.patch
similarity index 99%
rename from debian/patches/zerfleddert.20091012.patch
rename to debian/patches/zerfleddert.20100109.patch
index aaf538a..e4eb520 100644
--- a/debian/patches/zerfleddert.20091012.patch
+++ b/debian/patches/zerfleddert.20100109.patch
@@ -1,6 +1,6 @@
 # Copyright (C) 2009 Michael Gernoth <debian at gernoth.net>
 # Obtained from GIT Repository at git://git.zerfleddert.de/micropolis
-# Last change: 12 Oct 2009
+# Last change: Mon, 14 Jan 2008 22:57:53 +0000
 # Distributed under the same license as the game. See debian/copyright.
 #
 # Fixes: allow overriding $CC for tclx
@@ -68,7 +68,14 @@
          fix 15 bit mode
          initialize HostName
          fix height of windows in column 1
-         correctly resize editor window 
+         correctly resize editor window to be in sync with the ...
+         resize editor when resizing window
+         allow window to be resized
+         add afplay to player script
+         inform user, when no audio player is found
+         search for available audioplayer
+         disable image translation until a case is found where ...
+         fix for main window not appearing on all window managers
 
 diff --git a/.gitignore b/.gitignore
 new file mode 100644
@@ -7554,6 +7561,28 @@ index a4c5cab..daa298c 100644
  //#ifndef IS_LINUX
  //extern char *sys_errlist[];
  //#endif
+diff --git a/src/tcl/tclunxst.c b/src/tcl/tclunxst.c
+index 89fb0cd..fcc1d3b 100644
+--- a/src/tcl/tclunxst.c
++++ b/src/tcl/tclunxst.c
+@@ -530,7 +530,7 @@ Tcl_SignalId(sig)
+ #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 @@ Tcl_SignalMsg(sig)
+ #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
 diff --git a/src/tclx/config.mk b/src/tclx/config.mk
 index 22d43cb..69ca791 100644
 --- a/src/tclx/config.mk

-- 
Packagaging for Micropolis