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

[Bruno Kleinert]

The following commit has been merged in the master branch:
commit fec9e0f22884836570adedf93e16e03090dcc615
Author: Bruno Kleinert <fuddl at tauware.de>
Date:   Wed Sep 9 14:02:28 2009 +0200

    Begin -4 revision
    
    Don't apply a the previously dropped macosx patch.
    
    Refresh micropolis-path.patch, because it depended on macosx.patch.

diff --git a/debian/changelog b/debian/changelog
index 26d2e65..2cc75c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+micropolis-activity (0.0.20071228-4) unstable; urgency=low
+
+  [ Christoph Egger ]
+  * Update Vcs-* fields to follow reality
+
+  [ Bruno "Fuddl" Kleinert ]
+  * Drop obsolete patch macosx-patch.patch. Its changes got overwritten by
+    another patch anyway ;-)
+  * Refresh and modify micropolis-path.patch. Micropolis uses X Shared Memory,
+    now. The usage of X Shared Memory was originally disabled because it was
+    buggy but Michael Gernoth's patch fixes the use of X Shared Memory.
+
+ -- Bruno "Fuddl" Kleinert <fuddl at debian.org>  Wed, 09 Sep 2009 13:49:14 +0200
+
 micropolis-activity (0.0.20071228-3) unstable; urgency=low
 
   * Apply latest patch from Michael Gernoth against the original source tree
diff --git a/debian/patches/micropolis-path.patch b/debian/patches/micropolis-path.patch
index eebd57e..36866fb 100644
--- a/debian/patches/micropolis-path.patch
+++ b/debian/patches/micropolis-path.patch
@@ -1,17 +1,17 @@
 # Copyright (C) 2008 by Kenshi Muto <kmuto at debian.org> 
 # Distributed under the same license as the game. See debian/copyright.
 
-Index: micropolis-activity-0.0.20071228/Micropolis
+Index: micropolis-activity/Micropolis
 ===================================================================
---- micropolis-activity-0.0.20071228.orig/Micropolis	2008-01-14 17:05:57.000000000 +0000
-+++ micropolis-activity-0.0.20071228/Micropolis	2008-01-14 17:05:57.000000000 +0000
+--- micropolis-activity.orig/Micropolis	2009-09-09 13:26:04.000000000 +0200
++++ micropolis-activity/Micropolis	2009-09-09 13:40:03.000000000 +0200
 @@ -1,7 +1,7 @@
  #!/bin/bash
 -export SIMHOME=`pwd`
 +export SIMHOME=/usr/share/games/micropolis
  echo "Starting Micropolis in $SIMHOME ... "
--res/sim -w $*
-+cd $SIMHOME && /usr/lib/games/micropolis/sim -w $*
+-res/sim $*
++cd $SIMHOME && /usr/lib/games/micropolis/sim $*
  
  #
  # Micropolis, Unix Version.  This game was released for the Unix platform
diff --git a/debian/patches/series b/debian/patches/series
index 5bb5842..1f2fede 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 zerfleddert.20090908.patch
 makefile.patch
-mac-osx.patch
 micropolis-path.patch

-- 
Packagaging for Micropolis