[SCM] WarMUX PKG branch, master, updated. 1fbcfe74ab3fb2e1b3edd034f7900b145cce2031

[Felix Geyer]

The following commit has been merged in the master branch:
commit ae20509767b17005a41ae1e578737dd5f8e23414
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Tue Feb 15 22:36:50 2011 +0100

    Fix FTBFS on s390.
    
    Closes: #602822

diff --git a/debian/changelog b/debian/changelog
index eabb422..d51dbe2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,10 @@ warmux (1:11.01+repack-1) UNRELEASED; urgency=low
   * Repack orig tarball to remove embedded source code of various libraries.
     - Add 01_fix_repack_configure.patch
   * Rename the Ukrainian translation to the corrent locale code "uk".
+  * Fix FTBFS on s390. (Closes: #602822)
+    - Add 05_fix_build_s390.patch
 
- -- Felix Geyer <debfx-pkg at fobos.de>  Sun, 13 Feb 2011 18:32:50 +0100
+ -- Felix Geyer <debfx-pkg at fobos.de>  Tue, 15 Feb 2011 22:36:02 +0100
 
 wormux (1:0.9.2.1-1) experimental; urgency=low
 
diff --git a/debian/patches/05_fix_build_s390.patch b/debian/patches/05_fix_build_s390.patch
new file mode 100644
index 0000000..bc3577a
--- /dev/null
+++ b/debian/patches/05_fix_build_s390.patch
@@ -0,0 +1,18 @@
+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 c7e6ee0..6a02767 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02_desktop_file.patch
 03_respect_build_flags_from_env.patch
 04_fix_build_kfreebsd.patch
+05_fix_build_s390.patch

-- 
WarMUX PKG