The following commit has been merged in the master branch:
commit a294704aa8c1239a6e91c5ae10a00de03e3363e3
Author: Felix Geyer <[email protected]>
Date: Fri Nov 11 11:59:44 2011 +0100
Drop 03_detect_endianness_glibc.patch, merged upstream.
diff --git a/debian/changelog b/debian/changelog
index bb16629..fd87a01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
blobby (0.9c-1) UNRELEASED; urgency=low
* New upstream release.
+ * Drop 03_detect_endianness_glibc.patch, merged upstream.
* Enable parallel building.
* Switch to source format 3.0 (quilt).
- Add unapply-patches and abort-on-upstream-changes to local-options.
diff --git a/debian/patches/03_detect_endianness_glibc.patch
b/debian/patches/03_detect_endianness_glibc.patch
deleted file mode 100644
index 528a70b..0000000
--- a/debian/patches/03_detect_endianness_glibc.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Fix FTBFS on s390 and sh4
-Author: Felix Geyer <[email protected]>
-Bug: https://sourceforge.net/apps/mantisbt/blobby/view.php?id=12
-Bug-Debian: http://bugs.debian.org/572025
-
---- a/src/raknet/Types.h
-+++ b/src/raknet/Types.h
-@@ -98,6 +98,18 @@
- * - COMPILER_BORLANDC
- */
-
-+#include <stdlib.h>
-+
-+#if defined(__GLIBC__) && !defined(HOST_ENDIAN_IS_BIG) &&
!defined(HOST_ENDIAN_IS_LITTLE)
-+ #include <endian.h>
-+
-+ #if (__BYTE_ORDER == __LITTLE_ENDIAN)
-+ #define HOST_ENDIAN_IS_LITTLE
-+ #elif (__BYTE_ORDER == __BIG_ENDIAN)
-+ #define HOST_ENDIAN_IS_BIG
-+ #endif
-+#endif
-+
- // CB: Something strange happens with the system includes on
- // Linux and BIG_ENDIAN ends up defined at some point, so
- // we need to use HOST_ENDIAN_IS_BIG instead. This code is
-@@ -140,23 +152,11 @@ namespace cat
- // LITTLE_ENDIAN or BIG_ENDIAN (endian.h)
- // dalfy
- #if !defined(BIG_ENDIAN) && !defined(LITTLE_ENDIAN)
--#if defined(__sparc) || defined(__sparc__) || defined(__powerpc__) || \
-- defined(__ppc__) || defined(__hppa) || defined(_MIPSEB) ||
defined(_POWER) || \
-- defined(_M_PPC) || defined(_M_MPPC) || defined(_M_MRX000) || \
-- defined(__POWERPC) || defined(m68k) || defined(powerpc) || \
-- defined(sel) || defined(pyr) || defined(mc68000) || defined(is68k) || \
-- defined(tahoe) || defined(ibm032) || defined(ibm370) || defined(MIPSEB)
|| \
-- defined(__convex__) || defined(DGUX) || defined(hppa) ||
defined(apollo) || \
-- defined(_CRAY) || defined(__hp9000) || defined(__hp9000s300) ||
defined(_AIX) || \
-- defined(__AIX) || defined(__pyr__) || defined(hp9000s700) ||
defined(_IBMR2) || defined(__ARMEB__)
-+#if defined(HOST_ENDIAN_IS_BIG)
-
- # define BIG_ENDIAN
-
--#elif defined(__i386__) || defined(i386) || defined(intel) ||
defined(_M_IX86) || \
-- defined(__amd64) || defined(__amd64__) || \
-- defined(__alpha__) || defined(__alpha) || defined(__ia64) ||
defined(__ia64__) || \
-- defined(_M_ALPHA) || defined(ns32000) || defined(__ns32000__) ||
defined(sequent) || \
-- defined(MIPSEL) || defined(_MIPSEL) || defined(sun386) ||
defined(__sun386__) || defined(__ARMEL__)
-+#elif defined(HOST_ENDIAN_IS_LITTLE)
-
- # define LITTLE_ENDIAN
-
diff --git a/debian/patches/series b/debian/patches/series
index 26c6888..ce60635 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
01_sdl_default.patch
02_use_system_lua.patch
-03_detect_endianness_glibc.patch
04_use_system_tinyxml.patch
--
blobby Debian packaging
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
