[SCM] Debian packaging of wesnoth branch, devel, updated. debian/1.9.9-1-2-gc217868
Gerfried Fuchs
rhonda at debian.org
Wed Nov 9 09:52:32 UTC 2011
The following commit has been merged in the devel branch:
commit c217868dc690b5e9dcffc3f90f641ea23d90000a
Author: Gerfried Fuchs <rhonda at debian.org>
Date: Tue Nov 8 10:47:14 2011 +0100
Remove incorporated patch sdl-compile-fix
diff --git a/debian/changelog b/debian/changelog
index 90e2f74..0f04b6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
wesnoth-1.9 (1:1.9.10-1) unstable; urgency=low
* New upstream devel release.
+ * Remove incorporated patch sdl-compile-fix.
-- Gerfried Fuchs <rhonda at debian.org> 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 <koraq at xs4all.nl> 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
More information about the Pkg-games-commits
mailing list