Author: baby-guest
Date: 2007-07-31 14:25:12 +0000 (Tue, 31 Jul 2007)
New Revision: 3506
Added:
packages/trunk/fenix/debian/patches/fxc_return_values.patch
packages/trunk/fenix/debian/patches/fxi_return_values.patch
Modified:
packages/trunk/fenix/debian/changelog
packages/trunk/fenix/debian/patches/series
packages/trunk/fenix/debian/rules
Log:
Make fxc and fxi return proper values to signal errors in Linux.
Added patch and unpatch targets to debian/rules for developers comfort.
Modified: packages/trunk/fenix/debian/changelog
===================================================================
--- packages/trunk/fenix/debian/changelog 2007-07-31 07:48:00 UTC (rev
3505)
+++ packages/trunk/fenix/debian/changelog 2007-07-31 14:25:12 UTC (rev
3506)
@@ -6,6 +6,7 @@
* Added support for reading programs from stdin in the interpreter.
* Added fenix binary to compile and execute a game on the fly.
* Put everything in a single package.
+ * Make fxc and fxi return proper values to signal errors in Linux.
[ Cyril Brulebois ]
* Added XS-Vcs-Svn and XS-Vcs-Browser fields in the control file.
Added: packages/trunk/fenix/debian/patches/fxc_return_values.patch
===================================================================
--- packages/trunk/fenix/debian/patches/fxc_return_values.patch
(rev 0)
+++ packages/trunk/fenix/debian/patches/fxc_return_values.patch 2007-07-31
14:25:12 UTC (rev 3506)
@@ -0,0 +1,38 @@
+diff -ruN fenix-0.92a.dfsg1.orig/fxc/src/main.c
fenix-0.92a.dfsg1/fxc/src/main.c
+--- fenix-0.92a.dfsg1.orig/fxc/src/main.c 2007-07-31 13:59:25.000000000
+0000
++++ fenix-0.92a.dfsg1/fxc/src/main.c 2007-07-31 14:02:05.000000000 +0000
+@@ -260,7 +260,7 @@
+ {
+ fprintf (stderr, MSG_TOO_MANY_FILES) ;
+ fprintf (stderr, "\n") ;
+- return 0 ;
++ return -2 ;
+ }
+ filename = argv[i] ;
+ }
+@@ -271,7 +271,7 @@
+ fprintf (stderr, MSG_USING, argv[0]) ;
+ fprintf (stderr, MSG_OPTION_D) ;
+ fprintf (stderr, MSG_OPTIONS) ;
+- return 0 ;
++ return -1 ;
+ }
+
+ if (*outname)
+@@ -330,7 +330,7 @@
+ if (!file_exists(stubname))
+ {
+ compile_error (_("Can't open stub file
%s"), stubname);
+- return -1;
++ return -3;
+ }
+ }
+ }
+@@ -355,6 +355,6 @@
+ /* destroy error messages list */
+ err_destroyErrorTable() ;
+
+- return 1 ;
++ return 0 ;
+ }
+
Added: packages/trunk/fenix/debian/patches/fxi_return_values.patch
===================================================================
--- packages/trunk/fenix/debian/patches/fxi_return_values.patch
(rev 0)
+++ packages/trunk/fenix/debian/patches/fxi_return_values.patch 2007-07-31
14:25:12 UTC (rev 3506)
@@ -0,0 +1,21 @@
+diff -ruN fenix-0.92a.dfsg1.orig/fxi/src/main.c
fenix-0.92a.dfsg1/fxi/src/main.c
+--- fenix-0.92a.dfsg1.orig/fxi/src/main.c 2007-07-31 13:59:25.000000000
+0000
++++ fenix-0.92a.dfsg1/fxi/src/main.c 2007-07-31 14:03:36.000000000 +0000
+@@ -302,7 +302,7 @@
+ "agreement (GNU GPL version 2 or later).\n"
+ "See COPYING for license details.\n"),
+ argv[0]) ;
+- return 0 ;
++ return -1 ;
+ }
+ }
+
+@@ -340,7 +340,7 @@
+ if (!dcb_load(dcbname))
+ {
+ gr_error (_("'%s': file does not exist
or it's not a DCB version %d file or compatible"), filename, DCB_VERSION >> 8) ;
+- return -1 ;
++ return -2 ;
+ }
+ }
+ }
Modified: packages/trunk/fenix/debian/patches/series
===================================================================
--- packages/trunk/fenix/debian/patches/series 2007-07-31 07:48:00 UTC (rev
3505)
+++ packages/trunk/fenix/debian/patches/series 2007-07-31 14:25:12 UTC (rev
3506)
@@ -8,4 +8,6 @@
common_stdfiles.patch
fxc_output.patch
fxi_input.patch
+fxc_return_values.patch
+fxi_return_values.patch
0.92a_to_cvs-20070713.1513.patch
Modified: packages/trunk/fenix/debian/rules
===================================================================
--- packages/trunk/fenix/debian/rules 2007-07-31 07:48:00 UTC (rev 3505)
+++ packages/trunk/fenix/debian/rules 2007-07-31 14:25:12 UTC (rev 3506)
@@ -18,6 +18,12 @@
CFLAGS += -DUSE_GETTEXT
+patch:
+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+
+unpatch:
+ QUILT_PATCHES=debian/patches quilt pop -a -f || test $$? = 2
+
config.status: configure
dh_testdir
$(MAKE) -f /usr/share/quilt/quilt.make patch
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
