[SCM] Civilization turn-based strategy game branch, master, updated. debian/2.1.9-1-46-gb006d93
Clint Adams
schizo at debian.org
Fri Feb 26 01:49:54 UTC 2010
The following commit has been merged in the master branch:
commit b006d93bbfce145bdc4483e5e7511855b7b78d99
Author: Clint Adams <schizo at debian.org>
Date: Thu Feb 25 19:44:39 2010 -0500
another round of 2.2.0 tweaks
diff --git a/debian/freeciv-client-gtk.links b/debian/freeciv-client-gtk.links
index 3db43b2..7fd5730 100644
--- a/debian/freeciv-client-gtk.links
+++ b/debian/freeciv-client-gtk.links
@@ -1,2 +1,2 @@
/usr/share/doc/freeciv-data /usr/share/doc/freeciv-client-gtk
-/usr/share/man/man6/civclient.6.gz /usr/share/man/man6/civclient-gtk.6.gz
+/usr/share/man/man6/civclient.6.gz /usr/share/man/man6/freeciv-gtk2.6.gz
diff --git a/debian/freeciv-client-gtk.menu b/debian/freeciv-client-gtk.menu
index bda5d49..c9ae95a 100644
--- a/debian/freeciv-client-gtk.menu
+++ b/debian/freeciv-client-gtk.menu
@@ -1 +1 @@
-?package(freeciv-client-gtk):needs="x11" section="Games/Strategy" title="Freeciv client (GTK version)" command="/usr/games/civclient-gtk" icon="civclient.xpm"
+?package(freeciv-client-gtk):needs="x11" section="Games/Strategy" title="Freeciv client (GTK version)" command="/usr/games/freeciv-gtk2" icon="civclient.xpm"
diff --git a/debian/freeciv-client-gtk.postinst b/debian/freeciv-client-gtk.postinst
index 869f95d..eba3a26 100644
--- a/debian/freeciv-client-gtk.postinst
+++ b/debian/freeciv-client-gtk.postinst
@@ -2,9 +2,7 @@
set -e
-update-alternatives --install /usr/games/civ civ /usr/games/civclient-gtk 50 \
- --slave /usr/share/man/man6/civ.6.gz civ.6.gz /usr/share/man/man6/civclient-gtk.6.gz
-update-alternatives --install /usr/games/civclient civclient /usr/games/civclient-gtk 50
+update-alternatives --install /usr/games/freeciv freeciv /usr/games/freeciv-gtk2 50
# Register the GGZ module
ggz-config --install --force --modfile=/usr/share/ggz/modules/freeciv/civclient.dsc
diff --git a/debian/freeciv-client-gtk.prerm b/debian/freeciv-client-gtk.prerm
index 77c296d..6fca3a9 100644
--- a/debian/freeciv-client-gtk.prerm
+++ b/debian/freeciv-client-gtk.prerm
@@ -2,8 +2,7 @@
set -e
-update-alternatives --remove civ /usr/games/civclient-gtk
-update-alternatives --remove civclient /usr/games/civclient-gtk
+update-alternatives --remove freeciv /usr/games/freeciv-gtk2
# Unregister the GGZ module
ggz-config --remove --modfile=/usr/share/ggz/modules/freeciv/civclient.dsc
diff --git a/debian/freeciv-client-sdl.links b/debian/freeciv-client-sdl.links
index 6855024..95c2643 100644
--- a/debian/freeciv-client-sdl.links
+++ b/debian/freeciv-client-sdl.links
@@ -1,2 +1,2 @@
/usr/share/doc/freeciv-data /usr/share/doc/freeciv-client-sdl
-/usr/share/man/man6/civclient.6.gz /usr/share/man/man6/civclient-sdl.6.gz
+/usr/share/man/man6/civclient.6.gz /usr/share/man/man6/freeciv-sdl.6.gz
diff --git a/debian/freeciv-client-sdl.menu b/debian/freeciv-client-sdl.menu
index 278cf96..3e5c47d 100644
--- a/debian/freeciv-client-sdl.menu
+++ b/debian/freeciv-client-sdl.menu
@@ -1 +1 @@
-?package(freeciv-client-sdl):needs="x11" section="Games/Strategy" title="Freeciv client (SDL version)" command="/usr/games/civclient-sdl" icon="civclient.xpm"
+?package(freeciv-client-sdl):needs="x11" section="Games/Strategy" title="Freeciv client (SDL version)" command="/usr/games/freeciv-sdl" icon="civclient.xpm"
diff --git a/debian/freeciv-client-sdl.postinst b/debian/freeciv-client-sdl.postinst
index 8dda1e7..fb6c9f5 100644
--- a/debian/freeciv-client-sdl.postinst
+++ b/debian/freeciv-client-sdl.postinst
@@ -2,9 +2,7 @@
set -e
-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
+update-alternatives --install /usr/games/freeciv freeciv /usr/games/freeciv-sdl 40
if [ -f /usr/share/applications/freeciv.desktop ]; then
rm -f /usr/share/applications/freeciv.desktop
diff --git a/debian/freeciv-client-sdl.prerm b/debian/freeciv-client-sdl.prerm
index 3faafca..19275ac 100644
--- a/debian/freeciv-client-sdl.prerm
+++ b/debian/freeciv-client-sdl.prerm
@@ -2,7 +2,6 @@
set -e
-update-alternatives --remove civ /usr/games/civclient-sdl
-update-alternatives --remove civclient /usr/games/civclient-sdl
+update-alternatives --remove freeciv /usr/games/freeciv-sdl
#DEBHELPER#
diff --git a/debian/freeciv-client-xaw3d.postinst b/debian/freeciv-client-xaw3d.postinst
index c0c7d1b..f5b76ad 100644
--- a/debian/freeciv-client-xaw3d.postinst
+++ b/debian/freeciv-client-xaw3d.postinst
@@ -2,8 +2,6 @@
set -e
-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
diff --git a/debian/freeciv-client-xaw3d.prerm b/debian/freeciv-client-xaw3d.prerm
index 9e989a7..7535550 100644
--- a/debian/freeciv-client-xaw3d.prerm
+++ b/debian/freeciv-client-xaw3d.prerm
@@ -2,6 +2,6 @@
set -e
-update-alternatives --remove civclient /usr/games/freeciv-xaw
+update-alternatives --remove freeciv /usr/games/freeciv-xaw
#DEBHELPER#
diff --git a/debian/freeciv-server.menu b/debian/freeciv-server.menu
index 14a6f8e..5563245 100644
--- a/debian/freeciv-server.menu
+++ b/debian/freeciv-server.menu
@@ -1 +1 @@
-?package(freeciv-server):needs="text" section="Games/Strategy" title="Freeciv server" command="/usr/games/civserver" icon="civserver.xpm"
+?package(freeciv-server):needs="text" section="Games/Strategy" title="Freeciv server" command="/usr/games/freeciv-server" icon="civserver.xpm"
diff --git a/debian/rules b/debian/rules
index 12ba775..19388ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -122,13 +122,15 @@ install-stamp: build-server-stamp build-gtk-stamp build-xaw3d-stamp build-sdl-st
(cd build-sdl; $(MAKE) DESTDIR=$(CURDIR)/debian/tmp \
localedir=$(DESTDIR)/usr/share/locale install)
- cp debian/tmp/usr/share/applications/freeciv.desktop \
- debian/tmp/usr/share/applications/freeciv-sdl.desktop
+ sed 's/Exec=freeciv-gtk2/Exec=freeciv-sdl/' \
+ debian/tmp/usr/share/applications/freeciv.desktop \
+ >debian/tmp/usr/share/applications/freeciv-sdl.desktop
(cd build-xaw3d; $(MAKE) DESTDIR=$(CURDIR)/debian/tmp \
localedir=$(DESTDIR)/usr/share/locale install)
- cp debian/tmp/usr/share/applications/freeciv.desktop \
- debian/tmp/usr/share/applications/freeciv-xaw3d.desktop
+ sed 's/Exec=freeciv-gtk2/Exec=freeciv-xaw/' \
+ debian/tmp/usr/share/applications/freeciv.desktop \
+ >debian/tmp/usr/share/applications/freeciv-xaw3d.desktop
rm debian/tmp/usr/share/applications/freeciv.desktop
$(INSTALL_DIR) $(CURDIR)/debian/tmp/usr/share/pixmaps
--
Civilization turn-based strategy game
More information about the Pkg-games-commits
mailing list