[wesnoth] 01/01: new upstream devel release

[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 0e806dd9622ec4c880a015f388f0f190d5af8688
Author: Vincent Cheng <vcheng at debian.org>
Date:   Fri Nov 11 15:06:56 2016 -0800

    new upstream devel release
---
 debian/changelog                  |  6 ++++--
 debian/patches/03wesnothd-name    | 16 ++++++++--------
 debian/patches/03wesnothd-name.in | 16 ++++++++--------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1fe10a4..6383a75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-wesnoth-1.13 (1:1.13.5-2) UNRELEASED; urgency=medium
+wesnoth-1.13 (1:1.13.6-1) experimental; urgency=medium
 
+  * New upstream devel release.
+    - Refresh patches.
   * Build with -std=c++11 to fix FTBFS on older distros (e.g. Debian 8,
     Ubuntu 16.04) where this flag is not enabled by gcc by default.
 
- -- Vincent Cheng <vcheng at debian.org>  Sun, 28 Aug 2016 22:00:31 -0700
+ -- Vincent Cheng <vcheng at debian.org>  Fri, 11 Nov 2016 14:59:19 -0800
 
 wesnoth-1.13 (1:1.13.5-1) experimental; urgency=medium
 
diff --git a/debian/patches/03wesnothd-name b/debian/patches/03wesnothd-name
index ad08c84..cb1e525 100644
--- a/debian/patches/03wesnothd-name
+++ b/debian/patches/03wesnothd-name
@@ -3,7 +3,7 @@ Description: Search for wesnothd-1.13 instead of plain wesnothd
 
 --- a/src/game_launcher.cpp
 +++ b/src/game_launcher.cpp
-@@ -780,7 +780,7 @@
+@@ -776,7 +776,7 @@
  {
  	const std::string wesnothd_program =
  		preferences::get_mp_server_program_name().empty() ?
@@ -14,12 +14,12 @@ Description: Search for wesnothd-1.13 instead of plain wesnothd
  	if (!filesystem::file_exists(config)) {
 --- a/src/preferences_display.cpp
 +++ b/src/preferences_display.cpp
-@@ -166,7 +166,7 @@
- #ifndef WESNOTH_PREFIX
- #define WESNOTH_PREFIX "/usr"
- #endif
+@@ -134,7 +134,7 @@
+ void show_wesnothd_server_search(CVideo& video)
+ {
+ #ifndef _WIN32
 -	const std::string filename = "wesnothd";
 +	const std::string filename = "wesnothd-1.13";
- 	std::string path = WESNOTH_PREFIX + std::string("/bin");
- 	if (!filesystem::is_directory(path))
- 		path = filesystem::get_cwd();
+ #else // _WIN32
+ 	const std::string filename = "wesnothd.exe";
+ #endif
diff --git a/debian/patches/03wesnothd-name.in b/debian/patches/03wesnothd-name.in
index 7855bca..8f4b4e0 100644
--- a/debian/patches/03wesnothd-name.in
+++ b/debian/patches/03wesnothd-name.in
@@ -3,7 +3,7 @@ Description: Search for wesnothd-BRANCH instead of plain wesnothd
 
 --- a/src/game_launcher.cpp
 +++ b/src/game_launcher.cpp
-@@ -780,7 +780,7 @@
+@@ -776,7 +776,7 @@
  {
  	const std::string wesnothd_program =
  		preferences::get_mp_server_program_name().empty() ?
@@ -14,12 +14,12 @@ Description: Search for wesnothd-BRANCH instead of plain wesnothd
  	if (!filesystem::file_exists(config)) {
 --- a/src/preferences_display.cpp
 +++ b/src/preferences_display.cpp
-@@ -166,7 +166,7 @@
- #ifndef WESNOTH_PREFIX
- #define WESNOTH_PREFIX "/usr"
- #endif
+@@ -134,7 +134,7 @@
+ void show_wesnothd_server_search(CVideo& video)
+ {
+ #ifndef _WIN32
 -	const std::string filename = "wesnothd";
 +	const std::string filename = "wesnothd-BRANCH";
- 	std::string path = WESNOTH_PREFIX + std::string("/bin");
- 	if (!filesystem::is_directory(path))
- 		path = filesystem::get_cwd();
+ #else // _WIN32
+ 	const std::string filename = "wesnothd.exe";
+ #endif

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