[wesnoth] 01/01: refresh patches

[Vincent Cheng]

This is an automated email from the git hooks/post-receive script.

vcheng pushed a commit to branch devel
in repository wesnoth.

commit 0d9d5c90a73ab5fef1b975fb2c77751c3853e354
Author: Vincent Cheng <vcheng at debian.org>
Date:   Fri May 1 03:14:36 2015 -0700

    refresh patches
---
 debian/changelog                  |  1 +
 debian/patches/03wesnothd-name    | 24 ++++++++++++------------
 debian/patches/03wesnothd-name.in | 24 ++++++++++++------------
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cb25f4d..03299ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 wesnoth-1.12 (1:1.13.0-1) UNRELEASED; urgency=medium
 
   * New upstream devel release.
+    - Refresh patches.
 
  -- Vincent Cheng <vcheng at debian.org>  Fri, 01 May 2015 02:58:14 -0700
 
diff --git a/debian/patches/03wesnothd-name b/debian/patches/03wesnothd-name
index 5ab9b9d..31401ec 100644
--- a/debian/patches/03wesnothd-name
+++ b/debian/patches/03wesnothd-name
@@ -1,9 +1,20 @@
 Author: Gerfried Fuchs <rhonda at debian.org>	vim:ft=diff:
 Description: Search for wesnothd-1.13 instead of plain wesnothd
 
+--- a/src/game_launcher.cpp
++++ b/src/game_launcher.cpp
+@@ -856,7 +856,7 @@
+ {
+ 	const std::string wesnothd_program =
+ 		preferences::get_mp_server_program_name().empty() ?
+-		filesystem::get_program_invocation("wesnothd") : preferences::get_mp_server_program_name();
++		filesystem::get_program_invocation("wesnothd-1.13") : preferences::get_mp_server_program_name();
+ 
+ 	std::string config = filesystem::get_user_config_dir() + "/lan_server.cfg";
+ 	if (!filesystem::file_exists(config)) {
 --- a/src/game_preferences_display.cpp
 +++ b/src/game_preferences_display.cpp
-@@ -1489,7 +1489,7 @@
+@@ -1806,7 +1806,7 @@
  #ifndef WESNOTH_PREFIX
  #define WESNOTH_PREFIX "/usr"
  #endif
@@ -12,14 +23,3 @@ Description: Search for wesnothd-1.13 instead of plain wesnothd
  	std::string path = WESNOTH_PREFIX + std::string("/bin");
  	if (!filesystem::is_directory(path))
  		path = filesystem::get_cwd();
---- a/src/game_controller.cpp
-+++ b/src/game_controller.cpp
-@@ -759,7 +759,7 @@
- {
- 	const std::string wesnothd_program =
- 		preferences::get_mp_server_program_name().empty() ?
--		filesystem::get_program_invocation("wesnothd") : preferences::get_mp_server_program_name();
-+		filesystem::get_program_invocation("wesnothd-1.13") : preferences::get_mp_server_program_name();
- 
- 	std::string config = filesystem::get_user_config_dir() + "/lan_server.cfg";
- 	if (!filesystem::file_exists(config)) {
diff --git a/debian/patches/03wesnothd-name.in b/debian/patches/03wesnothd-name.in
index 854f5cf..7d32d78 100644
--- a/debian/patches/03wesnothd-name.in
+++ b/debian/patches/03wesnothd-name.in
@@ -1,9 +1,20 @@
 Author: Gerfried Fuchs <rhonda at debian.org>	vim:ft=diff:
 Description: Search for wesnothd-BRANCH instead of plain wesnothd
 
+--- a/src/game_launcher.cpp
++++ b/src/game_launcher.cpp
+@@ -856,7 +856,7 @@
+ {
+ 	const std::string wesnothd_program =
+ 		preferences::get_mp_server_program_name().empty() ?
+-		filesystem::get_program_invocation("wesnothd") : preferences::get_mp_server_program_name();
++		filesystem::get_program_invocation("wesnothd-BRANCH") : preferences::get_mp_server_program_name();
+ 
+ 	std::string config = filesystem::get_user_config_dir() + "/lan_server.cfg";
+ 	if (!filesystem::file_exists(config)) {
 --- a/src/game_preferences_display.cpp
 +++ b/src/game_preferences_display.cpp
-@@ -1489,7 +1489,7 @@
+@@ -1806,7 +1806,7 @@
  #ifndef WESNOTH_PREFIX
  #define WESNOTH_PREFIX "/usr"
  #endif
@@ -12,14 +23,3 @@ Description: Search for wesnothd-BRANCH instead of plain wesnothd
  	std::string path = WESNOTH_PREFIX + std::string("/bin");
  	if (!filesystem::is_directory(path))
  		path = filesystem::get_cwd();
---- a/src/game_controller.cpp
-+++ b/src/game_controller.cpp
-@@ -759,7 +759,7 @@
- {
- 	const std::string wesnothd_program =
- 		preferences::get_mp_server_program_name().empty() ?
--		filesystem::get_program_invocation("wesnothd") : preferences::get_mp_server_program_name();
-+		filesystem::get_program_invocation("wesnothd-BRANCH") : preferences::get_mp_server_program_name();
- 
- 	std::string config = filesystem::get_user_config_dir() + "/lan_server.cfg";
- 	if (!filesystem::file_exists(config)) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/wesnoth.git