The following commit has been merged in the devel branch:
commit 6dd309956fa24ae36d3883c41836db498a2787eb
Author: Gerfried Fuchs <[email protected]>
Date: Sun Jun 19 23:04:26 2011 +0200
adjust patch wesnothd-name to new source
diff --git a/debian/changelog b/debian/changelog
index 578dbb7..e65c649 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ wesnoth-1.9 (1:1.9.7-1) unstable; urgency=low
* Add -DCMAKE_VERBOSE_MAKEFILE=on to make build logs more useful. Thanks to
Sune Vuorela for the suggestion.
* Add -DENABLE_OMP=ON to give openmp a try (closes: #626229)
+ * Adjust patch wesnothd-name for split out source file.
--
diff --git a/debian/patches/03wesnothd-name b/debian/patches/03wesnothd-name
index 7ecb736..ad0dc92 100644
--- a/debian/patches/03wesnothd-name
+++ b/debian/patches/03wesnothd-name
@@ -14,11 +14,11 @@ Index: b/src/game_preferences_display.cpp
std::string path = WESNOTH_PREFIX + std::string("/bin");
if (!is_directory(path))
path = get_cwd();
-Index: b/src/game.cpp
+Index: b/src/game_controller.cpp
===================================================================
---- a/src/game.cpp
-+++ b/src/game.cpp
-@@ -1262,7 +1262,7 @@ void game_controller::start_wesnothd()
+--- a/src/game_controller.cpp
++++ b/src/game_controller.cpp
+@@ -909,7 +909,7 @@ void game_controller::start_wesnothd()
{
const std::string wesnothd_program =
preferences::get_mp_server_program_name().empty() ?
diff --git a/debian/patches/03wesnothd-name.in
b/debian/patches/03wesnothd-name.in
index 58bc86f..a545521 100644
--- a/debian/patches/03wesnothd-name.in
+++ b/debian/patches/03wesnothd-name.in
@@ -5,7 +5,7 @@ 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
@@ -14,11 +14,11 @@ Index: b/src/game_preferences_display.cpp
std::string path = WESNOTH_PREFIX + std::string("/bin");
if (!is_directory(path))
path = get_cwd();
-Index: b/src/game.cpp
+Index: b/src/game_controller.cpp
===================================================================
---- a/src/game.cpp
-+++ b/src/game.cpp
-@@ -1262,7 +1262,7 @@ void game_controller::start_wesnothd()
+--- a/src/game_controller.cpp
++++ b/src/game_controller.cpp
+@@ -909,7 +909,7 @@ void game_controller::start_wesnothd()
{
const std::string wesnothd_program =
preferences::get_mp_server_program_name().empty() ?
--
Debian packaging of wesnoth
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
