[SCM] Civilization turn-based strategy game branch, master, updated. debian/2.1.9-1-20-g3c8c5e8

[Karl Goetz]

The following commit has been merged in the master branch:
commit 3c8c5e85dc393a8c855aba64bc31e3dcbdbca3f6
Author: Karl Goetz <karl at kgoetz.id.au>
Date:   Sat Nov 28 10:58:12 2009 +1030

    * Add a test-and-remove for the existing freeciv.desktop to each clients
    	postinst script.

diff --git a/debian/changelog b/debian/changelog
index 0e2f241..71defe0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,9 @@ freeciv (2.1.10-1) unstable; urgency=low
   this correctly now.
   * Deleted 01_configure_ac_localedir.diff from d/patches/ and from series.
   * Create per-client .desktop files. Closes: #470978, LP: #190555
+  * Desktop files mention which client they are (sdl/gtk/xaw3d).
 
- -- Karl Goetz <karl at kgoetz.id.au>  Fri, 27 Nov 2009 23:38:28 +1030
+ -- Karl Goetz <karl at kgoetz.id.au>  Sat, 28 Nov 2009 11:01:24 +1030
 
 freeciv (2.1.9-1) unstable; urgency=low
 
diff --git a/debian/freeciv-client-gtk.postinst b/debian/freeciv-client-gtk.postinst
index dc4ce9c..91ae310 100644
--- a/debian/freeciv-client-gtk.postinst
+++ b/debian/freeciv-client-gtk.postinst
@@ -9,4 +9,8 @@ update-alternatives --install /usr/games/civclient civclient /usr/games/civclien
 # Register the GGZ module
 ggz-config --install --force --modfile=/usr/share/ggz/modules/freeciv/civclient.dsc
 
+if [ -f /usr/share/applications/freeciv.desktop ]; then
+	rm -f /usr/share/applications/freeciv.desktop
+fi
+
 #DEBHELPER#
diff --git a/debian/freeciv-client-sdl.postinst b/debian/freeciv-client-sdl.postinst
index ae6952d..8dda1e7 100644
--- a/debian/freeciv-client-sdl.postinst
+++ b/debian/freeciv-client-sdl.postinst
@@ -6,4 +6,8 @@ update-alternatives --install /usr/games/civ civ /usr/games/civclient-sdl 40 \
   --slave /usr/share/man/man6/civ.6.gz civ.6.gz /usr/share/man/man6/civclient-sdl.6.gz
 update-alternatives --install /usr/games/civclient civclient /usr/games/civclient-sdl 40
 
+if [ -f /usr/share/applications/freeciv.desktop ]; then
+    rm -f /usr/share/applications/freeciv.desktop
+fi
+
 #DEBHELPER#
diff --git a/debian/freeciv-client-xaw3d.postinst b/debian/freeciv-client-xaw3d.postinst
index 5c2a349..e48b3c4 100644
--- a/debian/freeciv-client-xaw3d.postinst
+++ b/debian/freeciv-client-xaw3d.postinst
@@ -6,4 +6,8 @@ update-alternatives --install /usr/games/civ civ /usr/games/civclient-xaw3d 20 \
   --slave /usr/share/man/man6/civ.6.gz civ.6.gz /usr/share/man/man6/civclient-xaw3d.6.gz
 update-alternatives --install /usr/games/civclient civclient /usr/games/civclient-xaw3d 20
 
+if [ -f /usr/share/applications/freeciv.desktop ]; then
+    rm -f /usr/share/applications/freeciv.desktop
+fi
+
 #DEBHELPER#

-- 
Civilization turn-based strategy game