[fenix] 103/127: On second thoughts, the headers patch is actually needed to fix the build of the plugins. So... restore part of it.

[Peter Pentchev]

This is an automated email from the git hooks/post-receive script.

roam-guest pushed a commit to branch master
in repository fenix.

commit 5f19435b7ced62e4bd51fbc5b4490c300581c8aa
Author: Peter Pentchev <roam at ringlet.net>
Date:   Thu Feb 10 14:47:55 2011 +0000

    On second thoughts, the headers patch is actually needed to fix
    the build of the plugins.  So... restore part of it.
    
    I think this is ready to go now.
---
 debian/changelog             | 10 ++++------
 debian/patches/headers.patch | 36 ++++++++++++++++++++++++++++++++++++
 debian/patches/series        |  1 +
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed3634f..498b8cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-fenix (0.92a.dfsg1-6) UNRELEASED; urgency=low
+fenix (0.92a.dfsg1-6) unstable; urgency=low
 
   [ Peter De Wachter ]
   * Fixed watch file. (Closes: #544789)
@@ -27,12 +27,10 @@ fenix (0.92a.dfsg1-6) UNRELEASED; urgency=low
   * Remove the dh_compress override - dh_compress(1) already will compress
     all the text files in /usr/share/doc/fenix.  This change also fixes
     the arch-indep only build.
-  * Drop the headers patch to unbreak the arch-dep only build; seems safe,
-    because well-behaved Fenix-using packages would add -I/usr/include/Fenix
-    if they need to use its headers and would invoke sdl-config to add
-    the SDL headers directory anyway.
+  * Drop part of the headers patch and always apply the rest to unbreak
+    the arch-dep only build.
 
- -- Peter Pentchev <roam at ringlet.net>  Fri, 26 Nov 2010 16:28:08 +0200
+ -- Peter Pentchev <roam at ringlet.net>  Thu, 10 Feb 2011 16:47:16 +0200
 
 fenix (0.92a.dfsg1-5) unstable; urgency=low
 
diff --git a/debian/patches/headers.patch b/debian/patches/headers.patch
new file mode 100644
index 0000000..5b7702a
--- /dev/null
+++ b/debian/patches/headers.patch
@@ -0,0 +1,36 @@
+# Copyright (C) 2007  Miriam Ruiz <little_miry at yahoo.es>
+# Licensed under the GPL, see /usr/share/common-licenses/GPL
+
+--- a/include/fxdll.h
++++ b/include/fxdll.h
+@@ -29,21 +29,17 @@
+ 
+ #define FNXDLL
+ 
+-#ifdef TARGET_MAC
+-#include <SDL/SDL.h>
+-#else
+ #include <SDL.h>
+-#endif
+ 
+-#include <instance_st.h>
+-#include <grlib_st.h>
+-#include <files_st.h>
+-#include <typedef_st.h>
+-#include <xctype_st.h>
+-#include <flic_st.h>
+-#include <i_procdef_st.h>
+-#include <offsets.h>
+-#include <pslang.h>
++#include "instance_st.h"
++#include "grlib_st.h"
++#include "files_st.h"
++#include "typedef_st.h"
++#include "xctype_st.h"
++#include "flic_st.h"
++#include "i_procdef_st.h"
++#include "offsets.h"
++#include "pslang.h"
+ 
+ #ifdef __cplusplus
+ extern "C" {
diff --git a/debian/patches/series b/debian/patches/series
index 6cbd15e..c0b7b92 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ include_fixes.patch
 warning_fixes.patch
 string_alloc_crash.patch
 spelling.patch
+headers.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/fenix.git