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

[Clint Adams]

The following commit has been merged in the master branch:
commit bb52876fbd4a608f1367960d801a56c7b28747ee
Author: Clint Adams <schizo at debian.org>
Date:   Tue Feb 23 23:08:48 2010 -0500

    more tweaks for 2.2.0

diff --git a/debian/freeciv-client-xaw3d.install b/debian/freeciv-client-xaw3d.install
index cbadf48..f2e3e16 100644
--- a/debian/freeciv-client-xaw3d.install
+++ b/debian/freeciv-client-xaw3d.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/games/civclient-xaw3d
+debian/tmp/usr/games/freeciv-xaw
 debian/tmp/usr/share/applications/freeciv-xaw3d.desktop
diff --git a/debian/freeciv-client-xaw3d.links b/debian/freeciv-client-xaw3d.links
index d7e70da..c2d5c30 100644
--- a/debian/freeciv-client-xaw3d.links
+++ b/debian/freeciv-client-xaw3d.links
@@ -1,2 +1,2 @@
 /usr/share/doc/freeciv-data /usr/share/doc/freeciv-client-xaw3d
-/usr/share/man/man6/civclient.6.gz /usr/share/man/man6/civclient-xaw3d.6.gz
+/usr/share/man/man6/civclient.6.gz /usr/share/man/man6/freeciv-xaw.6.gz
diff --git a/debian/freeciv-client-xaw3d.menu b/debian/freeciv-client-xaw3d.menu
index 589dbc1..b4b3044 100644
--- a/debian/freeciv-client-xaw3d.menu
+++ b/debian/freeciv-client-xaw3d.menu
@@ -1 +1 @@
-?package(freeciv-client-xaw3d):needs="x11" section="Games/Strategy" title="Freeciv client (3d Athena version)" command="/usr/games/civclient-xaw3d" icon="civclient.xpm"
+?package(freeciv-client-xaw3d):needs="x11" section="Games/Strategy" title="Freeciv client (3d Athena version)" command="/usr/games/freeciv-xaw" icon="civclient.xpm"
diff --git a/debian/freeciv-client-xaw3d.postinst b/debian/freeciv-client-xaw3d.postinst
index e48b3c4..c0c7d1b 100644
--- a/debian/freeciv-client-xaw3d.postinst
+++ b/debian/freeciv-client-xaw3d.postinst
@@ -2,9 +2,9 @@
 
 set -e
 
-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
+update-alternatives --install /usr/games/civ civ /usr/games/freeciv-xaw 20 \
+  --slave /usr/share/man/man6/civ.6.gz civ.6.gz /usr/share/man/man6/freeciv-xaw.6.gz
+update-alternatives --install /usr/games/freeciv freeciv /usr/games/freeciv-xaw 20
 
 if [ -f /usr/share/applications/freeciv.desktop ]; then
     rm -f /usr/share/applications/freeciv.desktop
diff --git a/debian/freeciv-client-xaw3d.prerm b/debian/freeciv-client-xaw3d.prerm
index 52c9e07..9e989a7 100644
--- a/debian/freeciv-client-xaw3d.prerm
+++ b/debian/freeciv-client-xaw3d.prerm
@@ -2,7 +2,6 @@
 
 set -e
 
-update-alternatives --remove civ /usr/games/civclient-xaw3d
-update-alternatives --remove civclient /usr/games/civclient-xaw3d
+update-alternatives --remove civclient /usr/games/freeciv-xaw
 
 #DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 3c71663..06c5308 100755
--- a/debian/rules
+++ b/debian/rules
@@ -115,28 +115,14 @@ install-stamp: build-server-stamp build-gtk-stamp build-xaw3d-stamp build-sdl-st
 
 	(cd build-xaw3d; $(MAKE) DESTDIR=$(CURDIR)/debian/tmp \
 		localedir=$(DESTDIR)/usr/share/locale install)
-	mv debian/tmp/usr/games/civclient debian/tmp/usr/games/civclient-xaw3d
-	cp debian/tmp/usr/share/applications/freeciv.desktop debian/tmp/usr/share/applications/freeciv-xaw3d.desktop
-	sed -i -e 's/=Freeciv/=Freeciv (xaw3d)/' debian/tmp/usr/share/applications/freeciv-xaw3d.desktop
-	sed -i -e 's/Exec=civclient/Exec=civclient-xaw3d/' debian/tmp/usr/share/applications/freeciv-xaw3d.desktop
-	sed -i -e 's/GTK;//' debian/tmp/usr/share/applications/freeciv-xaw3d.desktop
 
 	(cd build-gtk; $(MAKE) DESTDIR=$(CURDIR)/debian/tmp \
 		localedir=$(DESTDIR)/usr/share/locale install)
-	mv debian/tmp/usr/games/civclient debian/tmp/usr/games/civclient-gtk
-	cp debian/tmp/usr/share/applications/freeciv.desktop debian/tmp/usr/share/applications/freeciv-gtk.desktop
-	sed -i -e 's/=Freeciv/=Freeciv (gtk)/' debian/tmp/usr/share/applications/freeciv-gtk.desktop
-	sed -i -e 's/Exec=civclient/Exec=civclient-gtk/' debian/tmp/usr/share/applications/freeciv-gtk.desktop
 	$(INSTALL_DIR) $(CURDIR)/debian/tmp/usr/share/ggz/modules/freeciv
 	cp build-gtk/data/civclient.dsc debian/tmp/usr/share/ggz/modules/freeciv
 
 	(cd build-sdl; $(MAKE) DESTDIR=$(CURDIR)/debian/tmp \
 		localedir=$(DESTDIR)/usr/share/locale install)
-	mv debian/tmp/usr/games/civclient debian/tmp/usr/games/civclient-sdl
-	mv debian/tmp/usr/share/applications/freeciv.desktop debian/tmp/usr/share/applications/freeciv-sdl.desktop
-	sed -i -e 's/=Freeciv/=Freeciv (sdl)/' debian/tmp/usr/share/applications/freeciv-sdl.desktop
-	sed -i -e 's/Exec=civclient/Exec=civclient-sdl/' debian/tmp/usr/share/applications/freeciv-sdl.desktop
-	sed -i -e 's/GTK;//' debian/tmp/usr/share/applications/freeciv-sdl.desktop
 
 	$(INSTALL_DIR) $(CURDIR)/debian/tmp/usr/share/pixmaps
 	cp debian/civclient.xpm debian/tmp/usr/share/pixmaps

-- 
Civilization turn-based strategy game