[fenix] 08/08: Do not patch autogenerated files.
Peter Pentchev
roam at ringlet.net
Fri Dec 18 17:39:13 UTC 2015
This is an automated email from the git hooks/post-receive script.
roam-guest pushed a commit to branch master
in repository fenix.
commit eda3126bcee7d14f10c0d5fe141b663a556ba87c
Author: Peter Pentchev <roam at ringlet.net>
Date: Fri Dec 18 19:38:18 2015 +0200
Do not patch autogenerated files.
---
debian/changelog | 4 +-
debian/patches/0.92a_to_cvs-20070713.1513.patch | 376 ++++++---------------
debian/patches/build_portability.patch | 21 +-
debian/patches/cflags-env.patch | 23 --
debian/patches/configure.patch | 30 +-
debian/patches/kfreebsd.patch | 13 +-
debian/patches/libgif.patch | 116 +------
.../no_--as-needed_in_fxi-src-Makefile.patch | 17 +-
8 files changed, 120 insertions(+), 480 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8ebd2bf..bb99758 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,7 +26,9 @@ fenix (0.92a.dfsg1-12) UNRELEASED; urgency=medium
the original program source.
* Use the dpkg-dev defaults for compressing the Debian tarball.
* Depend on libmikmod-dev instead of libmikmod2-dev. Closes: #744986.
- * Use dh-autoreconf to rebuild the autoconf framework.
+ * Use dh-autoreconf to rebuild the autoconf framework and remove all
+ the changes to autogenerated files; all the patches already patched
+ the source files, too.
-- Peter Pentchev <roam at ringlet.net> Thu, 17 Dec 2015 16:11:53 +0200
diff --git a/debian/patches/0.92a_to_cvs-20070713.1513.patch b/debian/patches/0.92a_to_cvs-20070713.1513.patch
index b32d5f0..d9f5328 100644
--- a/debian/patches/0.92a_to_cvs-20070713.1513.patch
+++ b/debian/patches/0.92a_to_cvs-20070713.1513.patch
@@ -1,12 +1,10 @@
Description: Update Fenix to the 2007-07-13 CVS version.
Forwarded: not-needed
Author: Miriam Ruiz <little_miry at yahoo.es>
-Last-Update: 2007-08-28
+Last-Update: 2015-12-18
-Index: fenix-0.92a.dfsg1/common/files.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/common/files.c 2007-08-28 14:40:08.000000000 +0200
-+++ fenix-0.92a.dfsg1/common/files.c 2007-08-28 14:41:08.000000000 +0200
+--- a/common/files.c
++++ b/common/files.c
@@ -120,7 +120,7 @@
/* Guarda una cadena "cuoteada" al disco */
@@ -89,106 +87,16 @@ Index: fenix-0.92a.dfsg1/common/files.c
/* Escribe en un fichero binario un dato de tipo entero */
int file_writeSint8 (file * fp, Sint8 * buffer)
-Index: fenix-0.92a.dfsg1/configure
-===================================================================
---- fenix-0.92a.dfsg1.orig/configure 2007-08-28 14:39:47.000000000 +0200
-+++ fenix-0.92a.dfsg1/configure 2007-08-28 14:41:08.000000000 +0200
-@@ -1,6 +1,6 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.56 for fenix 0.92a.
-+# Generated by GNU Autoconf 2.56 for fenix 0.93.
- #
- # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
- # Free Software Foundation, Inc.
-@@ -266,8 +266,8 @@
- # Identity of this package.
- PACKAGE_NAME='fenix'
- PACKAGE_TARNAME='fenix'
--PACKAGE_VERSION='0.92a'
--PACKAGE_STRING='fenix 0.92a'
-+PACKAGE_VERSION='0.93'
-+PACKAGE_STRING='fenix 0.93'
- PACKAGE_BUGREPORT=''
-
- # Factoring default headers for most tests.
-@@ -776,7 +776,7 @@
- # Omit some internal or obsolete options to make the list less imposing.
- # This message is too long to be a string in the A/UX 3.1 sh.
- cat <<_ACEOF
--\`configure' configures fenix 0.92a to adapt to many kinds of systems.
-+\`configure' configures fenix 0.93 to adapt to many kinds of systems.
-
- Usage: $0 [OPTION]... [VAR=VALUE]...
-
-@@ -843,7 +843,7 @@
-
- if test -n "$ac_init_help"; then
- case $ac_init_help in
-- short | recursive ) echo "Configuration of fenix 0.92a:";;
-+ short | recursive ) echo "Configuration of fenix 0.93:";;
- esac
- cat <<\_ACEOF
-
-@@ -942,7 +942,7 @@
- test -n "$ac_init_help" && exit 0
- if $ac_init_version; then
- cat <<\_ACEOF
--fenix configure 0.92a
-+fenix configure 0.93
- generated by GNU Autoconf 2.56
-
- Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-@@ -957,7 +957,7 @@
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
-
--It was created by fenix $as_me 0.92a, which was
-+It was created by fenix $as_me 0.93, which was
- generated by GNU Autoconf 2.56. Invocation command line was
-
- $ $0 $@
-@@ -1881,7 +1881,7 @@
-
- # Define the identity of the package.
- PACKAGE=fenix
-- VERSION=0.92a
-+ VERSION=0.93
-
-
- cat >>confdefs.h <<_ACEOF
-@@ -4975,7 +4975,7 @@
- } >&5
- cat >&5 <<_CSEOF
-
--This file was extended by fenix $as_me 0.92a, which was
-+This file was extended by fenix $as_me 0.93, which was
- generated by GNU Autoconf 2.56. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
-@@ -5033,7 +5033,7 @@
-
- cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_version="\\
--fenix config.status 0.92a
-+fenix config.status 0.93
- configured by $0, generated by GNU Autoconf 2.56,
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Index: fenix-0.92a.dfsg1/configure.in
-===================================================================
---- fenix-0.92a.dfsg1.orig/configure.in 2007-08-28 14:39:48.000000000 +0200
-+++ fenix-0.92a.dfsg1/configure.in 2007-08-28 14:41:08.000000000 +0200
+--- a/configure.in
++++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(fenix,0.92a)
+AC_INIT(fenix,0.93)
AC_CANONICAL_SYSTEM
AC_ARG_PROGRAM
-Index: fenix-0.92a.dfsg1/fxc/src/c_code.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxc/src/c_code.c 2007-08-28 14:38:23.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxc/src/c_code.c 2007-08-28 14:41:09.000000000 +0200
+--- a/fxc/src/c_code.c
++++ b/fxc/src/c_code.c
@@ -58,7 +58,7 @@
{
if (typedef_is_pointer(exp->type))
@@ -494,10 +402,8 @@ Index: fenix-0.92a.dfsg1/fxc/src/c_code.c
codeblock_loop_end (code, loop, code->current) ;
continue ;
}
-Index: fenix-0.92a.dfsg1/fxc/src/c_debug.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxc/src/c_debug.c 2007-08-28 14:38:23.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxc/src/c_debug.c 2007-08-28 14:41:09.000000000 +0200
+--- a/fxc/src/c_debug.c
++++ b/fxc/src/c_debug.c
@@ -144,7 +144,7 @@
{ "STR2FLOAT", MN_STR2FLOAT, 1 },
{ "FLOAT2STR", MN_FLOAT2STR, 1 },
@@ -507,10 +413,8 @@ Index: fenix-0.92a.dfsg1/fxc/src/c_debug.c
{ "A2STR", MN_A2STR, 0 },
{ "STR2A", MN_STR2A, 0 },
-Index: fenix-0.92a.dfsg1/fxc/src/c_main.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxc/src/c_main.c 2007-08-28 14:41:03.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxc/src/c_main.c 2007-08-28 14:41:09.000000000 +0200
+--- a/fxc/src/c_main.c
++++ b/fxc/src/c_main.c
@@ -621,35 +621,35 @@
}
@@ -573,10 +477,8 @@ Index: fenix-0.92a.dfsg1/fxc/src/c_main.c
/* Gestiona procesos cuyos par�metros son variables locales */
-Index: fenix-0.92a.dfsg1/fxc/src/dcbw.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxc/src/dcbw.c 2007-08-28 14:39:51.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxc/src/dcbw.c 2007-08-28 14:41:09.000000000 +0200
+--- a/fxc/src/dcbw.c
++++ b/fxc/src/dcbw.c
@@ -74,11 +74,9 @@
if (!fp) return ;
while (!file_eof(fp))
@@ -592,10 +494,8 @@ Index: fenix-0.92a.dfsg1/fxc/src/dcbw.c
dcb_add_file(buffer) ;
}
file_close(fp) ;
-Index: fenix-0.92a.dfsg1/fxc/src/error.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxc/src/error.c 2007-08-28 14:38:23.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxc/src/error.c 2007-08-28 14:41:09.000000000 +0200
+--- a/fxc/src/error.c
++++ b/fxc/src/error.c
@@ -54,6 +54,7 @@
int size ;
char * msg = NULL ;
@@ -613,10 +513,8 @@ Index: fenix-0.92a.dfsg1/fxc/src/error.c
// Check for multiline...
if (line[0]=='_') {
// must resize the string and concatenate
-Index: fenix-0.92a.dfsg1/fxc/src/main_div.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxc/src/main_div.c 2007-08-28 14:38:23.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxc/src/main_div.c 2007-08-28 14:41:10.000000000 +0200
+--- a/fxc/src/main_div.c
++++ b/fxc/src/main_div.c
@@ -183,6 +183,7 @@
" y ; \n"
" z ; \n"
@@ -639,10 +537,8 @@ Index: fenix-0.92a.dfsg1/fxc/src/main_div.c
" angle ; \n"
" alpha ; \n"
" blendop ; \n"
-Index: fenix-0.92a.dfsg1/fxc/src/sysstub.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxc/src/sysstub.c 2007-08-28 14:38:24.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxc/src/sysstub.c 2007-08-28 14:41:10.000000000 +0200
+--- a/fxc/src/sysstub.c
++++ b/fxc/src/sysstub.c
@@ -76,8 +76,7 @@
last[1].next = NULL ;
last++ ;
@@ -686,10 +582,8 @@ Index: fenix-0.92a.dfsg1/fxc/src/sysstub.c
table = malloc(sizeof(SYSPROC *) * 32) ;
do
-Index: fenix-0.92a.dfsg1/fxi/inc/fmath.h
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/inc/fmath.h 2007-08-28 14:38:24.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/inc/fmath.h 2007-08-28 14:41:10.000000000 +0200
+--- a/fxi/inc/fmath.h
++++ b/fxi/inc/fmath.h
@@ -24,15 +24,23 @@
*
*/
@@ -722,10 +616,8 @@ Index: fenix-0.92a.dfsg1/fxi/inc/fmath.h
}
+
+#endif
-Index: fenix-0.92a.dfsg1/fxi/inc/fxi.h
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/inc/fxi.h 2007-08-28 14:38:24.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/inc/fxi.h 2007-08-28 14:41:10.000000000 +0200
+--- a/fxi/inc/fxi.h
++++ b/fxi/inc/fxi.h
@@ -55,6 +55,8 @@
#include "files.h"
#include "xctype.h"
@@ -735,10 +627,8 @@ Index: fenix-0.92a.dfsg1/fxi/inc/fxi.h
/*
* CONSTANTS
*/
-Index: fenix-0.92a.dfsg1/fxi/inc/grlib.h
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/inc/grlib.h 2007-08-28 14:38:24.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/inc/grlib.h 2007-08-28 14:41:10.000000000 +0200
+--- a/fxi/inc/grlib.h
++++ b/fxi/inc/grlib.h
@@ -42,6 +42,8 @@
extern int enable_16bits ; /* 1 = 16bpp MODE on */
extern int enable_filtering ; /* 1 = 16bpp filter MODE on */
@@ -787,10 +677,8 @@ Index: fenix-0.92a.dfsg1/fxi/inc/grlib.h
/* Bitmaps */
extern void gr_blit (GRAPH * dest, REGION * clip, int x, int y, int flags, GRAPH * gr) ;
-Index: fenix-0.92a.dfsg1/fxi/inc/grlib_st.h
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/inc/grlib_st.h 2007-08-28 14:38:24.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/inc/grlib_st.h 2007-08-28 14:41:11.000000000 +0200
+--- a/fxi/inc/grlib_st.h
++++ b/fxi/inc/grlib_st.h
@@ -95,6 +95,16 @@
}
CPOINT ;
@@ -817,10 +705,8 @@ Index: fenix-0.92a.dfsg1/fxi/inc/grlib_st.h
Sint16 * blend_table ; /* Pointer to 16 bits blend table if any */
int modified ; /* 1 if bitmap needs analysis */
-Index: fenix-0.92a.dfsg1/fxi/inc/instance_st.h
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/inc/instance_st.h 2007-08-28 14:38:24.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/inc/instance_st.h 2007-08-28 14:41:11.000000000 +0200
+--- a/fxi/inc/instance_st.h
++++ b/fxi/inc/instance_st.h
@@ -27,6 +27,10 @@
#ifndef __INSTANCE_ST_H
#define __INSTANCE_ST_H
@@ -860,10 +746,8 @@ Index: fenix-0.92a.dfsg1/fxi/inc/instance_st.h
/* 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) )
-Index: fenix-0.92a.dfsg1/fxi/src/Be_compat/be_compat.cpp
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ fenix-0.92a.dfsg1/fxi/src/Be_compat/be_compat.cpp 2007-08-28 14:41:11.000000000 +0200
+--- /dev/null
++++ b/fxi/src/Be_compat/be_compat.cpp
@@ -0,0 +1,29 @@
+/*-------------------------------------------------------------------------------------------------------
+Copyright (c) 2003 Joseba García Etxebarria, under the GPL, as described
@@ -894,27 +778,21 @@ Index: fenix-0.92a.dfsg1/fxi/src/Be_compat/be_compat.cpp
+ alert_p -> Go();
+ free (error_msg);
+}
-Index: fenix-0.92a.dfsg1/fxi/src/Be_compat/be_compat.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ fenix-0.92a.dfsg1/fxi/src/Be_compat/be_compat.h 2007-08-28 14:41:11.000000000 +0200
+--- /dev/null
++++ b/fxi/src/Be_compat/be_compat.h
@@ -0,0 +1,5 @@
+#ifndef _BE_COMPAT_H
+#define _BE_COMPAT_H
+
+void be_alert (const char *error);
+#endif
-Index: fenix-0.92a.dfsg1/fxi/src/Be_compat/libbe_compat.proj
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ fenix-0.92a.dfsg1/fxi/src/Be_compat/libbe_compat.proj 2007-08-28 14:41:11.000000000 +0200
+--- /dev/null
++++ b/fxi/src/Be_compat/libbe_compat.proj
@@ -0,0 +1 @@
+MIDE
\ No newline at end of file
-Index: fenix-0.92a.dfsg1/fxi/src/dcbr.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/dcbr.c 2007-08-28 14:40:57.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/dcbr.c 2007-08-28 14:41:11.000000000 +0200
+--- a/fxi/src/dcbr.c
++++ b/fxi/src/dcbr.c
@@ -124,7 +124,7 @@
while (!file_eof(fp))
@@ -924,10 +802,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/dcbr.c
trim(line);
if (allocated == count)
{
-Index: fenix-0.92a.dfsg1/fxi/src/fbm.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/fbm.c 2007-08-28 14:39:54.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/fbm.c 2007-08-28 14:41:11.000000000 +0200
+--- a/fxi/src/fbm.c
++++ b/fxi/src/fbm.c
@@ -87,6 +87,46 @@
}
}
@@ -1079,10 +955,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/fbm.c
if (map->depth == 16)
{
-Index: fenix-0.92a.dfsg1/fxi/src/f_cd.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/f_cd.c 2007-08-28 14:38:24.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/f_cd.c 2007-08-28 14:41:11.000000000 +0200
+--- a/fxi/src/f_cd.c
++++ b/fxi/src/f_cd.c
@@ -105,11 +105,11 @@
GLODWORD(CD_TRACK) = sdl_cd->cur_track;
FRAMES_TO_MSF (sdl_cd->cur_frame, &GLODWORD(CD_MINUTE), &GLODWORD(CD_SECOND), &GLODWORD(CD_SUBFRAME));
@@ -1112,10 +986,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/f_cd.c
}
+*/
-Index: fenix-0.92a.dfsg1/fxi/src/fgc.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/fgc.c 2007-08-28 14:39:54.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/fgc.c 2007-08-28 14:41:11.000000000 +0200
+--- a/fxi/src/fgc.c
++++ b/fxi/src/fgc.c
@@ -75,6 +75,7 @@
FGC_HEADER header;
Uint32 * offsets;
@@ -1249,10 +1121,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/fgc.c
assert (file_pos(fp) == (int)offsets[n]);
if (!fbm_save_to (lib->maps[i], fp, 0))
-Index: fenix-0.92a.dfsg1/fxi/src/fnc_exports.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/fnc_exports.c 2007-08-28 14:39:54.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/fnc_exports.c 2007-08-28 14:41:12.000000000 +0200
+--- a/fxi/src/fnc_exports.c
++++ b/fxi/src/fnc_exports.c
@@ -72,6 +72,8 @@
{ "file_write" , file_write },
{ "file_gets" , file_gets },
@@ -1262,10 +1132,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/fnc_exports.c
{ "file_size" , file_size },
{ "file_pos" , file_pos },
{ "file_seek" , file_seek },
-Index: fenix-0.92a.dfsg1/fxi/src/fpl.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/fpl.c 2007-08-28 14:39:55.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/fpl.c 2007-08-28 14:44:03.000000000 +0200
+--- a/fxi/src/fpl.c
++++ b/fxi/src/fpl.c
@@ -100,7 +100,7 @@
}
@@ -1284,10 +1152,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/fpl.c
color_palette[3*n + 1] = palette[n].g;
color_palette[3*n + 2] = palette[n].b;
}
-Index: fenix-0.92a.dfsg1/fxi/src/g_blendop.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/g_blendop.c 2007-08-28 14:38:25.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/g_blendop.c 2007-08-28 14:41:12.000000000 +0200
+--- a/fxi/src/g_blendop.c
++++ b/fxi/src/g_blendop.c
@@ -323,8 +323,8 @@
r = GETR(i);
g = GETG(i);
@@ -1308,10 +1174,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/g_blendop.c
blend[i] = MAKERGB(max, max, max) ;
}
}
-Index: fenix-0.92a.dfsg1/fxi/src/g_blit.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/g_blit.c 2007-08-28 14:39:55.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/g_blit.c 2007-08-28 14:41:12.000000000 +0200
+--- a/fxi/src/g_blit.c
++++ b/fxi/src/g_blit.c
@@ -96,6 +96,8 @@
Sint16 * ghost2;
Uint8 * ghost8;
@@ -1556,10 +1420,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/g_blit.c
dest->modified = 1 ;
}
-Index: fenix-0.92a.dfsg1/fxi/src/g_console.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/g_console.c 2007-08-28 14:39:56.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/g_console.c 2007-08-28 14:41:12.000000000 +0200
+--- a/fxi/src/g_console.c
++++ b/fxi/src/g_console.c
@@ -53,9 +53,9 @@
#define CHARHEIGHT 8
@@ -1733,10 +1595,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/g_console.c
{
char act=*action;
i = findproc(NULL, action, ptr);
-Index: fenix-0.92a.dfsg1/fxi/src/g_conversion.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/g_conversion.c 2007-08-28 14:39:56.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/g_conversion.c 2007-08-28 14:41:13.000000000 +0200
+--- a/fxi/src/g_conversion.c
++++ b/fxi/src/g_conversion.c
@@ -76,10 +76,8 @@
int i, color, inc, next = 0, factor;
Uint16 * table16 = NULL;
@@ -1774,10 +1634,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/g_conversion.c
return alpha16[alpha];
}
-Index: fenix-0.92a.dfsg1/fxi/src/g_draw.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/g_draw.c 2007-08-28 14:39:56.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/g_draw.c 2007-08-28 14:41:13.000000000 +0200
+--- a/fxi/src/g_draw.c
++++ b/fxi/src/g_draw.c
@@ -46,17 +46,15 @@
#include "files.h"
#include "grlib.h"
@@ -2709,10 +2567,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/g_draw.c
+ if (drawing_alpha != 255) syscolor16_alpha = gr_alpha16(drawing_alpha)[syscolor16];
}
-Index: fenix-0.92a.dfsg1/fxi/src/g_font.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/g_font.c 2007-08-28 14:39:56.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/g_font.c 2007-08-28 14:41:13.000000000 +0200
+--- a/fxi/src/g_font.c
++++ b/fxi/src/g_font.c
@@ -159,8 +159,7 @@
for (y = 0 ; y < height ; y++, ptr += bitmap->pitch)
memcpy (ptr, charptr + linesize*y, linesize);
@@ -2983,10 +2839,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/g_font.c
+ if (id >= 0 && id <= 255) return fonts[id];
return NULL;
}
-Index: fenix-0.92a.dfsg1/fxi/src/g_fpg.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/g_fpg.c 2007-08-28 14:39:56.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/g_fpg.c 2007-08-28 14:41:13.000000000 +0200
+--- a/fxi/src/g_fpg.c
++++ b/fxi/src/g_fpg.c
@@ -128,8 +128,7 @@
GRLIB * grlib_get (int libid)
@@ -3104,10 +2958,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/g_fpg.c
+ if (!syslib) syslib = grlib_create() ;
}
-Index: fenix-0.92a.dfsg1/fxi/src/g_main.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/g_main.c 2007-08-28 14:39:56.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/g_main.c 2007-08-28 14:41:13.000000000 +0200
+--- a/fxi/src/g_main.c
++++ b/fxi/src/g_main.c
@@ -111,7 +111,7 @@
static int sdl_equiv[SDLK_LAST+1] ;
@@ -3647,10 +3499,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/g_main.c
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) ;
}
-Index: fenix-0.92a.dfsg1/fxi/src/g_maps.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/g_maps.c 2007-08-28 14:39:56.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/g_maps.c 2007-08-28 14:41:13.000000000 +0200
+--- a/fxi/src/g_maps.c
++++ b/fxi/src/g_maps.c
@@ -128,6 +128,8 @@
gr->prev = NULL;
gr->current_keyframe = -1;
@@ -3780,10 +3630,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/g_maps.c
gr->code = bitmap_next_code() ;
assert (syslib) ;
grlib_add_map (0, gr) ;
-Index: fenix-0.92a.dfsg1/fxi/src/g_mode7.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/g_mode7.c 2007-08-28 14:38:26.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/g_mode7.c 2007-08-28 14:41:14.000000000 +0200
+--- a/fxi/src/g_mode7.c
++++ b/fxi/src/g_mode7.c
@@ -71,8 +71,7 @@
void gr_mode7_bbox (int n, REGION * r)
@@ -3862,10 +3710,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/g_mode7.c
}
/* Crea una lista ordenada de instancias a dibujar */
-Index: fenix-0.92a.dfsg1/fxi/src/g_pal.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/g_pal.c 2007-08-28 14:39:57.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/g_pal.c 2007-08-28 14:41:14.000000000 +0200
+--- a/fxi/src/g_pal.c
++++ b/fxi/src/g_pal.c
@@ -54,10 +54,15 @@
extern GRAPH * gr_read_png (const char * filename) ;
@@ -4368,10 +4214,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/g_pal.c
}
void gr_set_rgb (int color, int r, int g, int b)
-Index: fenix-0.92a.dfsg1/fxi/src/g_scroll.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/g_scroll.c 2007-08-28 14:39:57.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/g_scroll.c 2007-08-28 14:41:14.000000000 +0200
+--- a/fxi/src/g_scroll.c
++++ b/fxi/src/g_scroll.c
@@ -36,9 +36,6 @@
#include "fxi.h"
@@ -4382,10 +4226,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/g_scroll.c
/* Indicadores de bloqueo */
#define GRAPH_HWRAP 1
#define GRAPH_VWRAP 2
-Index: fenix-0.92a.dfsg1/fxi/src/g_texts.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/g_texts.c 2007-08-28 14:39:57.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/g_texts.c 2007-08-28 14:41:14.000000000 +0200
+--- a/fxi/src/g_texts.c
++++ b/fxi/src/g_texts.c
@@ -84,8 +84,7 @@
{
char *p1, *p2;
@@ -4471,10 +4313,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/g_texts.c
}
else
{
-Index: fenix-0.92a.dfsg1/fxi/src/i_debug.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/i_debug.c 2007-08-28 14:39:58.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/i_debug.c 2007-08-28 14:41:14.000000000 +0200
+--- a/fxi/src/i_debug.c
++++ b/fxi/src/i_debug.c
@@ -155,7 +155,7 @@
{ "STR2FLOAT", MN_STR2FLOAT, 1 },
{ "FLOAT2STR", MN_FLOAT2STR, 1 },
@@ -4502,10 +4342,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/i_debug.c
}
line[0] = 0 ;
-Index: fenix-0.92a.dfsg1/fxi/src/i_func.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/i_func.c 2007-08-28 14:41:05.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/i_func.c 2007-08-28 14:41:15.000000000 +0200
+--- a/fxi/src/i_func.c
++++ b/fxi/src/i_func.c
@@ -173,10 +173,10 @@
static int fxi_rand (INSTANCE * my, int * params)
@@ -4988,10 +4826,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/i_func.c
GLODWORD(FILE_HIDDEN) = (*ptr == '.');
GLODWORD(FILE_READONLY) = !(s.st_mode & 0444);
GLODWORD(FILE_SIZE) = s.st_size;
-Index: fenix-0.92a.dfsg1/fxi/src/i_main.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/i_main.c 2007-08-28 14:39:59.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/i_main.c 2007-08-28 14:41:15.000000000 +0200
+--- a/fxi/src/i_main.c
++++ b/fxi/src/i_main.c
@@ -182,7 +182,7 @@
return result;
}
@@ -5681,10 +5517,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/i_main.c
+
return return_value;
}
-Index: fenix-0.92a.dfsg1/fxi/src/img_pcx.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/img_pcx.c 2007-08-28 14:39:59.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/img_pcx.c 2007-08-28 14:41:16.000000000 +0200
+--- a/fxi/src/img_pcx.c
++++ b/fxi/src/img_pcx.c
@@ -81,6 +81,10 @@
Uint8 Filler[54];
} PCXheader ;
@@ -5740,10 +5574,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/img_pcx.c
} else {
gr_error (_("%s: unsupported color depth\n"), filename) ;
}
-Index: fenix-0.92a.dfsg1/fxi/src/img_png.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/img_png.c 2007-08-28 14:39:59.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/img_png.c 2007-08-28 14:41:16.000000000 +0200
+--- a/fxi/src/img_png.c
++++ b/fxi/src/img_png.c
@@ -144,35 +144,41 @@
/* Recupera el fichero, convirtiendo a 16 bits si es preciso */
@@ -5961,10 +5793,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/img_png.c
*ptr = ((*orig & 0xf800) >> 8) |
((*orig & 0x07e0) << 5) |
((*orig & 0x001f) << 19)|
-Index: fenix-0.92a.dfsg1/fxi/src/instance.c
-===================================================================
---- fenix-0.92a.dfsg1.orig/fxi/src/instance.c 2007-08-28 14:38:27.000000000 +0200
-+++ fenix-0.92a.dfsg1/fxi/src/instance.c 2007-08-28 14:41:16.000000000 +0200
+--- a/fxi/src/instance.c
++++ b/fxi/src/instance.c
@@ -53,12 +53,12 @@
/* destrucci�n, duplicado, etc. */
/* ---------------------------------------------------------------------- */
@@ -6306,10 +6136,8 @@ Index: fenix-0.92a.dfsg1/fxi/src/instance.c
return i;
}
-Index: fenix-0.92a.dfsg1/include/files.h
-===================================================================
---- fenix-0.92a.dfsg1.orig/include/files.h 2007-08-28 14:38:27.000000000 +0200
-+++ fenix-0.92a.dfsg1/include/files.h 2007-08-28 14:41:16.000000000 +0200
+--- a/include/files.h
++++ b/include/files.h
@@ -51,6 +51,8 @@
extern int file_writeUint16 (file * fp, Uint16 * buffer) ;
extern int file_writeSint32 (file * fp, Sint32 * buffer) ;
@@ -6319,10 +6147,8 @@ Index: fenix-0.92a.dfsg1/include/files.h
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) ;
-Index: fenix-0.92a.dfsg1/include/fxdll.h
-===================================================================
---- fenix-0.92a.dfsg1.orig/include/fxdll.h 2007-08-28 14:41:04.000000000 +0200
-+++ fenix-0.92a.dfsg1/include/fxdll.h 2007-08-28 14:41:17.000000000 +0200
+--- a/include/fxdll.h
++++ b/include/fxdll.h
@@ -136,6 +136,8 @@
FXEXTERN int (*_file_write )(file * fp, const void * buffer, int len) ;
FXEXTERN int (*_file_gets )(file * fp, char * buffer, int len) ;
@@ -6369,10 +6195,8 @@ Index: fenix-0.92a.dfsg1/include/fxdll.h
_file_size = FENIX_import ( "file_size" ); \
_file_pos = FENIX_import ( "file_pos" ); \
_file_seek = FENIX_import ( "file_seek" ); \
-Index: fenix-0.92a.dfsg1/include/offsets.h
-===================================================================
---- fenix-0.92a.dfsg1.orig/include/offsets.h 2007-08-28 14:38:27.000000000 +0200
-+++ fenix-0.92a.dfsg1/include/offsets.h 2007-08-28 14:41:17.000000000 +0200
+--- a/include/offsets.h
++++ b/include/offsets.h
@@ -160,28 +160,30 @@
#define COORDY 4*24
#define COORDZ 4*25
@@ -6429,10 +6253,8 @@ Index: fenix-0.92a.dfsg1/include/offsets.h
+#define SAVED_FILE 4*51
+#define SAVED_XGRAPH 4*52
+#define SAVED_PRIORITY 4*53
-Index: fenix-0.92a.dfsg1/include/pslang.h
-===================================================================
---- fenix-0.92a.dfsg1.orig/include/pslang.h 2007-08-28 14:38:27.000000000 +0200
-+++ fenix-0.92a.dfsg1/include/pslang.h 2007-08-28 14:41:17.000000000 +0200
+--- a/include/pslang.h
++++ b/include/pslang.h
@@ -236,7 +236,7 @@
/* Funciones de cadena (2) */
@@ -6442,10 +6264,8 @@ Index: fenix-0.92a.dfsg1/include/pslang.h
#define MN_STR2INT (0x77| MN_1_PARAMS)
#define MN_STR2FLOAT (0x78| MN_1_PARAMS)
#define MN_STR2CHR (0x79| MN_1_PARAMS)
-Index: fenix-0.92a.dfsg1/include/sysprocs.h
-===================================================================
---- fenix-0.92a.dfsg1.orig/include/sysprocs.h 2007-08-28 14:38:27.000000000 +0200
-+++ fenix-0.92a.dfsg1/include/sysprocs.h 2007-08-28 14:41:17.000000000 +0200
+--- a/include/sysprocs.h
++++ b/include/sysprocs.h
@@ -97,7 +97,6 @@
{ 0x5A, "JOY_BUTTONS" , "I" , TYPE_DWORD , 1 , SYSMACRO(fxi_joy_buttons_specific) },
{ 0x5B, "JOY_AXES" , "I" , TYPE_DWORD , 1 , SYSMACRO(fxi_joy_axes_specific) },
@@ -6656,10 +6476,8 @@ Index: fenix-0.92a.dfsg1/include/sysprocs.h
{ 0 , 0 , "" , 0 , 0 , 0 }
} ;
-Index: fenix-0.92a.dfsg1/NEWS
-===================================================================
---- fenix-0.92a.dfsg1.orig/NEWS 2007-08-28 14:38:27.000000000 +0200
-+++ fenix-0.92a.dfsg1/NEWS 2007-08-28 14:41:17.000000000 +0200
+--- a/NEWS
++++ b/NEWS
@@ -1,3 +1,85 @@
+0.93
+- Se corrige convesion a negativo de n�meros unsigned.
diff --git a/debian/patches/build_portability.patch b/debian/patches/build_portability.patch
index 3788f49..fa335dd 100644
--- a/debian/patches/build_portability.patch
+++ b/debian/patches/build_portability.patch
@@ -2,25 +2,10 @@ Description: Recognize armel (linux-gnueabi) as a Linux arch, too.
Bug-Debian: https://bugs.debian.org/481928
Forwarded: no
Author: Miriam Ruiz <little_miry at yahoo.es>
-Last-Update: 2008-06-06
+Last-Update: 2015-12-18
-Index: fenix-0.92a.dfsg1/configure
-===================================================================
---- fenix-0.92a.dfsg1.orig/configure 2008-06-07 01:19:20.000000000 +0200
-+++ fenix-0.92a.dfsg1/configure 2008-06-07 01:19:39.000000000 +0200
-@@ -1621,7 +1621,7 @@
-
-
- case "$target_os" in
-- linux-gnu)
-+ linux-gnu*)
- case "$target_cpu" in
- powerpc*)
- COMMON_CFLAGS="-Wall -DTARGET_LinuxPPC -DTARGET_Linux"
-Index: fenix-0.92a.dfsg1/configure.in
-===================================================================
---- fenix-0.92a.dfsg1.orig/configure.in 2008-06-07 01:18:44.000000000 +0200
-+++ fenix-0.92a.dfsg1/configure.in 2008-06-07 01:19:15.000000000 +0200
+--- a/configure.in
++++ b/configure.in
@@ -40,7 +40,7 @@
dnl Aqui es donde se chequeara el SO, pero solo hay una opcion xD
diff --git a/debian/patches/cflags-env.patch b/debian/patches/cflags-env.patch
index 21e7605..95c2e3f 100644
--- a/debian/patches/cflags-env.patch
+++ b/debian/patches/cflags-env.patch
@@ -3,29 +3,6 @@ Forwarded: no
Author: Peter Pentchev <roam at ringlet.net>
Last-Update: 2015-12-18
---- a/configure
-+++ b/configure
-@@ -3173,11 +3173,16 @@
- fi
-
-
--if test "x$enable_debug" = "xyes"; then
-- CFLAGS="-g $INCLUDES"
--else
-- CFLAGS="-O2 -finline-functions -ffast-math $INCLUDES"
-+echo "RDBG before: CFLAGS '$CFLAGS'" >&6
-+if [ -z "$CFLAGS" ]; then
-+ if test "x$enable_debug" = "xyes"; then
-+ CFLAGS="-g"
-+ else
-+ CFLAGS="-O2 -finline-functions -ffast-math"
-+ fi
- fi
-+CFLAGS="$CFLAGS $INCLUDES"
-+echo "RDBG after: CFLAGS '$CFLAGS'" >&6
-
-
- ac_ext=c
--- a/configure.in
+++ b/configure.in
@@ -84,11 +84,14 @@
diff --git a/debian/patches/configure.patch b/debian/patches/configure.patch
index e7295a7..a0a14ca 100644
--- a/debian/patches/configure.patch
+++ b/debian/patches/configure.patch
@@ -1,34 +1,10 @@
Description: Remove some weird options from the configure script.
Forwarded: no
Author: Miriam Ruiz <little_miry at yahoo.es>
-Last-Update: 2007-06-20
+Last-Update: 2015-12-18
-Index: fenix-0.92a.dfsg1/configure
-===================================================================
---- fenix-0.92a.dfsg1.orig/configure 2007-08-28 14:38:55.000000000 +0200
-+++ fenix-0.92a.dfsg1/configure 2007-08-28 14:44:28.000000000 +0200
-@@ -1629,7 +1629,7 @@
-
- *)
- COMMON_CFLAGS="-Wall -DTARGET_Linux"
-- COMMON_LIBS="$COMMON_LIBS -Wl,-Bdynamic -lc -Wl,--dynamic-linker /lib/ld-linux.so.2"
-+ COMMON_LIBS="$COMMON_LIBS -Wl,-Bdynamic -lc"
- ;;
- esac
- ;;
-@@ -3176,7 +3176,7 @@
- if test "x$enable_debug" = "xyes"; then
- CFLAGS="-g $INCLUDES"
- else
-- CFLAGS="-O3 -finline-functions -ffast-math $INCLUDES"
-+ CFLAGS="-O2 -finline-functions -ffast-math $INCLUDES"
- fi
-
-
-Index: fenix-0.92a.dfsg1/configure.in
-===================================================================
---- fenix-0.92a.dfsg1.orig/configure.in 2007-08-28 14:38:55.000000000 +0200
-+++ fenix-0.92a.dfsg1/configure.in 2007-08-28 14:44:29.000000000 +0200
+--- a/configure.in
++++ b/configure.in
@@ -48,7 +48,7 @@
*)
diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd.patch
index b4b53e8..5a2c67f 100644
--- a/debian/patches/kfreebsd.patch
+++ b/debian/patches/kfreebsd.patch
@@ -1,19 +1,8 @@
Description: Fix the build on GNU/kFreeBSD
Forwarded: no
Author: Peter Pentchev <roam at ringlet.net>
-Last-Update: 2011-03-15
+Last-Update: 2015-12-18
---- a/configure
-+++ b/configure
-@@ -1621,7 +1621,7 @@
-
-
- case "$target_os" in
-- linux-gnu*)
-+ linux-gnu*|kfreebsd-gnu*)
- case "$target_cpu" in
- powerpc*)
- COMMON_CFLAGS="-Wall -DTARGET_LinuxPPC -DTARGET_Linux"
--- a/configure.in
+++ b/configure.in
@@ -40,7 +40,7 @@
diff --git a/debian/patches/libgif.patch b/debian/patches/libgif.patch
index 2588ae2..36862b2 100644
--- a/debian/patches/libgif.patch
+++ b/debian/patches/libgif.patch
@@ -2,11 +2,11 @@ Description: Link against libgif
Author: Thibaut Gridel <tgridel at free.fr>
Bug-Debian: http://bugs.debian.org/732787
Forwarded: no
-Last-Update: 2013-12-18
+Last-Update: 2015-12-18
---- fenix-0.92a.dfsg1.orig/configure.in
-+++ fenix-0.92a.dfsg1/configure.in
-@@ -115,7 +115,7 @@ fi
+--- a/configure.in
++++ b/configure.in
+@@ -115,7 +115,7 @@
dnl para map
if test "$map" = yes; then
@@ -15,61 +15,9 @@ Last-Update: 2013-12-18
fi
dnl make these visible to all Makefiles
-
---- fenix-0.92a.dfsg1.orig/configure
-+++ fenix-0.92a.dfsg1/configure
-@@ -4454,13 +4454,13 @@ fi
- fi
-
- if test "$map" = yes; then
-- echo "$as_me:$LINENO: checking for DGifOpenFileName in -lungif" >&5
--echo $ECHO_N "checking for DGifOpenFileName in -lungif... $ECHO_C" >&6
--if test "${ac_cv_lib_ungif_DGifOpenFileName+set}" = set; then
-+ echo "$as_me:$LINENO: checking for DGifOpenFileName in -lgif" >&5
-+echo $ECHO_N "checking for DGifOpenFileName in -lgif... $ECHO_C" >&6
-+if test "${ac_cv_lib_gif_DGifOpenFileName+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lungif $LIBS"
-+LIBS="-lgif $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h. */
-@@ -4496,23 +4496,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_lib_ungif_DGifOpenFileName=yes
-+ ac_cv_lib_gif_DGifOpenFileName=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_ungif_DGifOpenFileName=no
-+ac_cv_lib_gif_DGifOpenFileName=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_DGifOpenFileName" >&5
--echo "${ECHO_T}$ac_cv_lib_ungif_DGifOpenFileName" >&6
--if test $ac_cv_lib_ungif_DGifOpenFileName = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_gif_DGifOpenFileName" >&5
-+echo "${ECHO_T}$ac_cv_lib_gif_DGifOpenFileName" >&6
-+if test $ac_cv_lib_gif_DGifOpenFileName = yes; then
- LIBS="$LIBS"
- else
-- { { echo "$as_me:$LINENO: error: lungif library not found" >&5
--echo "$as_me: error: lungif library not found" >&2;}
-+ { { echo "$as_me:$LINENO: error: lgif library not found" >&5
-+echo "$as_me: error: lgif library not found" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
---- fenix-0.92a.dfsg1.orig/fpg/Makefile.am
-+++ fenix-0.92a.dfsg1/fpg/Makefile.am
-@@ -5,7 +5,7 @@ bin_PROGRAMS=fpg
+--- a/fpg/Makefile.am
++++ b/fpg/Makefile.am
+@@ -5,7 +5,7 @@
INCLUDES = $(COMMON_CFLAGS)
@@ -78,9 +26,9 @@ Last-Update: 2013-12-18
SOURCE_FILES=fpg.c
---- fenix-0.92a.dfsg1.orig/map/Makefile.am
-+++ fenix-0.92a.dfsg1/map/Makefile.am
-@@ -5,7 +5,7 @@ bin_PROGRAMS=map
+--- a/map/Makefile.am
++++ b/map/Makefile.am
+@@ -5,7 +5,7 @@
INCLUDES = $(COMMON_CFLAGS)
@@ -89,47 +37,3 @@ Last-Update: 2013-12-18
SOURCE_FILES=map.c
---- fenix-0.92a.dfsg1.orig/fpg/Makefile
-+++ fenix-0.92a.dfsg1/fpg/Makefile
-@@ -145,7 +145,7 @@ bin_PROGRAMS = fpg
-
- INCLUDES = $(COMMON_CFLAGS)
-
--fpg_LDADD = $(COMMON_LIBS) -lz -lungif -lpng
-+fpg_LDADD = $(COMMON_LIBS) -lz -lgif -lpng
-
- SOURCE_FILES = fpg.c
-
---- fenix-0.92a.dfsg1.orig/fpg/Makefile.in
-+++ fenix-0.92a.dfsg1/fpg/Makefile.in
-@@ -145,7 +145,7 @@ bin_PROGRAMS = fpg
-
- INCLUDES = $(COMMON_CFLAGS)
-
--fpg_LDADD = $(COMMON_LIBS) -lz -lungif -lpng
-+fpg_LDADD = $(COMMON_LIBS) -lz -lgif -lpng
-
- SOURCE_FILES = fpg.c
-
---- fenix-0.92a.dfsg1.orig/map/Makefile
-+++ fenix-0.92a.dfsg1/map/Makefile
-@@ -145,7 +145,7 @@ bin_PROGRAMS = map
-
- INCLUDES = $(COMMON_CFLAGS)
-
--map_LDADD = $(COMMON_LIBS) -lz -lungif -lpng
-+map_LDADD = $(COMMON_LIBS) -lz -lgif -lpng
-
- SOURCE_FILES = map.c
-
---- fenix-0.92a.dfsg1.orig/map/Makefile.in
-+++ fenix-0.92a.dfsg1/map/Makefile.in
-@@ -145,7 +145,7 @@ bin_PROGRAMS = map
-
- INCLUDES = $(COMMON_CFLAGS)
-
--map_LDADD = $(COMMON_LIBS) -lz -lungif -lpng
-+map_LDADD = $(COMMON_LIBS) -lz -lgif -lpng
-
- SOURCE_FILES = map.c
-
diff --git a/debian/patches/no_--as-needed_in_fxi-src-Makefile.patch b/debian/patches/no_--as-needed_in_fxi-src-Makefile.patch
index 11f271b..839591b 100644
--- a/debian/patches/no_--as-needed_in_fxi-src-Makefile.patch
+++ b/debian/patches/no_--as-needed_in_fxi-src-Makefile.patch
@@ -2,20 +2,9 @@ Description: Do not pass --as-needed
--as-needed was passed to gcc and produced a FTBFS with gcc 4.6
Author: Evgeni Golov <evgeni at debian.org>
---- fenix-0.92a.dfsg1.orig/fxi/src/Makefile.am
-+++ fenix-0.92a.dfsg1/fxi/src/Makefile.am
-@@ -7,8 +7,6 @@ INCLUDES = $(COMMON_CFLAGS) $(SDL_CFLAGS
-
- fxi_LDADD = $(SDL_LIBS) $(COMMON_LIBS) -lz -lpng -lSDL_mixer
-
--fxi_LDFLAGS = --as-needed
--
- SOURCE_FILES = main.c dcbr.c instance.c strings.c \
- i_main.c i_debug.c i_func.c \
- g_main.c g_maps.c g_blit.c g_texts.c g_pal.c g_draw.c \
---- fenix-0.92a.dfsg1.orig/fxi/src/Makefile.in
-+++ fenix-0.92a.dfsg1/fxi/src/Makefile.in
-@@ -147,8 +147,6 @@ INCLUDES = $(COMMON_CFLAGS) $(SDL_CFLAGS
+--- a/fxi/src/Makefile.am
++++ b/fxi/src/Makefile.am
+@@ -7,8 +7,6 @@
fxi_LDADD = $(SDL_LIBS) $(COMMON_LIBS) -lz -lpng -lSDL_mixer
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/fenix.git
More information about the Pkg-games-commits
mailing list