[SCM] Debian packaging of wesnoth branch, master, updated. debian/1.8-2-91-g1079d65

[Gerfried Fuchs]

The following commit has been merged in the master branch:
commit 4e2ea235ce92db544ce4f1ca4572ccab8dd988c0
Author: Gerfried Fuchs <rhonda at debian.at>
Date:   Sat Apr 24 15:07:38 2010 +0200

    Fix icon names in desktop files (LP: #566115)

diff --git a/debian/changelog b/debian/changelog
index 4e330fb..b585d5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wesnoth-1.8 (1:1.8-4) unstable; urgency=low
+
+  * Fix icon names in desktop files (LP: #566115)
+
+ -- 
+
 wesnoth-1.8 (1:1.8-3) unstable; urgency=low
 
   * Remove parallel build support again, it's dysfunctional and proper support
diff --git a/debian/patches/02wesnoth-nolog-desktop-file b/debian/patches/02wesnoth-nolog-desktop-file
index 95498c7..064ebf8 100644
--- a/debian/patches/02wesnoth-nolog-desktop-file
+++ b/debian/patches/02wesnoth-nolog-desktop-file
@@ -5,11 +5,13 @@ 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
-@@ -56,6 +56,6 @@ Comment[sr]=Фантазијска стÑ
+@@ -55,7 +55,7 @@ Comment[sk]=Ťahová strategická hra z
+ Comment[sr]=Фантазијска стратешка игра на потезе
  Comment[sr at latin]=Fantazijska strateška igra na poteze
  Comment[tr]=Fantastik, sırayla oynanan bir strateji oyunu
- Icon=wesnoth-icon
+-Icon=wesnoth-icon
 -Exec=wesnoth
++Icon=wesnoth-1.8-icon
 +Exec=wesnoth-1.8-nolog
  Categories=Game;StrategyGame;
  
@@ -17,11 +19,13 @@ 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
-@@ -34,6 +34,6 @@ Comment[sr]=Уређивач за мап
+@@ -33,7 +33,7 @@ Comment[lt]=Žemėlapių redaktorius Mū
+ Comment[sr]=Уређивач за мапе намењене Боју за Веснот
  Comment[sr at latin]=Uređivač za mape namenjene Boju za Vesnot
  Comment[tr]=Wesnoth savaşı haritaları için harita düzenleyici
- Icon=wesnoth_editor-icon
+-Icon=wesnoth_editor-icon
 -Exec=wesnoth -e
++Icon=wesnoth-1.8_editor-icon
 +Exec=wesnoth-1.8-nolog -e
  Categories=Game;StrategyGame;
  
diff --git a/debian/patches/02wesnoth-nolog-desktop-file.in b/debian/patches/02wesnoth-nolog-desktop-file.in
index d9138e8..3b9b2a1 100644
--- a/debian/patches/02wesnoth-nolog-desktop-file.in
+++ b/debian/patches/02wesnoth-nolog-desktop-file.in
@@ -5,11 +5,13 @@ 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
-@@ -56,6 +56,6 @@ Comment[sr]=Фантазијска стÑ
+@@ -55,7 +55,7 @@ Comment[sk]=Ťahová strategická hra z
+ Comment[sr]=Фантазијска стратешка игра на потезе
  Comment[sr at latin]=Fantazijska strateška igra na poteze
  Comment[tr]=Fantastik, sırayla oynanan bir strateji oyunu
- Icon=wesnoth-icon
+-Icon=wesnoth-icon
 -Exec=wesnoth
++Icon=wesnoth-BRANCH-icon
 +Exec=wesnoth-BRANCH-nolog
  Categories=Game;StrategyGame;
  
@@ -17,11 +19,13 @@ 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
-@@ -34,6 +34,6 @@ Comment[sr]=Уређивач за мап
+@@ -33,7 +33,7 @@ Comment[lt]=Žemėlapių redaktorius Mū
+ Comment[sr]=Уређивач за мапе намењене Боју за Веснот
  Comment[sr at latin]=Uređivač za mape namenjene Boju za Vesnot
  Comment[tr]=Wesnoth savaşı haritaları için harita düzenleyici
- Icon=wesnoth_editor-icon
+-Icon=wesnoth_editor-icon
 -Exec=wesnoth -e
++Icon=wesnoth-BRANCH_editor-icon
 +Exec=wesnoth-BRANCH-nolog -e
  Categories=Game;StrategyGame;
  

-- 
Debian packaging of wesnoth