This is an automated email from the git hooks/post-receive script. roam-guest pushed a commit to branch master in repository fenix.
commit 12e95beb2deb816185e02b21a05c873571a72cbd Author: Miriam Ruiz <[email protected]> Date: Fri Jul 13 22:09:48 2007 +0000 Fixed minor things, the package cleans properly now --- debian/control | 2 +- debian/patches/0.92a_to_cvs-20070713.1513.patch | 296 ++++-------------------- debian/rules | 4 +- 3 files changed, 52 insertions(+), 250 deletions(-) diff --git a/debian/control b/debian/control index d77d220..34f5423 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Description: runtime environment for executing 2D games made with fenix Package: fenix Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, fenix0.92-runtime (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, fenix-runtime (= ${binary:Version}) Description: development environment for making 2D games Fenix is an interpreted script programming language, especially designed to developing and running 2D games. It has a full graphic library, sound engine diff --git a/debian/patches/0.92a_to_cvs-20070713.1513.patch b/debian/patches/0.92a_to_cvs-20070713.1513.patch index ed5ff6f..5ff19e1 100644 --- a/debian/patches/0.92a_to_cvs-20070713.1513.patch +++ b/debian/patches/0.92a_to_cvs-20070713.1513.patch @@ -1,4 +1,4 @@ -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/common/files.c fenix-0.92+cvs20070713.1513/common/files.c +diff -ruN fenix-0.92/common/files.c fenix-0.92+cvs20070713.1513/common/files.c --- fenix-0.92/common/files.c 2007-07-13 15:40:59.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/common/files.c 2007-07-13 20:31:37.000000000 +0000 @@ -120,7 +120,7 @@ @@ -83,7 +83,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno /* Escribe en un fichero binario un dato de tipo entero */ int file_writeSint8 (file * fp, Sint8 * buffer) -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/configure fenix-0.92+cvs20070713.1513/configure +diff -ruN fenix-0.92/configure fenix-0.92+cvs20070713.1513/configure --- fenix-0.92/configure 2007-07-13 15:40:19.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/configure 2007-07-13 20:31:37.000000000 +0000 @@ -1,6 +1,6 @@ @@ -168,7 +168,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno configured by $0, generated by GNU Autoconf 2.56, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/configure.in fenix-0.92+cvs20070713.1513/configure.in +diff -ruN fenix-0.92/configure.in fenix-0.92+cvs20070713.1513/configure.in --- fenix-0.92/configure.in 2007-07-13 15:40:19.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/configure.in 2007-07-13 20:31:37.000000000 +0000 @@ -1,4 +1,4 @@ @@ -177,73 +177,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno AC_CANONICAL_SYSTEM AC_ARG_PROGRAM -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fpg/Makefile fenix-0.92+cvs20070713.1513/fpg/Makefile ---- fenix-0.92/fpg/Makefile 2007-04-13 18:19:02.000000000 +0000 -+++ fenix-0.92+cvs20070713.1513/fpg/Makefile 2007-07-13 20:31:37.000000000 +0000 -@@ -54,7 +54,7 @@ - CPP = gcc -E - CPPFLAGS = - CYGPATH_W = echo --DEFS = -DPACKAGE_NAME=\"fenix\" -DPACKAGE_TARNAME=\"fenix\" -DPACKAGE_VERSION=\"0.92a\" -DPACKAGE_STRING=\"fenix\ 0.92a\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"fenix\" -DVERSION=\"0.92a\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -+DEFS = -DPACKAGE_NAME=\"fenix\" -DPACKAGE_TARNAME=\"fenix\" -DPACKAGE_VERSION=\"0.93\" -DPACKAGE_STRING=\"fenix\ 0.93\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"fenix\" -DVERSION=\"0.93\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 - DEPDIR = .deps - DO_FPG = - DO_FPG_FALSE = # -@@ -91,9 +91,9 @@ - PACKAGE = fenix - PACKAGE_BUGREPORT = - PACKAGE_NAME = fenix --PACKAGE_STRING = fenix 0.92a -+PACKAGE_STRING = fenix 0.93 - PACKAGE_TARNAME = fenix --PACKAGE_VERSION = 0.92a -+PACKAGE_VERSION = 0.93 - PATH_SEPARATOR = : - SDL_CFLAGS = -I/usr/local/include/SDL -D_GNU_SOURCE=1 -Dmain=SDL_main - SDL_CONFIG = /usr/local/bin/sdl-config -@@ -101,7 +101,7 @@ - SET_MAKE = - SHELL = /bin/sh - STRIP = --VERSION = 0.92a -+VERSION = 0.93 - WINDRES = windres - ac_ct_CC = gcc - ac_ct_STRIP = -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxc/Makefile fenix-0.92+cvs20070713.1513/fxc/Makefile ---- fenix-0.92/fxc/Makefile 2007-04-13 18:19:02.000000000 +0000 -+++ fenix-0.92+cvs20070713.1513/fxc/Makefile 2007-07-13 20:31:37.000000000 +0000 -@@ -54,7 +54,7 @@ - CPP = gcc -E - CPPFLAGS = - CYGPATH_W = echo --DEFS = -DPACKAGE_NAME=\"fenix\" -DPACKAGE_TARNAME=\"fenix\" -DPACKAGE_VERSION=\"0.92a\" -DPACKAGE_STRING=\"fenix\ 0.92a\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"fenix\" -DVERSION=\"0.92a\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -+DEFS = -DPACKAGE_NAME=\"fenix\" -DPACKAGE_TARNAME=\"fenix\" -DPACKAGE_VERSION=\"0.93\" -DPACKAGE_STRING=\"fenix\ 0.93\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"fenix\" -DVERSION=\"0.93\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 - DEPDIR = .deps - DO_FPG = - DO_FPG_FALSE = # -@@ -91,9 +91,9 @@ - PACKAGE = fenix - PACKAGE_BUGREPORT = - PACKAGE_NAME = fenix --PACKAGE_STRING = fenix 0.92a -+PACKAGE_STRING = fenix 0.93 - PACKAGE_TARNAME = fenix --PACKAGE_VERSION = 0.92a -+PACKAGE_VERSION = 0.93 - PATH_SEPARATOR = : - SDL_CFLAGS = -I/usr/local/include/SDL -D_GNU_SOURCE=1 -Dmain=SDL_main - SDL_CONFIG = /usr/local/bin/sdl-config -@@ -101,7 +101,7 @@ - SET_MAKE = - SHELL = /bin/sh - STRIP = --VERSION = 0.92a -+VERSION = 0.93 - WINDRES = windres - ac_ct_CC = gcc - ac_ct_STRIP = -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxc/src/c_code.c fenix-0.92+cvs20070713.1513/fxc/src/c_code.c +diff -ruN fenix-0.92/fxc/src/c_code.c fenix-0.92+cvs20070713.1513/fxc/src/c_code.c --- fenix-0.92/fxc/src/c_code.c 2007-04-12 22:08:14.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxc/src/c_code.c 2007-07-13 20:31:37.000000000 +0000 @@ -58,7 +58,7 @@ @@ -551,7 +485,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno codeblock_loop_end (code, loop, code->current) ; continue ; } -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxc/src/c_debug.c fenix-0.92+cvs20070713.1513/fxc/src/c_debug.c +diff -ruN fenix-0.92/fxc/src/c_debug.c fenix-0.92+cvs20070713.1513/fxc/src/c_debug.c --- fenix-0.92/fxc/src/c_debug.c 2007-04-12 22:08:16.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxc/src/c_debug.c 2007-07-13 20:31:37.000000000 +0000 @@ -144,7 +144,7 @@ @@ -563,7 +497,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno { "A2STR", MN_A2STR, 0 }, { "STR2A", MN_STR2A, 0 }, -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxc/src/c_main.c fenix-0.92+cvs20070713.1513/fxc/src/c_main.c +diff -ruN fenix-0.92/fxc/src/c_main.c fenix-0.92+cvs20070713.1513/fxc/src/c_main.c --- fenix-0.92/fxc/src/c_main.c 2007-07-13 15:40:29.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxc/src/c_main.c 2007-07-13 20:31:37.000000000 +0000 @@ -579,35 +579,35 @@ @@ -628,7 +562,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno /* Gestiona procesos cuyos par�metros son variables locales */ -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxc/src/dcbw.c fenix-0.92+cvs20070713.1513/fxc/src/dcbw.c +diff -ruN fenix-0.92/fxc/src/dcbw.c fenix-0.92+cvs20070713.1513/fxc/src/dcbw.c --- fenix-0.92/fxc/src/dcbw.c 2007-07-13 15:40:29.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxc/src/dcbw.c 2007-07-13 20:31:37.000000000 +0000 @@ -74,11 +74,9 @@ @@ -646,7 +580,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno dcb_add_file(buffer) ; } file_close(fp) ; -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxc/src/error.c fenix-0.92+cvs20070713.1513/fxc/src/error.c +diff -ruN fenix-0.92/fxc/src/error.c fenix-0.92+cvs20070713.1513/fxc/src/error.c --- fenix-0.92/fxc/src/error.c 2007-04-12 22:08:20.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxc/src/error.c 2007-07-13 20:31:37.000000000 +0000 @@ -54,6 +54,7 @@ @@ -666,7 +600,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno // Check for multiline... if (line[0]=='_') { // must resize the string and concatenate -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxc/src/main_div.c fenix-0.92+cvs20070713.1513/fxc/src/main_div.c +diff -ruN fenix-0.92/fxc/src/main_div.c fenix-0.92+cvs20070713.1513/fxc/src/main_div.c --- fenix-0.92/fxc/src/main_div.c 2007-04-12 22:08:20.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxc/src/main_div.c 2007-07-13 20:31:37.000000000 +0000 @@ -183,6 +183,7 @@ @@ -691,40 +625,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno " angle ; \n" " alpha ; \n" " blendop ; \n" -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxc/src/Makefile fenix-0.92+cvs20070713.1513/fxc/src/Makefile ---- fenix-0.92/fxc/src/Makefile 2007-04-13 18:19:02.000000000 +0000 -+++ fenix-0.92+cvs20070713.1513/fxc/src/Makefile 2007-07-13 20:31:37.000000000 +0000 -@@ -54,7 +54,7 @@ - CPP = gcc -E - CPPFLAGS = - CYGPATH_W = echo --DEFS = -DPACKAGE_NAME=\"fenix\" -DPACKAGE_TARNAME=\"fenix\" -DPACKAGE_VERSION=\"0.92a\" -DPACKAGE_STRING=\"fenix\ 0.92a\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"fenix\" -DVERSION=\"0.92a\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -+DEFS = -DPACKAGE_NAME=\"fenix\" -DPACKAGE_TARNAME=\"fenix\" -DPACKAGE_VERSION=\"0.93\" -DPACKAGE_STRING=\"fenix\ 0.93\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"fenix\" -DVERSION=\"0.93\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 - DEPDIR = .deps - DO_FPG = - DO_FPG_FALSE = # -@@ -91,9 +91,9 @@ - PACKAGE = fenix - PACKAGE_BUGREPORT = - PACKAGE_NAME = fenix --PACKAGE_STRING = fenix 0.92a -+PACKAGE_STRING = fenix 0.93 - PACKAGE_TARNAME = fenix --PACKAGE_VERSION = 0.92a -+PACKAGE_VERSION = 0.93 - PATH_SEPARATOR = : - SDL_CFLAGS = -I/usr/local/include/SDL -D_GNU_SOURCE=1 -Dmain=SDL_main - SDL_CONFIG = /usr/local/bin/sdl-config -@@ -101,7 +101,7 @@ - SET_MAKE = - SHELL = /bin/sh - STRIP = --VERSION = 0.92a -+VERSION = 0.93 - WINDRES = windres - ac_ct_CC = gcc - ac_ct_STRIP = -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxc/src/sysstub.c fenix-0.92+cvs20070713.1513/fxc/src/sysstub.c +diff -ruN fenix-0.92/fxc/src/sysstub.c fenix-0.92+cvs20070713.1513/fxc/src/sysstub.c --- fenix-0.92/fxc/src/sysstub.c 2007-04-12 22:08:22.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxc/src/sysstub.c 2007-07-13 20:31:37.000000000 +0000 @@ -76,8 +76,7 @@ @@ -770,7 +671,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno table = malloc(sizeof(SYSPROC *) * 32) ; do -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/inc/fmath.h fenix-0.92+cvs20070713.1513/fxi/inc/fmath.h +diff -ruN fenix-0.92/fxi/inc/fmath.h fenix-0.92+cvs20070713.1513/fxi/inc/fmath.h --- fenix-0.92/fxi/inc/fmath.h 2007-04-12 22:08:26.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/inc/fmath.h 2007-07-13 20:31:37.000000000 +0000 @@ -24,15 +24,23 @@ @@ -805,7 +706,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno } + +#endif -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/inc/fxi.h fenix-0.92+cvs20070713.1513/fxi/inc/fxi.h +diff -ruN fenix-0.92/fxi/inc/fxi.h fenix-0.92+cvs20070713.1513/fxi/inc/fxi.h --- fenix-0.92/fxi/inc/fxi.h 2007-04-12 22:08:28.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/inc/fxi.h 2007-07-13 20:31:37.000000000 +0000 @@ -55,6 +55,8 @@ @@ -817,7 +718,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno /* * CONSTANTS */ -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/inc/grlib.h fenix-0.92+cvs20070713.1513/fxi/inc/grlib.h +diff -ruN fenix-0.92/fxi/inc/grlib.h fenix-0.92+cvs20070713.1513/fxi/inc/grlib.h --- fenix-0.92/fxi/inc/grlib.h 2007-04-12 22:08:28.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/inc/grlib.h 2007-07-13 20:31:37.000000000 +0000 @@ -42,6 +42,8 @@ @@ -868,7 +769,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno /* Bitmaps */ extern void gr_blit (GRAPH * dest, REGION * clip, int x, int y, int flags, GRAPH * gr) ; -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/inc/grlib_st.h fenix-0.92+cvs20070713.1513/fxi/inc/grlib_st.h +diff -ruN fenix-0.92/fxi/inc/grlib_st.h fenix-0.92+cvs20070713.1513/fxi/inc/grlib_st.h --- fenix-0.92/fxi/inc/grlib_st.h 2007-04-12 22:08:28.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/inc/grlib_st.h 2007-07-13 20:31:37.000000000 +0000 @@ -95,6 +95,16 @@ @@ -897,7 +798,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno Sint16 * blend_table ; /* Pointer to 16 bits blend table if any */ int modified ; /* 1 if bitmap needs analysis */ -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/inc/instance_st.h fenix-0.92+cvs20070713.1513/fxi/inc/instance_st.h +diff -ruN fenix-0.92/fxi/inc/instance_st.h fenix-0.92+cvs20070713.1513/fxi/inc/instance_st.h --- fenix-0.92/fxi/inc/instance_st.h 2007-04-12 22:08:28.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/inc/instance_st.h 2007-07-13 20:31:37.000000000 +0000 @@ -27,6 +27,10 @@ @@ -939,40 +840,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno /* Macros para acceder a datos locales o privados de una instancia */ #define LOCDWORD(a,b) ( *(Sint32 *) ((Uint8 *)(a->locdata)+b) ) #define LOCWORD(a,b) ( *(Uint16 *) ((Uint8 *)(a->locdata)+b) ) -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/Makefile fenix-0.92+cvs20070713.1513/fxi/Makefile ---- fenix-0.92/fxi/Makefile 2007-04-13 18:19:02.000000000 +0000 -+++ fenix-0.92+cvs20070713.1513/fxi/Makefile 2007-07-13 20:31:37.000000000 +0000 -@@ -54,7 +54,7 @@ - CPP = gcc -E - CPPFLAGS = - CYGPATH_W = echo --DEFS = -DPACKAGE_NAME=\"fenix\" -DPACKAGE_TARNAME=\"fenix\" -DPACKAGE_VERSION=\"0.92a\" -DPACKAGE_STRING=\"fenix\ 0.92a\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"fenix\" -DVERSION=\"0.92a\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -+DEFS = -DPACKAGE_NAME=\"fenix\" -DPACKAGE_TARNAME=\"fenix\" -DPACKAGE_VERSION=\"0.93\" -DPACKAGE_STRING=\"fenix\ 0.93\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"fenix\" -DVERSION=\"0.93\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 - DEPDIR = .deps - DO_FPG = - DO_FPG_FALSE = # -@@ -91,9 +91,9 @@ - PACKAGE = fenix - PACKAGE_BUGREPORT = - PACKAGE_NAME = fenix --PACKAGE_STRING = fenix 0.92a -+PACKAGE_STRING = fenix 0.93 - PACKAGE_TARNAME = fenix --PACKAGE_VERSION = 0.92a -+PACKAGE_VERSION = 0.93 - PATH_SEPARATOR = : - SDL_CFLAGS = -I/usr/local/include/SDL -D_GNU_SOURCE=1 -Dmain=SDL_main - SDL_CONFIG = /usr/local/bin/sdl-config -@@ -101,7 +101,7 @@ - SET_MAKE = - SHELL = /bin/sh - STRIP = --VERSION = 0.92a -+VERSION = 0.93 - WINDRES = windres - ac_ct_CC = gcc - ac_ct_STRIP = -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/Be_compat/be_compat.cpp fenix-0.92+cvs20070713.1513/fxi/src/Be_compat/be_compat.cpp +diff -ruN fenix-0.92/fxi/src/Be_compat/be_compat.cpp fenix-0.92+cvs20070713.1513/fxi/src/Be_compat/be_compat.cpp --- fenix-0.92/fxi/src/Be_compat/be_compat.cpp 1970-01-01 00:00:00.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/Be_compat/be_compat.cpp 2007-07-13 20:31:37.000000000 +0000 @@ -0,0 +1,29 @@ @@ -1005,7 +873,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno + alert_p -> Go(); + free (error_msg); +} -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/Be_compat/be_compat.h fenix-0.92+cvs20070713.1513/fxi/src/Be_compat/be_compat.h +diff -ruN fenix-0.92/fxi/src/Be_compat/be_compat.h fenix-0.92+cvs20070713.1513/fxi/src/Be_compat/be_compat.h --- fenix-0.92/fxi/src/Be_compat/be_compat.h 1970-01-01 00:00:00.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/Be_compat/be_compat.h 2007-07-13 20:31:37.000000000 +0000 @@ -0,0 +1,5 @@ @@ -1014,13 +882,13 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno + +void be_alert (const char *error); +#endif -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/Be_compat/libbe_compat.proj fenix-0.92+cvs20070713.1513/fxi/src/Be_compat/libbe_compat.proj +diff -ruN fenix-0.92/fxi/src/Be_compat/libbe_compat.proj fenix-0.92+cvs20070713.1513/fxi/src/Be_compat/libbe_compat.proj --- fenix-0.92/fxi/src/Be_compat/libbe_compat.proj 1970-01-01 00:00:00.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/Be_compat/libbe_compat.proj 2007-07-13 20:31:37.000000000 +0000 @@ -0,0 +1 @@ +MIDE \ No newline at end of file -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/dcbr.c fenix-0.92+cvs20070713.1513/fxi/src/dcbr.c +diff -ruN fenix-0.92/fxi/src/dcbr.c fenix-0.92+cvs20070713.1513/fxi/src/dcbr.c --- fenix-0.92/fxi/src/dcbr.c 2007-07-13 15:40:26.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/dcbr.c 2007-07-13 20:31:37.000000000 +0000 @@ -124,7 +124,7 @@ @@ -1032,7 +900,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno trim(line); if (allocated == count) { -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/fbm.c fenix-0.92+cvs20070713.1513/fxi/src/fbm.c +diff -ruN fenix-0.92/fxi/src/fbm.c fenix-0.92+cvs20070713.1513/fxi/src/fbm.c --- fenix-0.92/fxi/src/fbm.c 2007-07-13 15:40:26.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/fbm.c 2007-07-13 20:39:59.000000000 +0000 @@ -87,6 +87,46 @@ @@ -1186,7 +1054,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno if (map->depth == 16) { -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/f_cd.c fenix-0.92+cvs20070713.1513/fxi/src/f_cd.c +diff -ruN fenix-0.92/fxi/src/f_cd.c fenix-0.92+cvs20070713.1513/fxi/src/f_cd.c --- fenix-0.92/fxi/src/f_cd.c 2007-04-12 22:08:30.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/f_cd.c 2007-07-13 20:31:37.000000000 +0000 @@ -105,11 +105,11 @@ @@ -1218,7 +1086,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno } +*/ -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/fgc.c fenix-0.92+cvs20070713.1513/fxi/src/fgc.c +diff -ruN fenix-0.92/fxi/src/fgc.c fenix-0.92+cvs20070713.1513/fxi/src/fgc.c --- fenix-0.92/fxi/src/fgc.c 2007-07-13 15:40:26.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/fgc.c 2007-07-13 20:39:18.000000000 +0000 @@ -75,6 +75,7 @@ @@ -1354,7 +1222,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno assert (file_pos(fp) == (int)offsets[n]); if (!fbm_save_to (lib->maps[i], fp, 0)) -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/fnc_exports.c fenix-0.92+cvs20070713.1513/fxi/src/fnc_exports.c +diff -ruN fenix-0.92/fxi/src/fnc_exports.c fenix-0.92+cvs20070713.1513/fxi/src/fnc_exports.c --- fenix-0.92/fxi/src/fnc_exports.c 2007-07-13 15:40:26.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/fnc_exports.c 2007-07-13 20:31:37.000000000 +0000 @@ -72,6 +72,8 @@ @@ -1366,7 +1234,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno { "file_size" , file_size }, { "file_pos" , file_pos }, { "file_seek" , file_seek }, -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/fpl.c fenix-0.92+cvs20070713.1513/fxi/src/fpl.c +diff -ruN fenix-0.92/fxi/src/fpl.c fenix-0.92+cvs20070713.1513/fxi/src/fpl.c --- fenix-0.92/fxi/src/fpl.c 2007-07-13 15:40:26.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/fpl.c 2007-07-13 20:31:37.000000000 +0000 @@ -100,7 +100,7 @@ @@ -1387,7 +1255,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno color_palette[3*n + 1] = palette[n].g; color_palette[3*n + 2] = palette[n].b; } -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/g_blendop.c fenix-0.92+cvs20070713.1513/fxi/src/g_blendop.c +diff -ruN fenix-0.92/fxi/src/g_blendop.c fenix-0.92+cvs20070713.1513/fxi/src/g_blendop.c --- fenix-0.92/fxi/src/g_blendop.c 2007-04-12 22:08:34.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/g_blendop.c 2007-07-13 20:31:37.000000000 +0000 @@ -323,8 +323,8 @@ @@ -1410,7 +1278,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno blend[i] = MAKERGB(max, max, max) ; } } -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/g_blit.c fenix-0.92+cvs20070713.1513/fxi/src/g_blit.c +diff -ruN fenix-0.92/fxi/src/g_blit.c fenix-0.92+cvs20070713.1513/fxi/src/g_blit.c --- fenix-0.92/fxi/src/g_blit.c 2007-07-13 15:40:26.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/g_blit.c 2007-07-13 20:31:37.000000000 +0000 @@ -96,6 +96,8 @@ @@ -1657,7 +1525,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno dest->modified = 1 ; } -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/g_console.c fenix-0.92+cvs20070713.1513/fxi/src/g_console.c +diff -ruN fenix-0.92/fxi/src/g_console.c fenix-0.92+cvs20070713.1513/fxi/src/g_console.c --- fenix-0.92/fxi/src/g_console.c 2007-07-13 15:40:26.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/g_console.c 2007-07-13 20:31:37.000000000 +0000 @@ -53,9 +53,9 @@ @@ -1833,7 +1701,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno { char act=*action; i = findproc(NULL, action, ptr); -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/g_conversion.c fenix-0.92+cvs20070713.1513/fxi/src/g_conversion.c +diff -ruN fenix-0.92/fxi/src/g_conversion.c fenix-0.92+cvs20070713.1513/fxi/src/g_conversion.c --- fenix-0.92/fxi/src/g_conversion.c 2007-07-13 15:40:26.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/g_conversion.c 2007-07-13 20:31:37.000000000 +0000 @@ -76,10 +76,8 @@ @@ -1873,7 +1741,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno return alpha16[alpha]; } -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw.c +diff -ruN fenix-0.92/fxi/src/g_draw.c fenix-0.92+cvs20070713.1513/fxi/src/g_draw.c --- fenix-0.92/fxi/src/g_draw.c 2007-07-13 15:40:26.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/g_draw.c 2007-07-13 20:38:15.000000000 +0000 @@ -46,17 +46,15 @@ @@ -2807,7 +2675,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno + if (drawing_alpha != 255) syscolor16_alpha = gr_alpha16(drawing_alpha)[syscolor16]; } -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/g_font.c fenix-0.92+cvs20070713.1513/fxi/src/g_font.c +diff -ruN fenix-0.92/fxi/src/g_font.c fenix-0.92+cvs20070713.1513/fxi/src/g_font.c --- fenix-0.92/fxi/src/g_font.c 2007-07-13 15:40:26.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/g_font.c 2007-07-13 20:31:37.000000000 +0000 @@ -159,8 +159,7 @@ @@ -3084,7 +2952,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno + if (id >= 0 && id <= 255) return fonts[id]; return NULL; } -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/g_fpg.c fenix-0.92+cvs20070713.1513/fxi/src/g_fpg.c +diff -ruN fenix-0.92/fxi/src/g_fpg.c fenix-0.92+cvs20070713.1513/fxi/src/g_fpg.c --- fenix-0.92/fxi/src/g_fpg.c 2007-07-13 15:40:26.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/g_fpg.c 2007-07-13 20:39:39.000000000 +0000 @@ -128,8 +128,7 @@ @@ -3208,7 +3076,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno + if (!syslib) syslib = grlib_create() ; } -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main.c +diff -ruN fenix-0.92/fxi/src/g_main.c fenix-0.92+cvs20070713.1513/fxi/src/g_main.c --- fenix-0.92/fxi/src/g_main.c 2007-07-13 15:40:26.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/g_main.c 2007-07-13 20:31:37.000000000 +0000 @@ -111,7 +111,7 @@ @@ -3751,7 +3619,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno for (n = 0 ; n < 256 ; n++) gr_set_rgb (n, default_palette[n*3]/4, default_palette[n*3+1]/4, default_palette[n*3+2]/4) ; } -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/g_maps.c fenix-0.92+cvs20070713.1513/fxi/src/g_maps.c +diff -ruN fenix-0.92/fxi/src/g_maps.c fenix-0.92+cvs20070713.1513/fxi/src/g_maps.c --- fenix-0.92/fxi/src/g_maps.c 2007-07-13 15:40:26.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/g_maps.c 2007-07-13 20:40:34.000000000 +0000 @@ -128,6 +128,8 @@ @@ -3883,7 +3751,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno gr->code = bitmap_next_code() ; assert (syslib) ; grlib_add_map (0, gr) ; -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/g_mode7.c fenix-0.92+cvs20070713.1513/fxi/src/g_mode7.c +diff -ruN fenix-0.92/fxi/src/g_mode7.c fenix-0.92+cvs20070713.1513/fxi/src/g_mode7.c --- fenix-0.92/fxi/src/g_mode7.c 2007-04-13 18:19:04.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/g_mode7.c 2007-07-13 20:31:37.000000000 +0000 @@ -71,8 +71,7 @@ @@ -3964,7 +3832,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno } /* Crea una lista ordenada de instancias a dibujar */ -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/g_pal.c fenix-0.92+cvs20070713.1513/fxi/src/g_pal.c +diff -ruN fenix-0.92/fxi/src/g_pal.c fenix-0.92+cvs20070713.1513/fxi/src/g_pal.c --- fenix-0.92/fxi/src/g_pal.c 2007-07-13 15:40:26.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/g_pal.c 2007-07-13 20:37:31.000000000 +0000 @@ -54,10 +54,15 @@ @@ -4469,7 +4337,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno } void gr_set_rgb (int color, int r, int g, int b) -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/g_scroll.c fenix-0.92+cvs20070713.1513/fxi/src/g_scroll.c +diff -ruN fenix-0.92/fxi/src/g_scroll.c fenix-0.92+cvs20070713.1513/fxi/src/g_scroll.c --- fenix-0.92/fxi/src/g_scroll.c 2007-07-13 15:40:26.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/g_scroll.c 2007-07-13 20:31:37.000000000 +0000 @@ -36,9 +36,6 @@ @@ -4482,7 +4350,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno /* Indicadores de bloqueo */ #define GRAPH_HWRAP 1 #define GRAPH_VWRAP 2 -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/g_texts.c fenix-0.92+cvs20070713.1513/fxi/src/g_texts.c +diff -ruN fenix-0.92/fxi/src/g_texts.c fenix-0.92+cvs20070713.1513/fxi/src/g_texts.c --- fenix-0.92/fxi/src/g_texts.c 2007-07-13 15:40:26.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/g_texts.c 2007-07-13 20:31:37.000000000 +0000 @@ -84,8 +84,7 @@ @@ -4570,7 +4438,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno } else { -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/i_debug.c fenix-0.92+cvs20070713.1513/fxi/src/i_debug.c +diff -ruN fenix-0.92/fxi/src/i_debug.c fenix-0.92+cvs20070713.1513/fxi/src/i_debug.c --- fenix-0.92/fxi/src/i_debug.c 2007-07-13 15:40:26.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/i_debug.c 2007-07-13 20:31:37.000000000 +0000 @@ -155,7 +155,7 @@ @@ -4600,7 +4468,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno } line[0] = 0 ; -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func.c +diff -ruN fenix-0.92/fxi/src/i_func.c fenix-0.92+cvs20070713.1513/fxi/src/i_func.c --- fenix-0.92/fxi/src/i_func.c 2007-07-13 15:40:26.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/i_func.c 2007-07-13 20:38:44.000000000 +0000 @@ -158,10 +158,10 @@ @@ -5089,7 +4957,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno GLODWORD(FILE_HIDDEN) = (*ptr == '.'); GLODWORD(FILE_READONLY) = !(s.st_mode & 0444); GLODWORD(FILE_SIZE) = s.st_size; -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main.c +diff -ruN fenix-0.92/fxi/src/i_main.c fenix-0.92+cvs20070713.1513/fxi/src/i_main.c --- fenix-0.92/fxi/src/i_main.c 2007-07-13 15:40:26.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/i_main.c 2007-07-13 20:39:05.000000000 +0000 @@ -182,7 +182,7 @@ @@ -5784,7 +5652,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno + return return_value; } -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/img_pcx.c fenix-0.92+cvs20070713.1513/fxi/src/img_pcx.c +diff -ruN fenix-0.92/fxi/src/img_pcx.c fenix-0.92+cvs20070713.1513/fxi/src/img_pcx.c --- fenix-0.92/fxi/src/img_pcx.c 2007-07-13 15:40:26.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/img_pcx.c 2007-07-13 20:37:04.000000000 +0000 @@ -81,6 +81,10 @@ @@ -5842,7 +5710,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno } else { gr_error (_("%s: unsupported color depth\n"), filename) ; } -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/img_png.c fenix-0.92+cvs20070713.1513/fxi/src/img_png.c +diff -ruN fenix-0.92/fxi/src/img_png.c fenix-0.92+cvs20070713.1513/fxi/src/img_png.c --- fenix-0.92/fxi/src/img_png.c 2007-07-13 15:40:26.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/img_png.c 2007-07-13 20:40:15.000000000 +0000 @@ -144,35 +144,41 @@ @@ -6062,7 +5930,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno *ptr = ((*orig & 0xf800) >> 8) | ((*orig & 0x07e0) << 5) | ((*orig & 0x001f) << 19)| -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/instance.c fenix-0.92+cvs20070713.1513/fxi/src/instance.c +diff -ruN fenix-0.92/fxi/src/instance.c fenix-0.92+cvs20070713.1513/fxi/src/instance.c --- fenix-0.92/fxi/src/instance.c 2007-04-12 22:08:56.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/fxi/src/instance.c 2007-07-13 20:31:37.000000000 +0000 @@ -53,12 +53,12 @@ @@ -6406,40 +6274,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno return i; } -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/fxi/src/Makefile fenix-0.92+cvs20070713.1513/fxi/src/Makefile ---- fenix-0.92/fxi/src/Makefile 2007-04-13 18:19:04.000000000 +0000 -+++ fenix-0.92+cvs20070713.1513/fxi/src/Makefile 2007-07-13 20:31:37.000000000 +0000 -@@ -54,7 +54,7 @@ - CPP = gcc -E - CPPFLAGS = - CYGPATH_W = echo --DEFS = -DPACKAGE_NAME=\"fenix\" -DPACKAGE_TARNAME=\"fenix\" -DPACKAGE_VERSION=\"0.92a\" -DPACKAGE_STRING=\"fenix\ 0.92a\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"fenix\" -DVERSION=\"0.92a\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -+DEFS = -DPACKAGE_NAME=\"fenix\" -DPACKAGE_TARNAME=\"fenix\" -DPACKAGE_VERSION=\"0.93\" -DPACKAGE_STRING=\"fenix\ 0.93\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"fenix\" -DVERSION=\"0.93\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 - DEPDIR = .deps - DO_FPG = - DO_FPG_FALSE = # -@@ -91,9 +91,9 @@ - PACKAGE = fenix - PACKAGE_BUGREPORT = - PACKAGE_NAME = fenix --PACKAGE_STRING = fenix 0.92a -+PACKAGE_STRING = fenix 0.93 - PACKAGE_TARNAME = fenix --PACKAGE_VERSION = 0.92a -+PACKAGE_VERSION = 0.93 - PATH_SEPARATOR = : - SDL_CFLAGS = -I/usr/local/include/SDL -D_GNU_SOURCE=1 -Dmain=SDL_main - SDL_CONFIG = /usr/local/bin/sdl-config -@@ -101,7 +101,7 @@ - SET_MAKE = - SHELL = /bin/sh - STRIP = --VERSION = 0.92a -+VERSION = 0.93 - WINDRES = windres - ac_ct_CC = gcc - ac_ct_STRIP = -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/include/files.h fenix-0.92+cvs20070713.1513/include/files.h +diff -ruN fenix-0.92/include/files.h fenix-0.92+cvs20070713.1513/include/files.h --- fenix-0.92/include/files.h 2007-04-12 22:09:04.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/include/files.h 2007-07-13 20:31:37.000000000 +0000 @@ -51,6 +51,8 @@ @@ -6451,7 +6286,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno extern int file_gets (file * fp, char * buffer, int len) ; extern int file_puts (file * fp, const char * buffer) ; extern int file_size (file * fp) ; -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/include/fxdll.h fenix-0.92+cvs20070713.1513/include/fxdll.h +diff -ruN fenix-0.92/include/fxdll.h fenix-0.92+cvs20070713.1513/include/fxdll.h --- fenix-0.92/include/fxdll.h 2007-04-12 22:09:06.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/include/fxdll.h 2007-07-13 20:31:37.000000000 +0000 @@ -128,6 +128,8 @@ @@ -6500,7 +6335,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno _file_size = FENIX_import ( "file_size" ); \ _file_pos = FENIX_import ( "file_pos" ); \ _file_seek = FENIX_import ( "file_seek" ); \ -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/include/offsets.h fenix-0.92+cvs20070713.1513/include/offsets.h +diff -ruN fenix-0.92/include/offsets.h fenix-0.92+cvs20070713.1513/include/offsets.h --- fenix-0.92/include/offsets.h 2007-04-12 22:09:06.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/include/offsets.h 2007-07-13 20:31:37.000000000 +0000 @@ -160,28 +160,30 @@ @@ -6559,7 +6394,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno +#define SAVED_FILE 4*51 +#define SAVED_XGRAPH 4*52 +#define SAVED_PRIORITY 4*53 -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/include/pslang.h fenix-0.92+cvs20070713.1513/include/pslang.h +diff -ruN fenix-0.92/include/pslang.h fenix-0.92+cvs20070713.1513/include/pslang.h --- fenix-0.92/include/pslang.h 2007-04-12 22:09:06.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/include/pslang.h 2007-07-13 20:31:37.000000000 +0000 @@ -236,7 +236,7 @@ @@ -6571,7 +6406,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno #define MN_STR2INT (0x77| MN_1_PARAMS) #define MN_STR2FLOAT (0x78| MN_1_PARAMS) #define MN_STR2CHR (0x79| MN_1_PARAMS) -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/include/sysprocs.h fenix-0.92+cvs20070713.1513/include/sysprocs.h +diff -ruN fenix-0.92/include/sysprocs.h fenix-0.92+cvs20070713.1513/include/sysprocs.h --- fenix-0.92/include/sysprocs.h 2007-04-13 18:19:04.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/include/sysprocs.h 2007-07-13 20:31:37.000000000 +0000 @@ -97,7 +97,6 @@ @@ -6784,40 +6619,7 @@ diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --igno { 0 , 0 , "" , 0 , 0 , 0 } } ; -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/map/Makefile fenix-0.92+cvs20070713.1513/map/Makefile ---- fenix-0.92/map/Makefile 2007-04-13 18:19:04.000000000 +0000 -+++ fenix-0.92+cvs20070713.1513/map/Makefile 2007-07-13 20:31:37.000000000 +0000 -@@ -54,7 +54,7 @@ - CPP = gcc -E - CPPFLAGS = - CYGPATH_W = echo --DEFS = -DPACKAGE_NAME=\"fenix\" -DPACKAGE_TARNAME=\"fenix\" -DPACKAGE_VERSION=\"0.92a\" -DPACKAGE_STRING=\"fenix\ 0.92a\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"fenix\" -DVERSION=\"0.92a\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -+DEFS = -DPACKAGE_NAME=\"fenix\" -DPACKAGE_TARNAME=\"fenix\" -DPACKAGE_VERSION=\"0.93\" -DPACKAGE_STRING=\"fenix\ 0.93\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"fenix\" -DVERSION=\"0.93\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 - DEPDIR = .deps - DO_FPG = - DO_FPG_FALSE = # -@@ -91,9 +91,9 @@ - PACKAGE = fenix - PACKAGE_BUGREPORT = - PACKAGE_NAME = fenix --PACKAGE_STRING = fenix 0.92a -+PACKAGE_STRING = fenix 0.93 - PACKAGE_TARNAME = fenix --PACKAGE_VERSION = 0.92a -+PACKAGE_VERSION = 0.93 - PATH_SEPARATOR = : - SDL_CFLAGS = -I/usr/local/include/SDL -D_GNU_SOURCE=1 -Dmain=SDL_main - SDL_CONFIG = /usr/local/bin/sdl-config -@@ -101,7 +101,7 @@ - SET_MAKE = - SHELL = /bin/sh - STRIP = --VERSION = 0.92a -+VERSION = 0.93 - WINDRES = windres - ac_ct_CC = gcc - ac_ct_STRIP = -diff -ruN --ignore-tab-expansion --ignore-space-change --ignore-all-space --ignore-blank-lines fenix-0.92/NEWS fenix-0.92+cvs20070713.1513/NEWS +diff -ruN fenix-0.92/NEWS fenix-0.92+cvs20070713.1513/NEWS --- fenix-0.92/NEWS 2007-04-13 18:21:52.000000000 +0000 +++ fenix-0.92+cvs20070713.1513/NEWS 2007-07-13 20:31:37.000000000 +0000 @@ -1,3 +1,85 @@ diff --git a/debian/rules b/debian/rules index 57ffd60..196fbb6 100755 --- a/debian/rules +++ b/debian/rules @@ -52,8 +52,8 @@ clean: dh_testdir dh_testroot rm -f build-stamp - -$(MAKE) distclean - -$(MAKE) -C debian/i18n clean + [ ! -f Makefile ] || $(MAKE) distclean + $(MAKE) -C debian/i18n clean rm -f config.{sub,guess} $(MAKE) -f /usr/share/quilt/quilt.make unpatch dh_clean -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/fenix.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

