[SCM] transportation simulator branch, master, updated. debian/111.3.1-1

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit 605fc2ff884e54a536d0bb9f538f71c16e20ead5
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Thu Aug 2 17:40:04 2012 +0200

    Refresh patches.

diff --git a/debian/patches/config.diff b/debian/patches/config.diff
index 3396fbe..30d7b05 100644
--- a/debian/patches/config.diff
+++ b/debian/patches/config.diff
@@ -113,7 +113,7 @@ Build configuration for Debian
 +endif
 --- a/simtypes.h
 +++ b/simtypes.h
-@@ -10,6 +10,13 @@
+@@ -8,6 +8,13 @@
  
  #include "utils/for.h"
  
@@ -129,7 +129,7 @@ Build configuration for Debian
  #		error "Simutrans cannot be compiled with Visual C++ 6.0 or earlier."
 --- a/Makefile
 +++ b/Makefile
-@@ -79,18 +79,18 @@
+@@ -80,18 +80,18 @@
  SDL_CONFIG     ?= sdl-config
  
  
diff --git a/debian/patches/path-for-game-data.diff b/debian/patches/path-for-game-data.diff
index 0010b07..3dda52a 100644
--- a/debian/patches/path-for-game-data.diff
+++ b/debian/patches/path-for-game-data.diff
@@ -4,7 +4,7 @@ look in /usr/share/games/simutrans for game data
 
 --- a/simmain.cc
 +++ b/simmain.cc
-@@ -439,8 +439,9 @@
+@@ -442,8 +442,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 c1ff5d1..257de17 100644
--- a/debian/patches/revert-svn-1937.diff
+++ b/debian/patches/revert-svn-1937.diff
@@ -7,7 +7,7 @@ savegames instead of ~/simutrans.
 
 --- a/simsys.cc
 +++ b/simsys.cc
-@@ -47,7 +47,7 @@
+@@ -56,7 +56,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 09bf395..3525ac6 100644
--- a/debian/patches/sha1-replacement.diff
+++ b/debian/patches/sha1-replacement.diff
@@ -11,7 +11,7 @@ Subject: Provide replacement for non-free SHA-1 implementation
 +LIBS += -lcrypto
 +
  ifeq ($(OSTYPE),amiga)
-   STD_LIBS ?= -lz -lbz2 -lunix -lpthread -lSDL_mixer -lsmpeg -lvorbisfile -lvorbis -logg
+   STD_LIBS ?= -lz -lbz2 -lunix -lSDL_mixer -lsmpeg -lvorbisfile -lvorbis -logg
    CFLAGS += -mcrt=newlib -DUSE_C -DBIG_ENDIAN -gstabs+
 --- /dev/null
 +++ b/utils/sha1.cc

-- 
transportation simulator