[SCM] Packaging for teeworlds branch, master, updated. upstream/0.6.0-32-g4e91891

Felix Geyer debfx-pkg at fobos.de
Thu Aug 4 12:29:53 UTC 2011


The following commit has been merged in the master branch:
commit a9a208e5c9047c423d3b79128f1bab0c656094e4
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Thu Aug 4 11:43:56 2011 +0200

    Drop patches that have been applied upstream.

diff --git a/debian/changelog b/debian/changelog
index f07023c..f20f7f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ teeworlds (0.6.1-1) UNRELEASED; urgency=low
   * New upstream release.
   * Update watch file.
   * Refresh patches.
+  * Drop patches that have been applied upstream: fix-ftbfs-hurd.patch,
+    fix-ftbfs-kfreebsd.patch and gcc-endianness.patch.
 
  -- Felix Geyer <debfx-pkg at fobos.de>  Thu, 04 Aug 2011 11:30:35 +0200
 
diff --git a/debian/patches/fix-ftbfs-hurd.patch b/debian/patches/fix-ftbfs-hurd.patch
deleted file mode 100644
index 3b48de6..0000000
--- a/debian/patches/fix-ftbfs-hurd.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/base/detect.h b/src/base/detect.h
---- a/src/base/detect.h
-+++ b/src/base/detect.h
-@@ -46,6 +46,13 @@
- 	#define CONF_PLATFORM_STRING "linux"
- #endif
- 
-+#if defined(__GNU__) || defined(__gnu__)
-+	#define CONF_FAMILY_UNIX 1
-+	#define CONF_FAMILY_STRING "unix"
-+	#define CONF_PLATFORM_HURD 1
-+	#define CONF_PLATFORM_STRING "gnu"
-+#endif
-+
- #if defined(MACOSX) || defined(__APPLE__) || defined(__DARWIN__)
- 	#define CONF_FAMILY_UNIX 1
- 	#define CONF_FAMILY_STRING "unix"
diff --git a/debian/patches/fix-ftbfs-kfreebsd.patch b/debian/patches/fix-ftbfs-kfreebsd.patch
deleted file mode 100644
index 7ff4e19..0000000
--- a/debian/patches/fix-ftbfs-kfreebsd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- teeworlds-0.6.0.orig/src/base/detect.h
-+++ teeworlds-0.6.0/src/base/detect.h
-@@ -25,7 +25,7 @@
- #endif
-
- /* unix family */
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- 	#define CONF_FAMILY_UNIX 1
- 	#define CONF_FAMILY_STRING "unix"
- 	#define CONF_PLATFORM_FREEBSD 1
diff --git a/debian/patches/gcc-endianness.patch b/debian/patches/gcc-endianness.patch
deleted file mode 100644
index e45227a..0000000
--- a/debian/patches/gcc-endianness.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/src/base/detect.h b/src/base/detect.h
---- a/src/base/detect.h
-+++ b/src/base/detect.h
-@@ -69,35 +69,56 @@
- #endif
- 
- 
-+/* endianess on gcc */
-+#ifdef __GNUC__
-+	#include <endian.h>
-+	#if __BYTE_ORDER == __LITTLE_ENDIAN
-+		#define CONF_ARCH_ENDIAN_LITTLE 1
-+	#elif __BYTE_ORDER == __BIG_ENDIAN
-+		#define CONF_ARCH_ENDIAN_BIG 1
-+	#endif
-+#endif
-+
-+
- /* architectures */
- #if defined(i386) || defined(__i386__) || defined(__x86__) || defined(CONF_PLATFORM_WIN32)
- 	#define CONF_ARCH_IA32 1
- 	#define CONF_ARCH_STRING "ia32"
--	#define CONF_ARCH_ENDIAN_LITTLE 1
-+	#if !defined(CONF_ARCH_ENDIAN_LITTLE) && !defined(CONF_ARCH_ENDIAN_BIG)
-+		#define CONF_ARCH_ENDIAN_LITTLE 1
-+	#endif
- #endif
- 
- #if defined(__ia64__)
- 	#define CONF_ARCH_IA64 1
- 	#define CONF_ARCH_STRING "ia64"
--	#define CONF_ARCH_ENDIAN_LITTLE 1
-+	#if !defined(CONF_ARCH_ENDIAN_LITTLE) && !defined(CONF_ARCH_ENDIAN_BIG)
-+		#define CONF_ARCH_ENDIAN_LITTLE 1
-+	#endif
- #endif
- 
- #if defined(__amd64__) || defined(__x86_64__)
- 	#define CONF_ARCH_AMD64 1
- 	#define CONF_ARCH_STRING "amd64"
--	#define CONF_ARCH_ENDIAN_LITTLE 1
-+	#if !defined(CONF_ARCH_ENDIAN_LITTLE) && !defined(CONF_ARCH_ENDIAN_BIG)
-+		#define CONF_ARCH_ENDIAN_LITTLE 1
-+	#endif
- #endif
- 
- #if defined(__powerpc__) || defined(__ppc__)
- 	#define CONF_ARCH_PPC 1
- 	#define CONF_ARCH_STRING "ppc"
--	#define CONF_ARCH_ENDIAN_BIG 1
-+	#if !defined(CONF_ARCH_ENDIAN_LITTLE) && !defined(CONF_ARCH_ENDIAN_BIG)
-+		#define CONF_ARCH_ENDIAN_BIG 1
-+	#endif
- #endif
- 
- #if defined(__sparc__)
- 	#define CONF_ARCH_SPARC 1
- 	#define CONF_ARCH_STRING "sparc"
--	#define CONF_ARCH_ENDIAN_BIG 1
-+	#if !defined(CONF_ARCH_ENDIAN_LITTLE) && !defined(CONF_ARCH_ENDIAN_BIG)
-+		#define CONF_ARCH_ENDIAN_BIG 1
-+	#endif
- #endif
- 
- 
diff --git a/debian/patches/series b/debian/patches/series
index d02778a..7cc41df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,3 @@ system-libs.patch
 new-wavpack.patch
 set-data-dir.patch
 pass-build-flags.patch
-fix-ftbfs-kfreebsd.patch
-gcc-endianness.patch
-fix-ftbfs-hurd.patch

-- 
Packaging for teeworlds



More information about the Pkg-games-commits mailing list