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

[Clint Adams]

The following commit has been merged in the master branch:
commit 0eb12b52671fbff193f6e073414cf6077ec249be
Author: Clint Adams <schizo at debian.org>
Date:   Thu Feb 25 20:55:14 2010 -0500

    Bump dependencies for 2.2.0.

diff --git a/debian/control b/debian/control
index 81fc679..354d917 100644
--- a/debian/control
+++ b/debian/control
@@ -31,9 +31,8 @@ Build-Depends: quilt (>= 0.42),
 
 Package: freeciv-server
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, freeciv-data (>= 2.1.0)
+Depends: ${misc:Depends}, ${shlibs:Depends}, freeciv-data (>= 2.2.0)
 Suggests: freeciv-client
-Conflicts: freeciv (<< 1.14.0-5)
 Replaces: freeciv-data (<< 2.1.0)
 Description: Civilization turn based strategy game (server files)
  Freeciv is a free clone of the turn based strategy game Civilization.
@@ -44,8 +43,8 @@ Description: Civilization turn based strategy game (server files)
 
 Package: freeciv-client-xaw3d
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, freeciv-data (>= 2.1.0)
-Recommends: freeciv-server (>= 2.1.0)
+Depends: ${misc:Depends}, ${shlibs:Depends}, freeciv-data (>= 2.2.0)
+Recommends: freeciv-server (>= 2.2.0)
 Suggests: freeciv-sound
 Provides: freeciv-client
 Description: Civilization turn based strategy game (Xaw3D client)
@@ -57,8 +56,8 @@ Description: Civilization turn based strategy game (Xaw3D client)
 
 Package: freeciv-client-gtk
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, freeciv-data (>= 2.1.0), ggzcore-bin
-Recommends: freeciv-server (>= 2.1.0)
+Depends: ${misc:Depends}, ${shlibs:Depends}, freeciv-data (>= 2.2.0), ggzcore-bin
+Recommends: freeciv-server (>= 2.2.0)
 Suggests: freeciv-sound
 Provides: freeciv-client, freeciv
 Description: Civilization turn based strategy game (GTK+ client)
@@ -70,8 +69,8 @@ Description: Civilization turn based strategy game (GTK+ client)
 
 Package: freeciv-client-sdl
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, freeciv-data (>= 2.1.0), ttf-dejavu-core, ttf-sazanami-gothic, ttf-unfonts-core, ttf-arphic-uming
-Recommends: freeciv-server (>= 2.1.0)
+Depends: ${misc:Depends}, ${shlibs:Depends}, freeciv-data (>= 2.2.0), ttf-dejavu-core, ttf-sazanami-gothic, ttf-unfonts-core, ttf-arphic-uming
+Recommends: freeciv-server (>= 2.2.0)
 Suggests: freeciv-sound
 Provides: freeciv-client, freeciv
 Description: Civilization turn based strategy game (SDL client)
@@ -84,7 +83,6 @@ Description: Civilization turn based strategy game (SDL client)
 Package: freeciv-data
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: freeciv (<< 1.14.0-5)
 Replaces: freeciv-client-gtk (<< 2.1.0), freeciv-server (<< 2.1.0)
 Description: Civilization turn based strategy game (game data)
  Freeciv is a free clone of the turn based strategy game Civilization.

-- 
Civilization turn-based strategy game