[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 fee2116b784abc51e51f6a2f43bd3c477f7ae6af
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Sat Mar 10 18:59:33 2012 +0100

    Refresh patches.

diff --git a/debian/patches/config.diff b/debian/patches/config.diff
index a80a245..3396fbe 100644
--- a/debian/patches/config.diff
+++ b/debian/patches/config.diff
@@ -2,8 +2,8 @@ Build configuration for Debian
 
 @DPATCH@
 
---- simutrans.orig/makeobj/Makefile
-+++ simutrans/makeobj/Makefile
+--- a/makeobj/Makefile
++++ b/makeobj/Makefile
 @@ -41,16 +41,16 @@
    CXXFLAGS   += -DUSE_HW -DUSE_C
  endif
@@ -32,7 +32,7 @@ Build configuration for Debian
  ifdef DEBUG
    ifeq ($(shell expr $(DEBUG) \>= 1), 1)
 --- /dev/null
-+++ simutrans/config.default
++++ b/config.default
 @@ -0,0 +1,77 @@
 +#
 +# to compile:
@@ -111,11 +111,11 @@ Build configuration for Debian
 +ifneq ($(shell dpkg-architecture -qDEB_BUILD_ARCH),i386)
 +  FLAGS += -DUSE_C
 +endif
---- simutrans.orig/simtypes.h
-+++ simutrans/simtypes.h
-@@ -8,6 +8,13 @@
- #ifndef SIMTYPES_H
- #define SIMTYPES_H
+--- a/simtypes.h
++++ b/simtypes.h
+@@ -10,6 +10,13 @@
+ 
+ #include "utils/for.h"
  
 +#include <endian.h>
 +#undef LITTLE_ENDIAN //endian.h gives these definitions we don't want
@@ -127,9 +127,9 @@ Build configuration for Debian
  #if defined _MSC_VER
  #	if _MSC_VER <= 1200
  #		error "Simutrans cannot be compiled with Visual C++ 6.0 or earlier."
---- simutrans.orig/Makefile
-+++ simutrans/Makefile
-@@ -79,16 +79,16 @@
+--- a/Makefile
++++ b/Makefile
+@@ -79,18 +79,18 @@
  SDL_CONFIG     ?= sdl-config
  
  
@@ -137,7 +137,9 @@ Build configuration for Debian
 -    CFLAGS += -O3 -fno-schedule-insns
 -  ifneq ($(OSTYPE),mac)
 -    ifneq ($(OSTYPE),haiku)
--      CFLAGS += -minline-all-stringops
+-      ifneq ($(OSTYPE),amiga)
+-        CFLAGS += -minline-all-stringops
+-      endif
 -    endif
 -  endif
 -else
@@ -147,7 +149,9 @@ Build configuration for Debian
 +#    CFLAGS += -O3 -fno-schedule-insns
 +#  ifneq ($(OSTYPE),mac)
 +#    ifneq ($(OSTYPE),haiku)
-+#      CFLAGS += -minline-all-stringops
++#      ifneq ($(OSTYPE),amiga)
++#        CFLAGS += -minline-all-stringops
++#      endif
 +#    endif
 +#  endif
 +#else
diff --git a/debian/patches/path-for-game-data.diff b/debian/patches/path-for-game-data.diff
index bbb0ae3..9c6b6d3 100644
--- a/debian/patches/path-for-game-data.diff
+++ b/debian/patches/path-for-game-data.diff
@@ -2,9 +2,9 @@ look in /usr/share/games/simutrans for game data
 
 @DPATCH@
 
---- simutrans.orig/simmain.cc
-+++ simutrans/simmain.cc
-@@ -446,8 +446,9 @@
+--- a/simmain.cc
++++ b/simmain.cc
+@@ -437,8 +437,9 @@
  		strcat( umgebung_t::program_dir, path_sep );
  	}
  	else {
diff --git a/debian/patches/revert-svn-1937.diff b/debian/patches/revert-svn-1937.diff
index 3e31ee1..c1ff5d1 100644
--- a/debian/patches/revert-svn-1937.diff
+++ b/debian/patches/revert-svn-1937.diff
@@ -5,9 +5,9 @@ Subject: Use ~/.simutrans for savegames
 This patch reverts SVN commit 1937 to make simutrans use ~/.simutrans for
 savegames instead of ~/simutrans.
 
---- simutrans.orig/simsys.cc
-+++ simutrans/simsys.cc
-@@ -39,7 +39,7 @@
+--- a/simsys.cc
++++ b/simsys.cc
+@@ -47,7 +47,7 @@
  #elif defined __APPLE__
  	sprintf(buffer, "%s/Library/Simutrans", getenv("HOME"));
  #else
diff --git a/debian/patches/sha1-replacement.diff b/debian/patches/sha1-replacement.diff
index 8cee7b6..e17a315 100644
--- a/debian/patches/sha1-replacement.diff
+++ b/debian/patches/sha1-replacement.diff
@@ -1,9 +1,9 @@
 From: Ansgar Burchardt <ansgar at debian.org>
 Date: Wed, 16 Feb 2011 21:28:04 +0100
 Subject: Provide replacement for non-free SHA-1 implementation
---- simutrans.orig/Makefile
-+++ simutrans/Makefile
-@@ -24,6 +24,9 @@
+--- a/Makefile
++++ b/Makefile
+@@ -19,6 +19,9 @@
  endif
  
  
@@ -14,7 +14,7 @@ Subject: Provide replacement for non-free SHA-1 implementation
    STD_LIBS ?= -lz -lbz2 -lunix -lpthread -lSDL_mixer -lsmpeg -lvorbisfile -lvorbis -logg
    CFLAGS += -mcrt=newlib -DUSE_C -DBIG_ENDIAN -gstabs+
 --- /dev/null
-+++ simutrans/utils/sha1.cc
++++ b/utils/sha1.cc
 @@ -0,0 +1,43 @@
 +/*
 + * sha1.cc
@@ -60,7 +60,7 @@ Subject: Provide replacement for non-free SHA-1 implementation
 +  Input(&mess, 1);
 +}
 --- /dev/null
-+++ simutrans/utils/sha1.h
++++ b/utils/sha1.h
 @@ -0,0 +1,27 @@
 +/*
 + * sha1.h
@@ -89,8 +89,8 @@ Subject: Provide replacement for non-free SHA-1 implementation
 +};
 +
 +#endif
---- simutrans.orig/utils/checksum.h
-+++ simutrans/utils/checksum.h
+--- a/utils/checksum.h
++++ b/utils/checksum.h
 @@ -2,6 +2,7 @@
  #define _CHECKSUM_H_
  

-- 
transportation simulator