[SCM] Debian packaging of wesnoth branch, alternatives, updated. debian/1.8.3-1-13-gce2e879

[Gerfried Fuchs]

The following commit has been merged in the alternatives branch:
commit ce2e87990440f1a6c12d3378c2374923a03068ed
Author: Gerfried Fuchs <rhonda at debian.at>
Date:   Fri Aug 13 12:30:23 2010 +0200

    New patch wesnothd-name

diff --git a/debian/changelog b/debian/changelog
index fdaa033..48f5fc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ wesnoth-1.8 (1:1.8.3-2) unstable; urgency=low
   * Add wesnoth and wesnoth-core meta packages depending on the corresponding
     branch package (closes: #586291)
   * Call patch and unpatch explicitly instead of having them as dependency.
+  * New patch wesnothd-name to make the client search for wesnothd-1.8 instead
+    of only wesnothd.
 
  -- 
 
diff --git a/debian/patches/02wesnoth-nolog-desktop-file b/debian/patches/02wesnoth-nolog-desktop-file
index 064ebf8..ab8953f 100644
--- a/debian/patches/02wesnoth-nolog-desktop-file
+++ b/debian/patches/02wesnoth-nolog-desktop-file
@@ -1,11 +1,9 @@
 Author: Gerfried Fuchs <rhonda at debian.at>	vim:ft=diff:
 Description: call wesnoth-nolog from desktop file, too
 
-Index: wesnoth-1.8-1.8/icons/wesnoth.desktop
-===================================================================
---- wesnoth-1.8-1.8.orig/icons/wesnoth.desktop
-+++ wesnoth-1.8-1.8/icons/wesnoth.desktop
-@@ -55,7 +55,7 @@ Comment[sk]=Ťahová strategická hra z
+--- a/icons/wesnoth.desktop
++++ b/icons/wesnoth.desktop
+@@ -55,7 +55,7 @@
  Comment[sr]=Фантазијска стратешка игра на потезе
  Comment[sr at latin]=Fantazijska strateška igra na poteze
  Comment[tr]=Fantastik, sırayla oynanan bir strateji oyunu
@@ -15,11 +13,9 @@ Index: wesnoth-1.8-1.8/icons/wesnoth.desktop
 +Exec=wesnoth-1.8-nolog
  Categories=Game;StrategyGame;
  
-Index: wesnoth-1.8-1.8/icons/wesnoth_editor.desktop
-===================================================================
---- wesnoth-1.8-1.8.orig/icons/wesnoth_editor.desktop
-+++ wesnoth-1.8-1.8/icons/wesnoth_editor.desktop
-@@ -33,7 +33,7 @@ Comment[lt]=Žemėlapių redaktorius Mū
+--- a/icons/wesnoth_editor.desktop
++++ b/icons/wesnoth_editor.desktop
+@@ -33,7 +33,7 @@
  Comment[sr]=Уређивач за мапе намењене Боју за Веснот
  Comment[sr at latin]=Uređivač za mape namenjene Boju za Vesnot
  Comment[tr]=Wesnoth savaşı haritaları için harita düzenleyici
diff --git a/debian/patches/02wesnoth-nolog-desktop-file.in b/debian/patches/02wesnoth-nolog-desktop-file.in
index 3b9b2a1..4d4452e 100644
--- a/debian/patches/02wesnoth-nolog-desktop-file.in
+++ b/debian/patches/02wesnoth-nolog-desktop-file.in
@@ -1,11 +1,9 @@
 Author: Gerfried Fuchs <rhonda at debian.at>	vim:ft=diff:
 Description: call wesnoth-nolog from desktop file, too
 
-Index: wesnoth-1.8-1.8/icons/wesnoth.desktop
-===================================================================
---- wesnoth-1.8-1.8.orig/icons/wesnoth.desktop
-+++ wesnoth-1.8-1.8/icons/wesnoth.desktop
-@@ -55,7 +55,7 @@ Comment[sk]=Ťahová strategická hra z
+--- a/icons/wesnoth.desktop
++++ b/icons/wesnoth.desktop
+@@ -55,7 +55,7 @@
  Comment[sr]=Фантазијска стратешка игра на потезе
  Comment[sr at latin]=Fantazijska strateška igra na poteze
  Comment[tr]=Fantastik, sırayla oynanan bir strateji oyunu
@@ -15,11 +13,9 @@ Index: wesnoth-1.8-1.8/icons/wesnoth.desktop
 +Exec=wesnoth-BRANCH-nolog
  Categories=Game;StrategyGame;
  
-Index: wesnoth-1.8-1.8/icons/wesnoth_editor.desktop
-===================================================================
---- wesnoth-1.8-1.8.orig/icons/wesnoth_editor.desktop
-+++ wesnoth-1.8-1.8/icons/wesnoth_editor.desktop
-@@ -33,7 +33,7 @@ Comment[lt]=Žemėlapių redaktorius Mū
+--- a/icons/wesnoth_editor.desktop
++++ b/icons/wesnoth_editor.desktop
+@@ -33,7 +33,7 @@
  Comment[sr]=Уређивач за мапе намењене Боју за Веснот
  Comment[sr at latin]=Uređivač za mape namenjene Boju za Vesnot
  Comment[tr]=Wesnoth savaşı haritaları için harita düzenleyici
diff --git a/debian/patches/03wesnothd-name b/debian/patches/03wesnothd-name
new file mode 100644
index 0000000..ed19884
--- /dev/null
+++ b/debian/patches/03wesnothd-name
@@ -0,0 +1,14 @@
+Author: Gerfried Fuchs <rhonda at debian.at>	vim:ft=diff:
+Description: Search for wesnothd-1.8 instead of plain wesnothd
+
+--- a/src/game_preferences_display.cpp
++++ b/src/game_preferences_display.cpp
+@@ -1255,7 +1255,7 @@
+ #ifndef WESNOTH_PREFIX
+ #define WESNOTH_PREFIX "/usr"
+ #endif
+-	const std::string filename = "wesnothd";
++	const std::string filename = "wesnothd-1.8";
+ 	std::string path = WESNOTH_PREFIX + std::string("/bin");
+ 	if (!is_directory(path))
+ 		path = get_cwd();
diff --git a/debian/patches/03wesnothd-name.in b/debian/patches/03wesnothd-name.in
new file mode 100644
index 0000000..bc5681b
--- /dev/null
+++ b/debian/patches/03wesnothd-name.in
@@ -0,0 +1,14 @@
+Author: Gerfried Fuchs <rhonda at debian.at>	vim:ft=diff:
+Description: Search for wesnothd-BRANCH instead of plain wesnothd
+
+--- a/src/game_preferences_display.cpp
++++ b/src/game_preferences_display.cpp
+@@ -1255,7 +1255,7 @@
+ #ifndef WESNOTH_PREFIX
+ #define WESNOTH_PREFIX "/usr"
+ #endif
+-	const std::string filename = "wesnothd";
++	const std::string filename = "wesnothd-BRANCH";
+ 	std::string path = WESNOTH_PREFIX + std::string("/bin");
+ 	if (!is_directory(path))
+ 		path = get_cwd();
diff --git a/debian/patches/series b/debian/patches/series
index a913946..57b6465 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 02wesnoth-nolog-desktop-file
+03wesnothd-name

-- 
Debian packaging of wesnoth