The following commit has been merged in the devel branch:
commit 274b338035aa4d0871c3d89f1f6cc164e1007928
Author: Gerfried Fuchs <[email protected]>
Date: Tue Nov 8 10:47:14 2011 +0100
Remove incorporated patch sdl-compile-fix
diff --git a/debian/changelog b/debian/changelog
index 8a61801..0aa4a16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
wesnoth-1.9 (1:1.9.10-1) lucid; urgency=low
* New upstream devel release.
+ * Remove incorporated patch sdl-compile-fix.
-- Gerfried Fuchs <[email protected]> Tue, 08 Nov 2011 10:34:32 +0100
diff --git a/debian/patches/04sdl-compile-fix b/debian/patches/04sdl-compile-fix
deleted file mode 100644
index 933a975..0000000
--- a/debian/patches/04sdl-compile-fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Mark de Wever <[email protected]> vim:ft=diff:
-Description: remove the undef SDLNet_Read32 to make it compile on all archs
-
---- a/src/network_worker.cpp
-+++ b/src/network_worker.cpp
-@@ -599,7 +599,6 @@
- return SOCKET_ERRORED;
- }
-
-- #undef SDLNet_Read32
- const int len = SDLNet_Read32(reinterpret_cast<void*>(num_buf));
-
- if(len < 1 || len > 100000000) {
diff --git a/debian/patches/series b/debian/patches/series
index a85c9b2..57b6465 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
02wesnoth-nolog-desktop-file
03wesnothd-name
-04sdl-compile-fix
--
Debian packaging of wesnoth
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
