r6922 - in packages/trunk/monsterz/debian: . patches

[Samuel Hocevar]

Author: sho
Date: 2008-05-09 16:36:44 +0000 (Fri, 09 May 2008)
New Revision: 6922

Added:
   packages/trunk/monsterz/debian/patches/010_64-bit-alignment-issues-with-python2.5.diff
Modified:
   packages/trunk/monsterz/debian/changelog
   packages/trunk/monsterz/debian/patches/series
Log:
 * debian/patches/010_64-bit-alignment-issues-with-python2.5.diff:
   + New patch from upstream. Fix a startup crash on 64-bit systems.


Modified: packages/trunk/monsterz/debian/changelog
===================================================================
--- packages/trunk/monsterz/debian/changelog	2008-05-09 16:34:45 UTC (rev 6921)
+++ packages/trunk/monsterz/debian/changelog	2008-05-09 16:36:44 UTC (rev 6922)
@@ -6,6 +6,9 @@
   * debian/control:
     + Use quilt for patch management.
 
+  * debian/patches/010_64-bit-alignment-issues-with-python2.5.diff:
+    + New patch from upstream. Fix a startup crash on 64-bit systems.
+
  -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Fri, 09 May 2008 16:33:52 +0000
 
 monsterz (0.7.1-1) unstable; urgency=high

Added: packages/trunk/monsterz/debian/patches/010_64-bit-alignment-issues-with-python2.5.diff
===================================================================
--- packages/trunk/monsterz/debian/patches/010_64-bit-alignment-issues-with-python2.5.diff	                        (rev 0)
+++ packages/trunk/monsterz/debian/patches/010_64-bit-alignment-issues-with-python2.5.diff	2008-05-09 16:36:44 UTC (rev 6922)
@@ -0,0 +1,26 @@
+Index: monsterz-0.7.1/monsterz.py
+===================================================================
+--- monsterz-0.7.1.orig/monsterz.py	2008-05-09 16:35:25.000000000 +0000
++++ monsterz-0.7.1/monsterz.py	2008-05-09 16:35:33.000000000 +0000
+@@ -108,7 +108,9 @@
+                 M = int(max(r, g, b))
+                 m = int(min(r, g, b))
+                 val = (2 * M + r + g + b) / 5
+-                p[:] = (val + r) / 2, (val + g) / 2, (val + b) / 2
++                p[0] = (val + r) / 2
++                p[1] = (val + g) / 2
++                p[2] = (val + b) / 2
+                 if alpha[y][x] >= 250:
+                     alpha[y][x] = 255 - (M - m) * 3 / 4
+         del pixels
+@@ -129,7 +131,9 @@
+                 r, g, b = p
+                 M = int(max(r, g, b))
+                 m = int(min(r, g, b))
+-                p[:] = (m + r) / 2, (m + g) / 2, (m + b) / 2
++                p[0] = (m + r) / 2
++                p[1] = (m + g) / 2
++                p[2] = (m + b) / 2
+                 if alpha[y][x] >= 250:
+                     alpha[y][x] = 255 - M * 2 / 3
+         del pixels

Modified: packages/trunk/monsterz/debian/patches/series
===================================================================
--- packages/trunk/monsterz/debian/patches/series	2008-05-09 16:34:45 UTC (rev 6921)
+++ packages/trunk/monsterz/debian/patches/series	2008-05-09 16:36:44 UTC (rev 6922)
@@ -1 +1,2 @@
 
+010_64-bit-alignment-issues-with-python2.5.diff