Merge branch 'master' of ssh://git.debian.org/git/pkg-games/simutrans

debian/changelog

+simutrans (120.2.2-2) unstable; urgency=medium
+
+  * Team upload.
+  * Update 0500-config.diff. Use sdl_config instead of sdl2_config.
+    This will enable the MIDI music again. Thanks to Julius Andrikonis for the
+    report. (Closes: #869029)
+
+ -- Markus Koschany <apo@debian.org>  Tue, 01 Aug 2017 00:30:13 +0200
+
 simutrans (120.2.2-1) unstable; urgency=medium
 
   [ Jörg Frings-Fürst ]

debian/patches/0500-config.diff

@@ -57,8 +57,8 @@ Index: trunk/config.default
 +# Define these as empty strings, if you don't have the respective config program
 +#ALLEGRO_CONFIG = allegro-config
 +#PNG_CONFIG     = pkg-config libpng
-+#SDL_CONFIG     = sdl-config
-+SDL2_CONFIG    = sdl2-config
++SDL_CONFIG     = sdl-config
++#SDL2_CONFIG    = sdl2-config
 +
 +VERBOSE = 1
 +