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

[Karl Goetz]

The following commit has been merged in the master branch:
commit 23f95a50df63a075e0c46146abf5f6f78c1d6966
Author: Karl Goetz <karl at kgoetz.id.au>
Date:   Sat Nov 28 11:20:09 2009 +1030

    * Install civserver.xpm in freeciv-server not freeciv-data

diff --git a/debian/freeciv-data.install b/debian/freeciv-data.install
index 348d8b2..4a018f1 100644
--- a/debian/freeciv-data.install
+++ b/debian/freeciv-data.install
@@ -3,4 +3,3 @@ debian/tmp/usr/share/games/freeciv
 debian/tmp/usr/share/locale
 debian/tmp/usr/share/man/man6/civclient.6
 debian/tmp/usr/share/pixmaps/civclient.xpm
-debian/tmp/usr/share/pixmaps/civserver.xpm
diff --git a/debian/freeciv-server.install b/debian/freeciv-server.install
index 5697e36..07a54a0 100644
--- a/debian/freeciv-server.install
+++ b/debian/freeciv-server.install
@@ -1,2 +1,3 @@
 debian/tmp/usr/games/civserver
 debian/tmp/usr/share/man/man6/civserver.6
+debian/tmp/usr/share/pixmaps/civserver.xpm

-- 
Civilization turn-based strategy game