This is an automated email from the git hooks/post-receive script. roam-guest pushed a commit to branch master in repository fenix.
commit 3f5ad3d7b4ed9a2b3b291d32d1eead2511d29aec Author: Peter Pentchev <r...@ringlet.net> Date: Thu Feb 10 11:06:38 2011 +0000 Fix the arch-dep only build by dropping headers.patch altogether. Reported by: ansgar --- debian/changelog | 6 ++-- debian/patches/headers.patch | 66 -------------------------------------------- debian/rules | 4 --- 3 files changed, 4 insertions(+), 72 deletions(-) diff --git a/debian/changelog b/debian/changelog index eb59b5b..ed3634f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,5 @@ fenix (0.92a.dfsg1-6) UNRELEASED; urgency=low - TODO: fix the arch-dependent-only build (pointed out by ansgar) - [ Peter De Wachter ] * Fixed watch file. (Closes: #544789) @@ -29,6 +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. -- Peter Pentchev <r...@ringlet.net> Fri, 26 Nov 2010 16:28:08 +0200 diff --git a/debian/patches/headers.patch b/debian/patches/headers.patch deleted file mode 100644 index 57bbdc2..0000000 --- a/debian/patches/headers.patch +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright (C) 2007 Miriam Ruiz <little_m...@yahoo.es> -# Licensed under the GPL, see /usr/share/common-licenses/GPL - -diff -ruN fenix-dev.orig/usr/include/fenix/flic_st.h fenix-dev/usr/include/fenix/flic_st.h ---- fenix-dev.orig/usr/include/fenix/flic_st.h 2007-04-12 22:08:26.000000000 +0000 -+++ fenix-dev/usr/include/fenix/flic_st.h 2007-07-31 21:43:44.411918795 +0000 -@@ -27,11 +27,7 @@ - #ifndef __FLIC_ST_H - #define __FLIC_ST_H - --#ifdef TARGET_MAC - #include <SDL/SDL_types.h> --#else --#include <SDL_types.h> --#endif - - #ifndef __GNUC__ - #define __PACKED -diff -ruN fenix-dev.orig/usr/include/fenix/fxdll.h fenix-dev/usr/include/fenix/fxdll.h ---- fenix-dev.orig/usr/include/fenix/fxdll.h 2007-07-31 19:43:07.604042000 +0000 -+++ fenix-dev/usr/include/fenix/fxdll.h 2007-07-31 21:44:14.025769545 +0000 -@@ -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 -ruN fenix-dev.orig/usr/include/fenix/instance_st.h fenix-dev/usr/include/fenix/instance_st.h ---- fenix-dev.orig/usr/include/fenix/instance_st.h 2007-07-31 19:43:07.536038000 +0000 -+++ fenix-dev/usr/include/fenix/instance_st.h 2007-07-31 21:42:29.559240795 +0000 -@@ -27,10 +27,6 @@ - #ifndef __INSTANCE_ST_H - #define __INSTANCE_ST_H - --//#ifndef __I_PROCDEF_H --//#include "i_procdef.h" --//#endif -- - #define STACK_NO_RETURN_VALUE 0x8000 - #define STACK_SIZE_MASK 0x7FFF - diff --git a/debian/rules b/debian/rules index aae84e5..85e5d2d 100755 --- a/debian/rules +++ b/debian/rules @@ -42,10 +42,6 @@ override_dh_auto_install: cp debian/fenix.sh $(CURDIR)/debian/tmp/usr/bin/fenix chmod +x $(CURDIR)/debian/tmp/usr/bin/fenix -override_dh_install: - dh_install - cd $(CURDIR)/debian/fenix-dev && patch -p1 < $(CURDIR)/debian/patches/headers.patch - override_dh_installdocs: dh_installdocs --exclude=license.txt --exclude=authors.txt -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/fenix.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits