[SCM] Debian packaging of wesnoth branch, master, updated. debian/1.8.5-1-2-gb7c02cc

[Gerfried Fuchs]

The following commit has been merged in the master branch:
commit a860b047e1cd39f6efdc5d2f35d0b8bf5b41268d
Author: Gerfried Fuchs <rhonda at debian.org>
Date:   Thu May 5 17:26:40 2011 +0200

    Fix patch wesnothd-name

diff --git a/debian/changelog b/debian/changelog
index 44105d0..c445344 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wesnoth-1.8 (1:1.8.5-2) unstable; urgency=low
+ 
+  * Fix patch wesnothd-name to really find the proper binary (closes: #617945)
+
+ -- 
+
 wesnoth-1.8 (1:1.8.5-1) unstable; urgency=low
 
   * New upstream stable release.
diff --git a/debian/patches/03wesnothd-name b/debian/patches/03wesnothd-name
index ed19884..85625ba 100644
--- a/debian/patches/03wesnothd-name
+++ b/debian/patches/03wesnothd-name
@@ -1,9 +1,11 @@
-Author: Gerfried Fuchs <rhonda at debian.at>	vim:ft=diff:
+Author: Gerfried Fuchs <rhonda at debian.org>	vim:ft=diff:
 Description: Search for wesnothd-1.8 instead of plain wesnothd
 
+Index: b/src/game_preferences_display.cpp
+===================================================================
 --- a/src/game_preferences_display.cpp
 +++ b/src/game_preferences_display.cpp
-@@ -1255,7 +1255,7 @@
+@@ -1287,7 +1287,7 @@ std::string show_wesnothd_server_search(
  #ifndef WESNOTH_PREFIX
  #define WESNOTH_PREFIX "/usr"
  #endif
@@ -12,3 +14,16 @@ Description: Search for wesnothd-1.8 instead of plain wesnothd
  	std::string path = WESNOTH_PREFIX + std::string("/bin");
  	if (!is_directory(path))
  		path = get_cwd();
+Index: b/src/game.cpp
+===================================================================
+--- a/src/game.cpp
++++ b/src/game.cpp
+@@ -1262,7 +1262,7 @@ void game_controller::start_wesnothd()
+ {
+ 	const std::string wesnothd_program =
+ 		preferences::get_mp_server_program_name().empty() ?
+-		get_program_invocation("wesnothd") : preferences::get_mp_server_program_name();
++		get_program_invocation("wesnothd-1.8") : preferences::get_mp_server_program_name();
+ 
+ 	std::string config = get_user_config_dir() + "/lan_server.cfg";
+ 	if (!file_exists(config)) {
diff --git a/debian/patches/03wesnothd-name.in b/debian/patches/03wesnothd-name.in
index bc5681b..58bc86f 100644
--- a/debian/patches/03wesnothd-name.in
+++ b/debian/patches/03wesnothd-name.in
@@ -1,6 +1,8 @@
-Author: Gerfried Fuchs <rhonda at debian.at>	vim:ft=diff:
+Author: Gerfried Fuchs <rhonda at debian.org>	vim:ft=diff:
 Description: Search for wesnothd-BRANCH instead of plain wesnothd
 
+Index: b/src/game_preferences_display.cpp
+===================================================================
 --- a/src/game_preferences_display.cpp
 +++ b/src/game_preferences_display.cpp
 @@ -1255,7 +1255,7 @@
@@ -12,3 +14,16 @@ Description: Search for wesnothd-BRANCH instead of plain wesnothd
  	std::string path = WESNOTH_PREFIX + std::string("/bin");
  	if (!is_directory(path))
  		path = get_cwd();
+Index: b/src/game.cpp
+===================================================================
+--- a/src/game.cpp
++++ b/src/game.cpp
+@@ -1262,7 +1262,7 @@ void game_controller::start_wesnothd()
+ {
+ 	const std::string wesnothd_program =
+ 		preferences::get_mp_server_program_name().empty() ?
+-		get_program_invocation("wesnothd") : preferences::get_mp_server_program_name();
++		get_program_invocation("wesnothd-BRANCH") : preferences::get_mp_server_program_name();
+ 
+ 	std::string config = get_user_config_dir() + "/lan_server.cfg";
+ 	if (!file_exists(config)) {

-- 
Debian packaging of wesnoth