[SCM] WarMUX PKG branch, master, updated. 56e3341e6284e349bc18f9d2f25a3d896d61f2c8

[Felix Geyer]

The following commit has been merged in the master branch:
commit b6d9acc4065ee741768af08e594a253023f31ac7
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Fri Jun 17 13:30:56 2011 +0200

    Drop 05_fix_build_s390.patch, fixed upstream.

diff --git a/debian/changelog b/debian/changelog
index 42b9edb..6ba9c41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ warmux (1:11.04.1+repack-1) UNRELEASED; urgency=low
     - Use the DejaVu Sans font instead.
   * Update the package description as Warmux supports playing against
     computer opponents. (Closes: #624798)
+  * Drop 05_fix_build_s390.patch, fixed upstream.
 
  -- Felix Geyer <debfx-pkg at fobos.de>  Sun, 15 May 2011 18:21:43 +0200
 
diff --git a/debian/patches/05_fix_build_s390.patch b/debian/patches/05_fix_build_s390.patch
deleted file mode 100644
index bc3577a..0000000
--- a/debian/patches/05_fix_build_s390.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix FTBFS on s390.
-Author: Felix Geyer <debfx-pkg at fobos.de>
-Bug: http://gna.org/bugs/?17738
-Bug-Debian: http://bugs.debian.org/602822
-
---- warmux-11.01+repack.orig/lib/fixedpoint/fixed_class.h
-+++ warmux-11.01+repack/lib/fixedpoint/fixed_class.h
-@@ -77,9 +77,7 @@ struct fixed_point {
-   /*explicit*/ fixed_point(float f) : intValue(float2fix<p>(f)) {}
-   /*explicit*/ fixed_point(double d) : intValue(float2fix<p>((float)d)) {}
-   /*explicit*/ fixed_point(unsigned int u) : intValue(((fixint_t)u) << p) {}
--#if LONG_MAX != INT_MAX
--  /*explicit*/ fixed_point(size_t i) : intValue(((fixint_t)i) << p) {}
--#endif
-+  /*explicit*/ fixed_point(unsigned long u) : intValue(((fixint_t)u) << p) {}
- 
-   fixed_point& operator += (const fixed_point& r) { intValue += r.intValue; return *this; }
-   fixed_point& operator -= (const fixed_point& r) { intValue -= r.intValue; return *this; }
diff --git a/debian/patches/series b/debian/patches/series
index 6a02767..c7e6ee0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
 02_desktop_file.patch
 03_respect_build_flags_from_env.patch
 04_fix_build_kfreebsd.patch
-05_fix_build_s390.patch

-- 
WarMUX PKG