Merge lp:~cody.smith/ubuntu/precise/freeciv/lp.202327 into lp:ubuntu/precise/freeciv

[Cody Smith]

Added some descriptions as to what the different libraries that the different client versions use.

[Micah Gersten (micahg)]

Thank you for taking the time to improve Ubuntu. As we have no diff with Debian at the moment for this package, it would be best if this were fixed in Debian first. The Debian maintainers have been looking for a way to clarify the client descriptions, and I'm going to forward them a link to the diff in this merge proposal here. You can follow the Debian bug at http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657195.

review: Disapprove

[Cody Smith (cody.smith)]

> Thank you for taking the time to improve Ubuntu. As we have no diff with
> Debian at the moment for this package, it would be best if this were fixed in
> Debian first. The Debian maintainers have been looking for a way to clarify
> the client descriptions, and I'm going to forward them a link to the diff in
> this merge proposal here. You can follow the Debian bug at
> http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657195.

Thanks for at least looking at this, I'll definitely look into that.

Unmerged revisions

24. By Cody Smith on 2012-03-12

*Clarified the client versions a bit to give the user a bit more info on what is used. LP: #202327.' --fixes 'lp:202327'

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-31 11:39:58 +0000
+++ debian/changelog	2012-03-12 02:12:19 +0000
@@ -1,3 +1,9 @@
+freeciv (2.3.1-1ubuntu1) precise; urgency=low
+
+  *Clarified the client versions a bit to give the user a bit more info on what is used. LP: #202327.' --fixes 'lp:202327' 
+
+ -- Cody Edwin Smith <[e-mail]>  Sun, 11 Mar 2012 18:57:43 -0700
+
 freeciv (2.3.1-1) unstable; urgency=low
 
   * Switch to short style dh with overrides

=== modified file 'debian/control'
--- debian/control	2011-12-31 11:39:58 +0000
+++ debian/control	2012-03-12 02:12:19 +0000
@@ -58,7 +58,7 @@
  In this game, each player becomes leader of a civilisation, fighting to
  obtain the ultimate goal: the extinction of all other civilisations.
  .
- This is the Xaw3D version of the Freeciv client.
+ This version of the client uses the Xaw3d library, which is a replacement for the Athena toolkit and adds a 3D appearance and support for XPM images.
 
 Package: freeciv-client-gtk
 Architecture: any
@@ -71,7 +71,8 @@
  In this game, each player becomes leader of a civilisation, fighting to
  obtain the ultimate goal: the extinction of all other civilisations.
  .
- This is the GTK+ version of the Freeciv client.
+ This version of the client uses the GTK+ (GIMP Toolkit), A highly useable toolkit rich in features used in creating user interfaces.
+
 
 Package: freeciv-client-sdl
 Architecture: any
@@ -84,7 +85,7 @@
  In this game, each player becomes leader of a civilisation, fighting to
  obtain the ultimate goal: the extinction of all other civilisations.
  .
- This is the SDL version of the Freeciv client.
+ This version of the client uses the Simple DirectMedia Layer library, which is a cross-platform library for multimedia.
 
 Package: freeciv-client-extras
 Architecture: any