[SCM] transportation simulator branch, master, updated. debian/111.0-1-11-ga37041a

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit 7ef5b1bc7d5b1661db7d29d23af39ac4ce1afec3
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Sat Mar 10 19:17:32 2012 +0100

    Backport SVN commit 5473 to fix a compiler error.

diff --git a/debian/patches/0001-kierongreen-fix-compile-error.patch b/debian/patches/0001-kierongreen-fix-compile-error.patch
new file mode 100644
index 0000000..eea9a8c
--- /dev/null
+++ b/debian/patches/0001-kierongreen-fix-compile-error.patch
@@ -0,0 +1,26 @@
+From 525ef84eda2769212456da144f07311d08ccb4f5 Mon Sep 17 00:00:00 2001
+From: Dwachs <dwachs at gmx.net>
+Date: Sat, 3 Mar 2012 10:55:42 +0000
+Subject: [PATCH] (kierongreen) fix compile error
+
+git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5473 8aca7d54-2c30-db11-9de9-000461428c89
+---
+ dataobj/loadsave.cc |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/dataobj/loadsave.cc b/dataobj/loadsave.cc
+index e9e82b3..d44d9f5 100644
+--- a/dataobj/loadsave.cc
++++ b/dataobj/loadsave.cc
+@@ -246,7 +246,7 @@ const char *loadsave_t::close()
+ 	const char *success = NULL;
+ 
+ 	if(  is_xml()  &&  saving  &&  (!is_bzip2()  ||  fd->bse==BZ_OK)
+-	     &&  (is_zipped()  ?  fd->gzfp  :  fd->fp) ) {
++	     &&  (is_zipped()  ?  fd->gzfp != NULL :  fd->fp != NULL) ) {
+ 		// only write when close and no error occurred
+ 		const char *end = "\n</Simutrans>\n";
+ 		write( end, strlen(end) );
+-- 
+1.7.9.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 6681fb7..a3f5a3b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ path-for-game-data.diff
 config.diff
 sha1-replacement.diff
 link-less-libraries.diff
+0001-kierongreen-fix-compile-error.patch

-- 
transportation simulator