r11741 - in packages/trunk/fenix/debian: . patches

[Peter Pentchev]

Author: roam-guest
Date: 2011-02-10 14:47:55 +0000 (Thu, 10 Feb 2011)
New Revision: 11741

Added:
   packages/trunk/fenix/debian/patches/headers.patch
Modified:
   packages/trunk/fenix/debian/changelog
   packages/trunk/fenix/debian/patches/series
Log:
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.


Modified: packages/trunk/fenix/debian/changelog
===================================================================
--- packages/trunk/fenix/debian/changelog	2011-02-10 11:56:50 UTC (rev 11740)
+++ packages/trunk/fenix/debian/changelog	2011-02-10 14:47:55 UTC (rev 11741)
@@ -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 @@
   * 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
 

Added: packages/trunk/fenix/debian/patches/headers.patch
===================================================================
--- packages/trunk/fenix/debian/patches/headers.patch	                        (rev 0)
+++ packages/trunk/fenix/debian/patches/headers.patch	2011-02-10 14:47:55 UTC (rev 11741)
@@ -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" {

Modified: packages/trunk/fenix/debian/patches/series
===================================================================
--- packages/trunk/fenix/debian/patches/series	2011-02-10 11:56:50 UTC (rev 11740)
+++ packages/trunk/fenix/debian/patches/series	2011-02-10 14:47:55 UTC (rev 11741)
@@ -23,3 +23,4 @@
 warning_fixes.patch
 string_alloc_crash.patch
 spelling.patch
+headers.patch