[Pkg-sdl-commits] [SCM] Packaging of SDL_net branch, master, updated. debian/1.2.7-3

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit 1d5ac6105dd9c68275b2f4ee68d53f6a9ae55162
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sun Dec 4 17:11:08 2011 +0000

    Convert to quilt, refresh and document (as per DEP-3) arm.patch

diff --git a/debian/patches/10_arm.dpatch b/debian/patches/10_arm.dpatch
deleted file mode 100644
index b161d05..0000000
--- a/debian/patches/10_arm.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_arm.dpatch by Mike Furr <mfurr at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./SDL_net.h /tmp/dpep-work.CCbAY3/sdl-net1.2-1.2.5/SDL_net.h
---- ./SDL_net.h	2003-02-09 19:33:26.000000000 -0500
-+++ /tmp/dpep-work.CCbAY3/sdl-net1.2-1.2.5/SDL_net.h	2005-07-02 18:06:02.700330364 -0400
-@@ -320,7 +320,7 @@
- /* Inline macro functions to read/write network data */
- 
- /* Warning, some systems have data access alignment restrictions */
--#if defined(sparc) || defined(mips)
-+#if defined(sparc) || defined(mips) || defined(__arm__)
- #define SDL_DATA_ALIGNED	1
- #endif
- #ifndef SDL_DATA_ALIGNED
diff --git a/debian/patches/arm.patch b/debian/patches/arm.patch
new file mode 100644
index 0000000..51d7f4c
--- /dev/null
+++ b/debian/patches/arm.patch
@@ -0,0 +1,16 @@
+Description: bad aligned access considerations on ARM
+Author: Sam Hocevar <sam at zoy.org>
+Last-Update: 2003-09-24
+Bug-Debian: http://bugs.debian.org/212570
+
+--- a/SDL_net.h
++++ b/SDL_net.h
+@@ -344,7 +344,7 @@
+ /* Inline macro functions to read/write network data */
+ 
+ /* Warning, some systems have data access alignment restrictions */
+-#if defined(sparc) || defined(mips)
++#if defined(sparc) || defined(mips) || defined(__arm__)
+ #define SDL_DATA_ALIGNED	1
+ #endif
+ #ifndef SDL_DATA_ALIGNED
diff --git a/debian/patches/series b/debian/patches/series
index 272cd8e..43bf424 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-10_arm.dpatch
+arm.patch
 20_endian.dpatch
 30_UDP_Bind.dpatch

-- 
Packaging of SDL_net