The following commit has been merged in the master branch:
commit 76cc42835ad4d7349282f53836638d8a6b2ec787
Author: Clint Adams <[email protected]>
Date: Tue Feb 23 23:41:20 2010 -0500
additional tweaks to get 2.2.0 to build
diff --git a/debian/freeciv-client-gtk.install
b/debian/freeciv-client-gtk.install
index 08aead6..66c15f1 100644
--- a/debian/freeciv-client-gtk.install
+++ b/debian/freeciv-client-gtk.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/games/civclient-gtk
+debian/tmp/usr/games/freeciv-gtk2
debian/tmp/usr/share/applications/freeciv-gtk.desktop
debian/tmp/usr/share/ggz/modules/freeciv/civclient.dsc
diff --git a/debian/freeciv-client-sdl.install
b/debian/freeciv-client-sdl.install
index 2571124..b76303d 100644
--- a/debian/freeciv-client-sdl.install
+++ b/debian/freeciv-client-sdl.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/games/civclient-sdl
+debian/tmp/usr/games/freeciv-sdl
debian/tmp/usr/share/applications/freeciv-sdl.desktop
diff --git a/debian/freeciv-data.install b/debian/freeciv-data.install
index 4a018f1..feb8062 100644
--- a/debian/freeciv-data.install
+++ b/debian/freeciv-data.install
@@ -1,5 +1,5 @@
debian/tmp/usr/share/icons
debian/tmp/usr/share/games/freeciv
debian/tmp/usr/share/locale
-debian/tmp/usr/share/man/man6/civclient.6
+debian/tmp/usr/share/man/man6/freeciv-client.6
debian/tmp/usr/share/pixmaps/civclient.xpm
diff --git a/debian/freeciv-server.install b/debian/freeciv-server.install
index 07a54a0..14d050f 100644
--- a/debian/freeciv-server.install
+++ b/debian/freeciv-server.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/games/civserver
-debian/tmp/usr/share/man/man6/civserver.6
+debian/tmp/usr/games/freeciv-server
+debian/tmp/usr/share/man/man6/freeciv-server.6
debian/tmp/usr/share/pixmaps/civserver.xpm
diff --git a/debian/rules b/debian/rules
index 06c5308..12ba775 100755
--- a/debian/rules
+++ b/debian/rules
@@ -113,16 +113,23 @@ install-stamp: build-server-stamp build-gtk-stamp
build-xaw3d-stamp build-sdl-st
(cd build-server; $(MAKE) DESTDIR=$(CURDIR)/debian/tmp \
localedir=$(DESTDIR)/usr/share/locale install)
- (cd build-xaw3d; $(MAKE) DESTDIR=$(CURDIR)/debian/tmp \
- localedir=$(DESTDIR)/usr/share/locale install)
-
(cd build-gtk; $(MAKE) DESTDIR=$(CURDIR)/debian/tmp \
localedir=$(DESTDIR)/usr/share/locale install)
$(INSTALL_DIR) $(CURDIR)/debian/tmp/usr/share/ggz/modules/freeciv
cp build-gtk/data/civclient.dsc debian/tmp/usr/share/ggz/modules/freeciv
+ cp debian/tmp/usr/share/applications/freeciv.desktop \
+ debian/tmp/usr/share/applications/freeciv-gtk.desktop
(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
+
+ (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
+ rm debian/tmp/usr/share/applications/freeciv.desktop
$(INSTALL_DIR) $(CURDIR)/debian/tmp/usr/share/pixmaps
cp debian/civclient.xpm debian/tmp/usr/share/pixmaps
--
Civilization turn-based strategy game
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
