[opentyrian] 02/02: update GDP.patch with extra commit from upstream

Alexandre Detiste detiste-guest at moszumanska.debian.org
Sat Mar 4 19:55:59 UTC 2017


This is an automated email from the git hooks/post-receive script.

detiste-guest pushed a commit to branch master
in repository opentyrian.

commit 11007edf86d36d46bf05a5d79d0cdbc8bfd7b0c5
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Sat Mar 4 20:55:02 2017 +0100

    update GDP.patch with extra commit from upstream
    
    'ensure SDL is put back in a sane state if files are missing'
    https://bitbucket.org/opentyrian/opentyrian/commits/12c763dc1ca049825e928a8a417812d55c44bcf9
---
 debian/patches/gdp.patch | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/debian/patches/gdp.patch b/debian/patches/gdp.patch
index 83fc7de..4b95b53 100644
--- a/debian/patches/gdp.patch
+++ b/debian/patches/gdp.patch
@@ -1,6 +1,5 @@
-diff -r 12c763dc1ca0 src/varz.c
---- a/src/varz.c	Sun Apr 05 11:29:52 2015 +0200
-+++ b/src/varz.c	Sun Apr 05 13:03:59 2015 +0200
+--- a/src/varz.c
++++ b/src/varz.c
 @@ -16,6 +16,10 @@
   * along with this program; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
@@ -51,3 +50,22 @@ diff -r 12c763dc1ca0 src/varz.c
  	exit(code);
  }
  
+--- a/src/file.c
++++ b/src/file.c
+@@ -18,6 +18,7 @@
+  */
+ #include "file.h"
+ #include "opentyr.h"
++#include "varz.h"
+ 
+ #include "SDL.h"
+ #include <errno.h>
+@@ -96,7 +97,7 @@
+ 		fprintf(stderr, "error: failed to open '%s': %s\n", file, strerror(errno));
+ 		fprintf(stderr, "error: One or more of the required Tyrian " TYRIAN_VERSION " data files could not be found.\n"
+ 		                "       Please read the README file.\n");
+-		exit(1);
++		JE_tyrianHalt(1);
+ 	}
+ 	
+ 	return f;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/opentyrian.git



More information about the Pkg-games-commits mailing list