[SCM] Debian packaging of wesnoth branch, experimental, updated. 52393ded7cb0123699a9a0cff897b134eae84725

[Gerfried Fuchs]

The following commit has been merged in the experimental branch:
commit 96ebf264cdbe8f3d072836267363e94c39c01a60
Author: Gerfried Fuchs <rhonda at debian.at>
Date:   Tue Mar 16 23:43:25 2010 +0100

    Also call the -nolog binary for wesnoth_editor

diff --git a/debian/branchcheck b/debian/branchcheck
index 3258b61..f8dc368 100644
--- a/debian/branchcheck
+++ b/debian/branchcheck
@@ -7,9 +7,10 @@ set -ex
 BRANCH=$(dpkg-parsechangelog | grep "^Version:" | cut -d" " -f2 | cut -d. -f1,2 | cut -d: -f2 | cut -d- -f1 | sed -e 's/[a-z].*//')
 
 if head -1 debian/control | grep -v "^Source: wesnoth-$BRANCH" >/dev/null ; then \
-	for i in debian/*.in; do
+	for i in debian/*.in debian/patches/*.in; do
 		new=$(basename $i .in | sed -e s/BRANCH/$BRANCH/)
-		cp $i debian/$new
-		sed -i -e s/BRANCH/$BRANCH/g debian/$new
+		dir=$(dirname $i)
+		cp $i $dir/$new
+		sed -i -e s/BRANCH/$BRANCH/g $dir/$new
 	done
 fi
diff --git a/debian/changelog b/debian/changelog
index b6ed15c..7eea3eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ wesnoth-1.7 (1:1.7.15-1) experimental; urgency=low
   * Script debian/branchcheck written to create all the versioned files
     automatically, from .in files.
   * Adjusted README.source with information on what's needed.
+  * Also call the -nolog binary from the wesnoth_editor desktop file.
   * Wrap long lines in debian/control for better readability.
   * Drop the old transitional packages wesnoth-editor and wesnoth-all.
   * Renamed special versions keywords to match more what they mean, and add
diff --git a/debian/patches/02wesnoth-nolog-desktop-file b/debian/patches/02wesnoth-nolog-desktop-file
index fcf50ef..5e681ea 100644
--- a/debian/patches/02wesnoth-nolog-desktop-file
+++ b/debian/patches/02wesnoth-nolog-desktop-file
@@ -1,15 +1,27 @@
 Author: Gerfried Fuchs <rhonda at debian.at>	vim:ft=diff:
 Description: call wesnoth-nolog from desktop file, too
 
-Index: wesnoth-1.7.8/icons/wesnoth.desktop
+Index: wesnoth-1.7-1.7.15/icons/wesnoth.desktop
 ===================================================================
---- wesnoth-1.7.8.orig/icons/wesnoth.desktop
-+++ wesnoth-1.7.8/icons/wesnoth.desktop
+--- wesnoth-1.7-1.7.15.orig/icons/wesnoth.desktop
++++ wesnoth-1.7-1.7.15/icons/wesnoth.desktop
 @@ -54,6 +54,6 @@ Comment[sr]=Фантазијска стÑ
  Comment[sr at latin]=Fantazijska strateška igra na poteze
  Comment[tr]=Fantastik, sırayla oynanan bir strateji oyunu
  Icon=wesnoth-icon
 -Exec=wesnoth
-+Exec=wesnoth-nolog
++Exec=wesnoth-1.7-nolog
+ Categories=Game;StrategyGame;
+ 
+Index: wesnoth-1.7-1.7.15/icons/wesnoth_editor.desktop
+===================================================================
+--- wesnoth-1.7-1.7.15.orig/icons/wesnoth_editor.desktop
++++ wesnoth-1.7-1.7.15/icons/wesnoth_editor.desktop
+@@ -32,6 +32,6 @@ 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
+-Exec=wesnoth -e
++Exec=wesnoth-1.7-nolog -e
  Categories=Game;StrategyGame;
  
diff --git a/debian/patches/02wesnoth-nolog-desktop-file.in b/debian/patches/02wesnoth-nolog-desktop-file.in
new file mode 100644
index 0000000..bb5458c
--- /dev/null
+++ b/debian/patches/02wesnoth-nolog-desktop-file.in
@@ -0,0 +1,27 @@
+Author: Gerfried Fuchs <rhonda at debian.at>	vim:ft=diff:
+Description: call wesnoth-nolog from desktop file, too
+
+Index: wesnoth-1.7-1.7.15/icons/wesnoth.desktop
+===================================================================
+--- wesnoth-1.7-1.7.15.orig/icons/wesnoth.desktop
++++ wesnoth-1.7-1.7.15/icons/wesnoth.desktop
+@@ -54,6 +54,6 @@ Comment[sr]=Фантазијска стÑ
+ Comment[sr at latin]=Fantazijska strateška igra na poteze
+ Comment[tr]=Fantastik, sırayla oynanan bir strateji oyunu
+ Icon=wesnoth-icon
+-Exec=wesnoth
++Exec=wesnoth-BRANCH-nolog
+ Categories=Game;StrategyGame;
+ 
+Index: wesnoth-1.7-1.7.15/icons/wesnoth_editor.desktop
+===================================================================
+--- wesnoth-1.7-1.7.15.orig/icons/wesnoth_editor.desktop
++++ wesnoth-1.7-1.7.15/icons/wesnoth_editor.desktop
+@@ -32,6 +32,6 @@ 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
+-Exec=wesnoth -e
++Exec=wesnoth-BRANCH-nolog -e
+ Categories=Game;StrategyGame;
+ 

-- 
Debian packaging of wesnoth