[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 ec711b53a37ccdc686e6395dacde6cad834425a5
Author: Vincent Cheng <vcheng at debian.org>
Date:   Mon Dec 28 14:38:59 2015 -0800

    refresh patches
---
 debian/changelog                               |  1 +
 debian/patches/02wesnoth-nolog-desktop-file    | 12 ------------
 debian/patches/02wesnoth-nolog-desktop-file.in | 12 ------------
 debian/patches/03wesnothd-name                 |  4 ++--
 debian/patches/03wesnothd-name.in              |  4 ++--
 5 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 22bcd12..dd5d655 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 wesnoth-1.13 (1:1.13.2-1) UNRELEASED; urgency=medium
 
   * New upstream devel release.
+    - Refresh patches.
   * Fix permission error when creating socket with wesnothd. (Closes: #791660)
 
  -- Vincent Cheng <vcheng at debian.org>  Mon, 28 Dec 2015 13:46:42 -0800
diff --git a/debian/patches/02wesnoth-nolog-desktop-file b/debian/patches/02wesnoth-nolog-desktop-file
index e3d8a4a..fbc2c24 100644
--- a/debian/patches/02wesnoth-nolog-desktop-file
+++ b/debian/patches/02wesnoth-nolog-desktop-file
@@ -13,15 +13,3 @@ Description: call wesnoth-nolog from desktop file, too
 +Exec=wesnoth-1.13-nolog
  Categories=Game;StrategyGame;
  
---- a/icons/wesnoth_editor.desktop
-+++ b/icons/wesnoth_editor.desktop
-@@ -48,7 +48,7 @@
- Comment[sr at latin]=Uređivač za mape namenjene Boju za Vesnot
- Comment[tr]=Wesnoth savaşı haritaları için harita düzenleyici
- Comment[vi]=Một chương trình chỉnh sửa bản đồ cho Trận chiến vì Wesnoth
--Icon=wesnoth_editor-icon
--Exec=wesnoth -e
-+Icon=wesnoth-1.13_editor-icon
-+Exec=wesnoth-1.13-nolog -e
- Categories=Game;StrategyGame;
- 
diff --git a/debian/patches/02wesnoth-nolog-desktop-file.in b/debian/patches/02wesnoth-nolog-desktop-file.in
index 51451e4..8638f81 100644
--- a/debian/patches/02wesnoth-nolog-desktop-file.in
+++ b/debian/patches/02wesnoth-nolog-desktop-file.in
@@ -13,15 +13,3 @@ Description: call wesnoth-nolog from desktop file, too
 +Exec=wesnoth-BRANCH-nolog
  Categories=Game;StrategyGame;
  
---- a/icons/wesnoth_editor.desktop
-+++ b/icons/wesnoth_editor.desktop
-@@ -48,7 +48,7 @@
- Comment[sr at latin]=Uređivač za mape namenjene Boju za Vesnot
- Comment[tr]=Wesnoth savaşı haritaları için harita düzenleyici
- Comment[vi]=Một chương trình chỉnh sửa bản đồ cho Trận chiến vì Wesnoth
--Icon=wesnoth_editor-icon
--Exec=wesnoth -e
-+Icon=wesnoth-BRANCH_editor-icon
-+Exec=wesnoth-BRANCH-nolog -e
- Categories=Game;StrategyGame;
- 
diff --git a/debian/patches/03wesnothd-name b/debian/patches/03wesnothd-name
index ebd632d..cae5bd7 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
-@@ -854,7 +854,7 @@
+@@ -868,7 +868,7 @@
  {
  	const std::string wesnothd_program =
  		preferences::get_mp_server_program_name().empty() ?
@@ -14,7 +14,7 @@ Description: Search for wesnothd-1.13 instead of plain wesnothd
  	if (!filesystem::file_exists(config)) {
 --- a/src/game_preferences_display.cpp
 +++ b/src/game_preferences_display.cpp
-@@ -1806,7 +1806,7 @@
+@@ -1791,7 +1791,7 @@
  #ifndef WESNOTH_PREFIX
  #define WESNOTH_PREFIX "/usr"
  #endif
diff --git a/debian/patches/03wesnothd-name.in b/debian/patches/03wesnothd-name.in
index f202616..3f8a692 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
-@@ -854,7 +854,7 @@
+@@ -868,7 +868,7 @@
  {
  	const std::string wesnothd_program =
  		preferences::get_mp_server_program_name().empty() ?
@@ -14,7 +14,7 @@ Description: Search for wesnothd-BRANCH instead of plain wesnothd
  	if (!filesystem::file_exists(config)) {
 --- a/src/game_preferences_display.cpp
 +++ b/src/game_preferences_display.cpp
-@@ -1806,7 +1806,7 @@
+@@ -1791,7 +1791,7 @@
  #ifndef WESNOTH_PREFIX
  #define WESNOTH_PREFIX "/usr"
  #endif

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