[Freeciv-commits] r35567 - /trunk/ai/default/daidomestic.c

[cazfi74]

Author: cazfi
Date: Sun May 14 01:18:01 2017
New Revision: 35567

URL: http://svn.gna.org/viewcvs/freeciv?rev=35567=rev
Log:
Remove hard limitation that AI wonder cities never build settlers

See hrm Bug #660089

Modified:
trunk/ai/default/daidomestic.c

Modified: trunk/ai/default/daidomestic.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/daidomestic.c?rev=35567=35566=35567=diff
==
--- trunk/ai/default/daidomestic.c  (original)
+++ trunk/ai/default/daidomestic.c  Sun May 14 01:18:01 2017
@@ -475,11 +475,14 @@
   settler_want = city_data->settler_want * pplayer->ai_common.expand / 100;
 
   if (adv->wonder_city == pcity->id) {
-settler_want /= 5;
+if (!settler_type || settler_type->pop_cost > 0) {
+  settler_want /= 5;
+} else {
+  settler_want /= 2;
+}
   }
 
   if (settler_type
-  && (pcity->id != adv->wonder_city || settler_type->pop_cost == 0)
   && pcity->surplus[O_FOOD] > utype_upkeep_cost(settler_type,
 pplayer, O_FOOD)) {
 if (settler_want > 0) {
@@ -506,7 +509,11 @@
 founder_want = city_data->founder_want;
 
 if (adv->wonder_city == pcity->id) {
-  founder_want /= 5;
+  if (founder_type->pop_cost > 0) {
+founder_want /= 5;
+  } else {
+founder_want /= 2;
+  }
 }
 
 if (adv->max_num_cities <= city_list_size(pplayer->cities)) {
@@ -518,8 +525,6 @@
   / TRAIT_DEFAULT_VALUE;
 
 if (founder_type
-&& (pcity->id != adv->wonder_city
-|| founder_type->pop_cost == 0)
 && pcity->surplus[O_FOOD] >= utype_upkeep_cost(founder_type,
pplayer, O_FOOD)) {
 


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35569 - /branches/S2_6/ai/default/daidomestic.c

[cazfi74]

Author: cazfi
Date: Sun May 14 01:18:14 2017
New Revision: 35569

URL: http://svn.gna.org/viewcvs/freeciv?rev=35569=rev
Log:
Remove hard limitation that AI wonder cities never build settlers

See hrm Bug #660089

Modified:
branches/S2_6/ai/default/daidomestic.c

Modified: branches/S2_6/ai/default/daidomestic.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/ai/default/daidomestic.c?rev=35569=35568=35569=diff
==
--- branches/S2_6/ai/default/daidomestic.c  (original)
+++ branches/S2_6/ai/default/daidomestic.c  Sun May 14 01:18:14 2017
@@ -460,11 +460,14 @@
   settler_want = city_data->settler_want * pplayer->ai_common.expand / 100;
 
   if (adv->wonder_city == pcity->id) {
-settler_want /= 5;
+if (!settler_type || settler_type->pop_cost > 0) {
+  settler_want /= 5;
+} else {
+  settler_want /= 2;
+}
   }
 
   if (settler_type
-  && (pcity->id != adv->wonder_city || settler_type->pop_cost == 0)
   && pcity->surplus[O_FOOD] > utype_upkeep_cost(settler_type,
 pplayer, O_FOOD)) {
 if (settler_want > 0) {
@@ -489,7 +492,11 @@
 founder_want = city_data->founder_want;
 
 if (adv->wonder_city == pcity->id) {
-  founder_want /= 5;
+  if (founder_type->pop_cost > 0) {
+founder_want /= 5;
+  } else {
+founder_want /= 2;
+  }
 }
 
 if (adv->max_num_cities <= city_list_size(pplayer->cities)) {
@@ -501,8 +508,6 @@
   / TRAIT_DEFAULT_VALUE;
 
 if (founder_type
-&& (pcity->id != adv->wonder_city
-|| founder_type->pop_cost == 0)
 && pcity->surplus[O_FOOD] >= utype_upkeep_cost(founder_type,
pplayer, O_FOOD)) {
 


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35568 - /branches/S3_0/ai/default/daidomestic.c

[cazfi74]

Author: cazfi
Date: Sun May 14 01:18:08 2017
New Revision: 35568

URL: http://svn.gna.org/viewcvs/freeciv?rev=35568=rev
Log:
Remove hard limitation that AI wonder cities never build settlers

See hrm Bug #660089

Modified:
branches/S3_0/ai/default/daidomestic.c

Modified: branches/S3_0/ai/default/daidomestic.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/ai/default/daidomestic.c?rev=35568=35567=35568=diff
==
--- branches/S3_0/ai/default/daidomestic.c  (original)
+++ branches/S3_0/ai/default/daidomestic.c  Sun May 14 01:18:08 2017
@@ -475,11 +475,14 @@
   settler_want = city_data->settler_want * pplayer->ai_common.expand / 100;
 
   if (adv->wonder_city == pcity->id) {
-settler_want /= 5;
+if (!settler_type || settler_type->pop_cost > 0) {
+  settler_want /= 5;
+} else {
+  settler_want /= 2;
+}
   }
 
   if (settler_type
-  && (pcity->id != adv->wonder_city || settler_type->pop_cost == 0)
   && pcity->surplus[O_FOOD] > utype_upkeep_cost(settler_type,
 pplayer, O_FOOD)) {
 if (settler_want > 0) {
@@ -506,7 +509,11 @@
 founder_want = city_data->founder_want;
 
 if (adv->wonder_city == pcity->id) {
-  founder_want /= 5;
+  if (founder_type->pop_cost > 0) {
+founder_want /= 5;
+  } else {
+founder_want /= 2;
+  }
 }
 
 if (adv->max_num_cities <= city_list_size(pplayer->cities)) {
@@ -518,8 +525,6 @@
   / TRAIT_DEFAULT_VALUE;
 
 if (founder_type
-&& (pcity->id != adv->wonder_city
-|| founder_type->pop_cost == 0)
 && pcity->surplus[O_FOOD] >= utype_upkeep_cost(founder_type,
pplayer, O_FOOD)) {
 


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35563 - in /trunk: client/packhand.c common/networking/packets.def fc_version server/citytools.c

[sveinung84]

Author: sveinung
Date: Sat May 13 23:24:02 2017
New Revision: 35563

URL: http://svn.gna.org/viewcvs/freeciv?rev=35563=rev
Log:
PACKET_WEB_CITY_INFO_ADDITION: be more careful.

Give the packet web_city_info_addition a field with the id of the city the
additional info is for. Cancel it where PACKET_CITY_INFO is canceled.

See hrm Feature #659446

Modified:
trunk/client/packhand.c
trunk/common/networking/packets.def
trunk/fc_version
trunk/server/citytools.c

Modified: trunk/client/packhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/packhand.c?rev=35563=35562=35563=diff
==
--- trunk/client/packhand.c (original)
+++ trunk/client/packhand.c Sat May 13 23:24:02 2017
@@ -895,8 +895,8 @@
   for it.
   TODO: Do not generate code calling this in C-client.
 /
-void handle_web_city_info_addition(int granary_size, int granary_turns,
-   int buy_gold_cost)
+void handle_web_city_info_addition(int id, int granary_size,
+   int granary_turns, int buy_gold_cost)
 {
 }
 

Modified: trunk/common/networking/packets.def
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/networking/packets.def?rev=35563=35562=35563=diff
==
--- trunk/common/networking/packets.def (original)
+++ trunk/common/networking/packets.def Sat May 13 23:24:02 2017
@@ -637,7 +637,7 @@
 
 /** City packets **/
 
-PACKET_CITY_REMOVE = 30; sc, dsend, lsend, cancel(PACKET_CITY_INFO), 
cancel(PACKET_CITY_SHORT_INFO)
+PACKET_CITY_REMOVE = 30; sc, dsend, lsend, cancel(PACKET_CITY_INFO), 
cancel(PACKET_WEB_CITY_INFO_ADDITION), cancel(PACKET_CITY_SHORT_INFO)
   CITY city_id;
 end
 
@@ -704,7 +704,7 @@
   ESTRING name[MAX_LEN_CITYNAME];
 end
 
-PACKET_CITY_SHORT_INFO = 32; sc, lsend, is-game-info, cancel(PACKET_CITY_INFO)
+PACKET_CITY_SHORT_INFO = 32; sc, lsend, is-game-info, 
cancel(PACKET_CITY_INFO), cancel(PACKET_WEB_CITY_INFO_ADDITION)
   CITY id; key
   TILE tile;
 
@@ -2223,6 +2223,8 @@
 /* Use range 256:511 for these */
 
 PACKET_WEB_CITY_INFO_ADDITION = 256; sc, lsend, is-game-info, force, 
cancel(PACKET_CITY_SHORT_INFO)
+  CITY id; key
+
   UINT16 granary_size;
   TURN granary_turns;
   UINT16 buy_gold_cost;

Modified: trunk/fc_version
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=35563=35562=35563=diff
==
--- trunk/fc_version(original)
+++ trunk/fc_versionSat May 13 23:24:02 2017
@@ -56,7 +56,7 @@
 #   - Avoid adding a new mandatory capability to the development branch for
 # as long as possible.  We want to maintain network compatibility with
 # the stable branch for as long as possible.
-NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.1-2017.May.05"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.1-2017.May.13"
 NETWORK_CAPSTRING_OPTIONAL=""
 
 FREECIV_DISTRIBUTOR=""

Modified: trunk/server/citytools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/citytools.c?rev=35563=35562=35563=diff
==
--- trunk/server/citytools.c(original)
+++ trunk/server/citytools.cSat May 13 23:24:02 2017
@@ -2492,6 +2492,8 @@
   } improvement_iterate_end;
 
 #ifdef FREECIV_WEB
+  web_packet->id = pcity->id;
+
   web_packet->granary_size = city_granary_size(city_size_get(pcity));
   web_packet->granary_turns = city_turns_to_grow(pcity);
   web_packet->buy_gold_cost = city_production_buy_gold_cost(pcity);


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35564 - /branches/S3_0/client/helpdata.c

[sveinung84]

Author: sveinung
Date: Sat May 13 23:24:28 2017
New Revision: 35564

URL: http://svn.gna.org/viewcvs/freeciv?rev=35564=rev
Log:
Auto help: free list of quoted action blockers.

This fixes a memory leak. Found with Valgrind.

See hrm Bug #659405

Modified:
branches/S3_0/client/helpdata.c

Modified: branches/S3_0/client/helpdata.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/helpdata.c?rev=35564=35563=35564=diff
==
--- branches/S3_0/client/helpdata.c (original)
+++ branches/S3_0/client/helpdata.c Sat May 13 23:24:28 2017
@@ -2426,6 +2426,11 @@
  astr_build_or_list(, blockers, i));
 
 astr_free();
+
+for (; i > 0; i--) {
+  /* The text was copied above. */
+  free((char *)(blockers[i - 1]));
+}
   }
 }
   } action_iterate_end;


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35566 - in /branches/S3_0: client/packhand.c common/networking/packets.def fc_version server/citytools.c

[sveinung84]

Author: sveinung
Date: Sat May 13 23:24:42 2017
New Revision: 35566

URL: http://svn.gna.org/viewcvs/freeciv?rev=35566=rev
Log:
PACKET_WEB_CITY_INFO_ADDITION: be more careful.

Give the packet web_city_info_addition a field with the id of the city the
additional info is for. Cancel it where PACKET_CITY_INFO is canceled.

See hrm Feature #659446

Modified:
branches/S3_0/client/packhand.c
branches/S3_0/common/networking/packets.def
branches/S3_0/fc_version
branches/S3_0/server/citytools.c

Modified: branches/S3_0/client/packhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/packhand.c?rev=35566=35565=35566=diff
==
--- branches/S3_0/client/packhand.c (original)
+++ branches/S3_0/client/packhand.c Sat May 13 23:24:42 2017
@@ -895,8 +895,8 @@
   for it.
   TODO: Do not generate code calling this in C-client.
 /
-void handle_web_city_info_addition(int granary_size, int granary_turns,
-   int buy_gold_cost)
+void handle_web_city_info_addition(int id, int granary_size,
+   int granary_turns, int buy_gold_cost)
 {
 }
 

Modified: branches/S3_0/common/networking/packets.def
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/common/networking/packets.def?rev=35566=35565=35566=diff
==
--- branches/S3_0/common/networking/packets.def (original)
+++ branches/S3_0/common/networking/packets.def Sat May 13 23:24:42 2017
@@ -637,7 +637,7 @@
 
 /** City packets **/
 
-PACKET_CITY_REMOVE = 30; sc, dsend, lsend, cancel(PACKET_CITY_INFO), 
cancel(PACKET_CITY_SHORT_INFO)
+PACKET_CITY_REMOVE = 30; sc, dsend, lsend, cancel(PACKET_CITY_INFO), 
cancel(PACKET_WEB_CITY_INFO_ADDITION), cancel(PACKET_CITY_SHORT_INFO)
   CITY city_id;
 end
 
@@ -704,7 +704,7 @@
   ESTRING name[MAX_LEN_CITYNAME];
 end
 
-PACKET_CITY_SHORT_INFO = 32; sc, lsend, is-game-info, cancel(PACKET_CITY_INFO)
+PACKET_CITY_SHORT_INFO = 32; sc, lsend, is-game-info, 
cancel(PACKET_CITY_INFO), cancel(PACKET_WEB_CITY_INFO_ADDITION)
   CITY id; key
   TILE tile;
 
@@ -2223,6 +2223,8 @@
 /* Use range 256:511 for these */
 
 PACKET_WEB_CITY_INFO_ADDITION = 256; sc, lsend, is-game-info, force, 
cancel(PACKET_CITY_SHORT_INFO)
+  CITY id; key
+
   UINT16 granary_size;
   TURN granary_turns;
   UINT16 buy_gold_cost;

Modified: branches/S3_0/fc_version
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/fc_version?rev=35566=35565=35566=diff
==
--- branches/S3_0/fc_version(original)
+++ branches/S3_0/fc_versionSat May 13 23:24:42 2017
@@ -56,7 +56,7 @@
 #   - Avoid adding a new mandatory capability to the development branch for
 # as long as possible.  We want to maintain network compatibility with
 # the stable branch for as long as possible.
-NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2017.May.05"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2017.May.13"
 NETWORK_CAPSTRING_OPTIONAL=""
 
 FREECIV_DISTRIBUTOR=""

Modified: branches/S3_0/server/citytools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/server/citytools.c?rev=35566=35565=35566=diff
==
--- branches/S3_0/server/citytools.c(original)
+++ branches/S3_0/server/citytools.cSat May 13 23:24:42 2017
@@ -2492,6 +2492,8 @@
   } improvement_iterate_end;
 
 #ifdef FREECIV_WEB
+  web_packet->id = pcity->id;
+
   web_packet->granary_size = city_granary_size(city_size_get(pcity));
   web_packet->granary_turns = city_turns_to_grow(pcity);
   web_packet->buy_gold_cost = city_production_buy_gold_cost(pcity);


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35565 - in /branches/S3_0/server: settings.c settings.h

[sveinung84]

Author: sveinung
Date: Sat May 13 23:24:35 2017
New Revision: 35565

URL: http://svn.gna.org/viewcvs/freeciv?rev=35565=rev
Log:
Setting visibility to access level checker.

Make it possible to check if a server setting is visible to any player with
a certain access level rather than checking if a server setting is visible
to a specific player (based on his access level).

See hrm Feature #659408

Modified:
branches/S3_0/server/settings.c
branches/S3_0/server/settings.h

Modified: branches/S3_0/server/settings.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/server/settings.c?rev=35565=35564=35565=diff
==
--- branches/S3_0/server/settings.c (original)
+++ branches/S3_0/server/settings.c Sat May 13 23:24:35 2017
@@ -3106,6 +3106,16 @@
 }
 
 /
+  Returns whether the specified server setting (option) can be seen by a
+  caller with the specified access level.
+/
+bool setting_is_visible_at_level(const struct setting *pset,
+ enum cmdlevel plevel)
+{
+  return (plevel >= pset->access_level_read);
+}
+
+/
   Returns whether the specified server setting (option) can be seen by the
   caller.
 /
@@ -3113,7 +3123,7 @@
 struct connection *caller)
 {
   return (!caller
-  || caller->access_level >= pset->access_level_read);
+  || setting_is_visible_at_level(pset, caller->access_level));
 }
 
 /

Modified: branches/S3_0/server/settings.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/server/settings.h?rev=35565=35564=35565=diff
==
--- branches/S3_0/server/settings.h (original)
+++ branches/S3_0/server/settings.h Sat May 13 23:24:35 2017
@@ -92,6 +92,8 @@
 bool setting_is_changeable(const struct setting *pset,
struct connection *caller, char *reject_msg,
size_t reject_msg_len);
+bool setting_is_visible_at_level(const struct setting *pset,
+ enum cmdlevel plevel);
 bool setting_is_visible(const struct setting *pset,
 struct connection *caller);
 


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35561 - /trunk/client/helpdata.c

[sveinung84]

Author: sveinung
Date: Sat May 13 23:23:47 2017
New Revision: 35561

URL: http://svn.gna.org/viewcvs/freeciv?rev=35561=rev
Log:
Auto help: free list of quoted action blockers.

This fixes a memory leak. Found with Valgrind.

See hrm Bug #659405

Modified:
trunk/client/helpdata.c

Modified: trunk/client/helpdata.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/helpdata.c?rev=35561=35560=35561=diff
==
--- trunk/client/helpdata.c (original)
+++ trunk/client/helpdata.c Sat May 13 23:23:47 2017
@@ -2426,6 +2426,11 @@
  astr_build_or_list(, blockers, i));
 
 astr_free();
+
+for (; i > 0; i--) {
+  /* The text was copied above. */
+  free((char *)(blockers[i - 1]));
+}
   }
 }
   } action_iterate_end;


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35562 - in /trunk/server: settings.c settings.h

[sveinung84]

Author: sveinung
Date: Sat May 13 23:23:55 2017
New Revision: 35562

URL: http://svn.gna.org/viewcvs/freeciv?rev=35562=rev
Log:
Setting visibility to access level checker.

Make it possible to check if a server setting is visible to any player with
a certain access level rather than checking if a server setting is visible
to a specific player (based on his access level).

See hrm Feature #659408

Modified:
trunk/server/settings.c
trunk/server/settings.h

Modified: trunk/server/settings.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/settings.c?rev=35562=35561=35562=diff
==
--- trunk/server/settings.c (original)
+++ trunk/server/settings.c Sat May 13 23:23:55 2017
@@ -3124,6 +3124,16 @@
 }
 
 /
+  Returns whether the specified server setting (option) can be seen by a
+  caller with the specified access level.
+/
+bool setting_is_visible_at_level(const struct setting *pset,
+ enum cmdlevel plevel)
+{
+  return (plevel >= pset->access_level_read);
+}
+
+/
   Returns whether the specified server setting (option) can be seen by the
   caller.
 /
@@ -3131,7 +3141,7 @@
 struct connection *caller)
 {
   return (!caller
-  || caller->access_level >= pset->access_level_read);
+  || setting_is_visible_at_level(pset, caller->access_level));
 }
 
 /

Modified: trunk/server/settings.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/settings.h?rev=35562=35561=35562=diff
==
--- trunk/server/settings.h (original)
+++ trunk/server/settings.h Sat May 13 23:23:55 2017
@@ -92,6 +92,8 @@
 bool setting_is_changeable(const struct setting *pset,
struct connection *caller, char *reject_msg,
size_t reject_msg_len);
+bool setting_is_visible_at_level(const struct setting *pset,
+ enum cmdlevel plevel);
 bool setting_is_visible(const struct setting *pset,
 struct connection *caller);
 


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35560 - in /branches/S2_5/translations: freeciv/fr.po nations/fr.po

[igx31]

Author: igx31
Date: Sat May 13 21:01:52 2017
New Revision: 35560

URL: http://svn.gna.org/viewcvs/freeciv?rev=35560=rev
Log:
Updated French translations


Modified:
branches/S2_5/translations/freeciv/fr.po
branches/S2_5/translations/nations/fr.po

Modified: branches/S2_5/translations/freeciv/fr.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/fr.po?rev=35560=35559=35560=diff
==
--- branches/S2_5/translations/freeciv/fr.po(original)
+++ branches/S2_5/translations/freeciv/fr.poSat May 13 21:01:52 2017
@@ -13,10 +13,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Freeciv 2.4\n"
+"Project-Id-Version: Freeciv 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-13 12:12+0100\n"
-"PO-Revision-Date: 2016-07-19 21:59+0200\n"
+"POT-Creation-Date: 2017-05-10 12:41+0200\n"
+"PO-Revision-Date: 2017-05-04 22:35+0200\n"
 "Last-Translator: Igx \n"
 "Language-Team: French \n"
 "Language: fr\n"

Modified: branches/S2_5/translations/nations/fr.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/nations/fr.po?rev=35560=35559=35560=diff
==
--- branches/S2_5/translations/nations/fr.po(original)
+++ branches/S2_5/translations/nations/fr.poSat May 13 21:01:52 2017
@@ -13,10 +13,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Freeciv 2.4\n"
+"Project-Id-Version: Freeciv 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-13 12:12+0100\n"
-"PO-Revision-Date: 2016-06-15 07:22+0200\n"
+"POT-Creation-Date: 2017-05-10 12:41+0200\n"
+"PO-Revision-Date: 2017-05-04 22:33+0200\n"
 "Last-Translator: Igx \n"
 "Language-Team: French \n"
 "Language: fr\n"


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35558 - /branches/S3_0/ai/default/daimilitary.c

[cazfi74]

Author: cazfi
Date: Sat May 13 20:32:14 2017
New Revision: 35558

URL: http://svn.gna.org/viewcvs/freeciv?rev=35558=rev
Log:
Increase AI desire to conquer cities

See hrm Feature #659537

Modified:
branches/S3_0/ai/default/daimilitary.c

Modified: branches/S3_0/ai/default/daimilitary.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/ai/default/daimilitary.c?rev=35558=35557=35558=diff
==
--- branches/S3_0/ai/default/daimilitary.c  (original)
+++ branches/S3_0/ai/default/daimilitary.c  Sat May 13 20:32:14 2017
@@ -1235,7 +1235,7 @@
 }
 if (unit_can_take_over(myunit) || acity_data->invasion.occupy > 0) {
   /* bonus for getting the city */
-  benefit += acity_data->worth / 5;
+  benefit += acity_data->worth / 3;
 }
 
 /* end dealing with cities */


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35559 - /branches/S2_6/ai/default/daimilitary.c

[cazfi74]

Author: cazfi
Date: Sat May 13 20:32:20 2017
New Revision: 35559

URL: http://svn.gna.org/viewcvs/freeciv?rev=35559=rev
Log:
Increase AI desire to conquer cities

See hrm Feature #659537

Modified:
branches/S2_6/ai/default/daimilitary.c

Modified: branches/S2_6/ai/default/daimilitary.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/ai/default/daimilitary.c?rev=35559=35558=35559=diff
==
--- branches/S2_6/ai/default/daimilitary.c  (original)
+++ branches/S2_6/ai/default/daimilitary.c  Sat May 13 20:32:20 2017
@@ -1235,7 +1235,7 @@
 }
 if (unit_can_take_over(myunit) || acity_data->invasion.occupy > 0) {
   /* bonus for getting the city */
-  benefit += acity_data->worth / 5;
+  benefit += acity_data->worth / 3;
 }
 
 /* end dealing with cities */


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35557 - /trunk/ai/default/daimilitary.c

[cazfi74]

Author: cazfi
Date: Sat May 13 20:32:05 2017
New Revision: 35557

URL: http://svn.gna.org/viewcvs/freeciv?rev=35557=rev
Log:
Increase AI desire to conquer cities

See hrm Feature #659537

Modified:
trunk/ai/default/daimilitary.c

Modified: trunk/ai/default/daimilitary.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/daimilitary.c?rev=35557=35556=35557=diff
==
--- trunk/ai/default/daimilitary.c  (original)
+++ trunk/ai/default/daimilitary.c  Sat May 13 20:32:05 2017
@@ -1235,7 +1235,7 @@
 }
 if (unit_can_take_over(myunit) || acity_data->invasion.occupy > 0) {
   /* bonus for getting the city */
-  benefit += acity_data->worth / 5;
+  benefit += acity_data->worth / 3;
 }
 
 /* end dealing with cities */


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35556 - in /trunk/translations: nations/en_GB.po ruledit/en_GB.po

[0jacobnk . gna]

Author: jtn
Date: Sat May 13 16:25:38 2017
New Revision: 35556

URL: http://svn.gna.org/viewcvs/freeciv?rev=35556=rev
Log:
Update my email address in nations,ruledit/en_GB.po too.

Modified:
trunk/translations/nations/en_GB.po
trunk/translations/ruledit/en_GB.po

Modified: trunk/translations/nations/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/translations/nations/en_GB.po?rev=35556=3=35556=diff
==
--- trunk/translations/nations/en_GB.po (original)
+++ trunk/translations/nations/en_GB.po Sat May 13 16:25:38 2017
@@ -5,7 +5,7 @@
 # ...
 # Daniel Markstedt , 2009.
 # "TimR" (timr@gna), 2010.
-# Jacob Nevins <0jacobnk@chiark.greenend.org.uk>, 2010-2014.
+# Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>, 2010-2014.
 #
 # This file aims to provide a translation for every string, even those that
 # are identical (previously it only included msgstrs that were different).
@@ -20,7 +20,7 @@
 "Report-Msgid-Bugs-To: http://gna.org/projects/freeciv/\n;
 "POT-Creation-Date: 2017-01-01 22:01+0200\n"
 "PO-Revision-Date: 2014-07-17 10:09+0100\n"
-"Last-Translator: Jacob Nevins <0jacobnk@chiark.greenend.org.uk>\n"
+"Last-Translator: Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>\n"
 "Language-Team: \n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"

Modified: trunk/translations/ruledit/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/translations/ruledit/en_GB.po?rev=35556=3=35556=diff
==
--- trunk/translations/ruledit/en_GB.po (original)
+++ trunk/translations/ruledit/en_GB.po Sat May 13 16:25:38 2017
@@ -5,7 +5,7 @@
 # ...
 # Daniel Markstedt , 2009.
 # "TimR" (timr@gna), 2010.
-# Jacob Nevins <0jacobnk@chiark.greenend.org.uk>, 2010-2014.
+# Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>, 2010-2014.
 #
 # This file aims to provide a translation for every string, even those that
 # are identical (previously it only included msgstrs that were different).
@@ -20,7 +20,7 @@
 "Report-Msgid-Bugs-To: http://gna.org/projects/freeciv/\n;
 "POT-Creation-Date: 2017-01-01 22:01+0200\n"
 "PO-Revision-Date: 2014-09-08 22:21+0100\n"
-"Last-Translator: Jacob Nevins <0jacobnk@chiark.greenend.org.uk>\n"
+"Last-Translator: Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>\n"
 "Language-Team: \n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35555 - in /branches/S3_0/translations: nations/en_GB.po ruledit/en_GB.po

[0jacobnk . gna]

Author: jtn
Date: Sat May 13 16:19:29 2017
New Revision: 3

URL: http://svn.gna.org/viewcvs/freeciv?rev=3=rev
Log:
Update my email address in nations,ruledit/en_GB.po too.

Modified:
branches/S3_0/translations/nations/en_GB.po
branches/S3_0/translations/ruledit/en_GB.po

Modified: branches/S3_0/translations/nations/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/translations/nations/en_GB.po?rev=3=35554=3=diff
==
--- branches/S3_0/translations/nations/en_GB.po (original)
+++ branches/S3_0/translations/nations/en_GB.po Sat May 13 16:19:29 2017
@@ -5,7 +5,7 @@
 # ...
 # Daniel Markstedt , 2009.
 # "TimR" (timr@gna), 2010.
-# Jacob Nevins <0jacobnk@chiark.greenend.org.uk>, 2010-2014.
+# Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>, 2010-2014.
 #
 # This file aims to provide a translation for every string, even those that
 # are identical (previously it only included msgstrs that were different).
@@ -20,7 +20,7 @@
 "Report-Msgid-Bugs-To: http://gna.org/projects/freeciv/\n;
 "POT-Creation-Date: 2017-01-01 22:01+0200\n"
 "PO-Revision-Date: 2014-07-17 10:09+0100\n"
-"Last-Translator: Jacob Nevins <0jacobnk@chiark.greenend.org.uk>\n"
+"Last-Translator: Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>\n"
 "Language-Team: \n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"

Modified: branches/S3_0/translations/ruledit/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/translations/ruledit/en_GB.po?rev=3=35554=3=diff
==
--- branches/S3_0/translations/ruledit/en_GB.po (original)
+++ branches/S3_0/translations/ruledit/en_GB.po Sat May 13 16:19:29 2017
@@ -5,7 +5,7 @@
 # ...
 # Daniel Markstedt , 2009.
 # "TimR" (timr@gna), 2010.
-# Jacob Nevins <0jacobnk@chiark.greenend.org.uk>, 2010-2014.
+# Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>, 2010-2014.
 #
 # This file aims to provide a translation for every string, even those that
 # are identical (previously it only included msgstrs that were different).
@@ -20,7 +20,7 @@
 "Report-Msgid-Bugs-To: http://gna.org/projects/freeciv/\n;
 "POT-Creation-Date: 2017-01-01 22:01+0200\n"
 "PO-Revision-Date: 2014-09-08 22:21+0100\n"
-"Last-Translator: Jacob Nevins <0jacobnk@chiark.greenend.org.uk>\n"
+"Last-Translator: Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>\n"
 "Language-Team: \n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35554 - in /branches/S2_6/translations: nations/en_GB.po ruledit/en_GB.po

[0jacobnk . gna]

Author: jtn
Date: Sat May 13 16:11:42 2017
New Revision: 35554

URL: http://svn.gna.org/viewcvs/freeciv?rev=35554=rev
Log:
Update my email address in nations,ruledit/en_GB.po too.

Modified:
branches/S2_6/translations/nations/en_GB.po
branches/S2_6/translations/ruledit/en_GB.po

Modified: branches/S2_6/translations/nations/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/nations/en_GB.po?rev=35554=35553=35554=diff
==
--- branches/S2_6/translations/nations/en_GB.po (original)
+++ branches/S2_6/translations/nations/en_GB.po Sat May 13 16:11:42 2017
@@ -5,7 +5,7 @@
 # ...
 # Daniel Markstedt , 2009.
 # "TimR" (timr@gna), 2010.
-# Jacob Nevins <0jacobnk@chiark.greenend.org.uk>, 2010-2014.
+# Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>, 2010-2014.
 #
 # This file aims to provide a translation for every string, even those that
 # are identical (previously it only included msgstrs that were different).
@@ -20,7 +20,7 @@
 "Report-Msgid-Bugs-To: http://gna.org/projects/freeciv/\n;
 "POT-Creation-Date: 2015-09-20 02:35+0300\n"
 "PO-Revision-Date: 2014-07-17 10:09+0100\n"
-"Last-Translator: Jacob Nevins <0jacobnk@chiark.greenend.org.uk>\n"
+"Last-Translator: Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>\n"
 "Language-Team: \n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"

Modified: branches/S2_6/translations/ruledit/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/ruledit/en_GB.po?rev=35554=35553=35554=diff
==
--- branches/S2_6/translations/ruledit/en_GB.po (original)
+++ branches/S2_6/translations/ruledit/en_GB.po Sat May 13 16:11:42 2017
@@ -5,7 +5,7 @@
 # ...
 # Daniel Markstedt , 2009.
 # "TimR" (timr@gna), 2010.
-# Jacob Nevins <0jacobnk@chiark.greenend.org.uk>, 2010-2014.
+# Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>, 2010-2014.
 #
 # This file aims to provide a translation for every string, even those that
 # are identical (previously it only included msgstrs that were different).
@@ -20,7 +20,7 @@
 "Report-Msgid-Bugs-To: http://gna.org/projects/freeciv/\n;
 "POT-Creation-Date: 2015-12-09 01:02+0200\n"
 "PO-Revision-Date: 2014-09-08 22:21+0100\n"
-"Last-Translator: Jacob Nevins <0jacobnk@chiark.greenend.org.uk>\n"
+"Last-Translator: Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>\n"
 "Language-Team: \n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35553 - in /website: download.html index.html js/freeciv.js

[0jacobnk . gna]

Author: jtn
Date: Sat May 13 15:17:53 2017
New Revision: 35553

URL: http://svn.gna.org/viewcvs/freeciv?rev=35553=rev
Log:
Announce 2.5.7.

Modified:
website/download.html
website/index.html
website/js/freeciv.js

Modified: website/download.html
URL: 
http://svn.gna.org/viewcvs/freeciv/website/download.html?rev=35553=35552=35553=diff
==
--- website/download.html   (original)
+++ website/download.html   Sat May 13 15:17:53 2017
@@ -63,26 +63,26 @@
 
 
 
-Here you can download the latest version of Freeciv: 2.5.6. To learn what's 
changed between releases, see the http://www.freeciv.org/wiki/NEWS;>NEWS page. For more download 
distributions, see the http://www.freeciv.org/wiki/More_distributions;>wiki. 
+Here you can download the latest version of Freeciv: 2.5.7. To learn what's 
changed between releases, see the http://www.freeciv.org/wiki/NEWS;>NEWS page. For more download 
distributions, see the http://www.freeciv.org/wiki/More_distributions;>wiki. 
 
 Stable 2.5
-See the http://www.freeciv.org/wiki/NEWS-2.5.6;>list of changes 
in the most recent release.
+See the http://www.freeciv.org/wiki/NEWS-2.5.7;>list of changes 
in the most recent release.
 
 Source Code
 To compile Freeciv yourself, download the source code:
 
 
-freeciv-2.5.6.tar.bz2 
-http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.6.tar.bz2?download;>Mirror
 1 (sourceforge.net)
-http://files.freeciv.org/stable/freeciv-2.5.6.tar.bz2;>Mirror 2 
(freeciv.org)
-freeciv-2.5.6.zip 
-http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.6.zip?download;>Mirror
 1 (sourceforge.net)
-http://files.freeciv.org/stable/freeciv-2.5.6.zip;>Mirror 2 
(freeciv.org)
+freeciv-2.5.7.tar.bz2 
+http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.7.tar.bz2?download;>Mirror
 1 (sourceforge.net)
+http://files.freeciv.org/stable/freeciv-2.5.7.tar.bz2;>Mirror 2 
(freeciv.org)
+freeciv-2.5.7.zip 
+http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.7.zip?download;>Mirror
 1 (sourceforge.net)
+http://files.freeciv.org/stable/freeciv-2.5.7.zip;>Mirror 2 
(freeciv.org)
 
 
 Windows Packages
 
-
+Windows packages for the latest release are not 
available yet.
 
 Windows binaries are available at:
 

Modified: website/index.html
URL: 
http://svn.gna.org/viewcvs/freeciv/website/index.html?rev=35553=35552=35553=diff
==
--- website/index.html  (original)
+++ website/index.html  Sat May 13 15:17:53 2017
@@ -62,7 +62,7 @@


Download Freeciv 
-   Stable Version 2.5.6 released on 19th 
November 2016
+   Stable Version 2.5.7 released on 13th May 
2017
https://play.freeciv.org/;>Play Freeciv-web 
The online browser version of Freeciv using 
HTML5
http://forum.freeciv.org/;>Community Forum 
@@ -92,6 +92,7 @@
 
   Project news

+13th May 2017 - http://www.freeciv.org/wiki/NEWS-2.5.7;>Freeciv 2.5.7 is a minor 
bugfix release in the stable 2.5 series.
 16th Apr 2017 - http://gna.org/;>Gna!, 
which has been faithfully hosting the Freeciv code for nearly 12 years, is http://gna.org/forum/forum.php?forum_id=2545;>expected to shut down 
soon. This website is unaffected and we have already moved downloads to new 
hosting, but we expect some interruption to some other project infrastructure 
(code version control, bug tracking, and mailing lists). We are in the process 
of making alternative arrangements; all important project data is already 
safely backed up. Watch this space for more detail.
 19th Nov 2016 - http://www.freeciv.org/wiki/NEWS-2.5.6;>Freeciv 2.5.6 is a bugfix 
release in the stable 2.5 series.
 30th Jul 2016 - http://www.freeciv.org/wiki/NEWS-2.5.5;>Freeciv 2.5.5 is a bugfix 
release in the stable 2.5 series.

Modified: website/js/freeciv.js
URL: 
http://svn.gna.org/viewcvs/freeciv/website/js/freeciv.js?rev=35553=35552=35553=diff
==
--- website/js/freeciv.js   (original)
+++ website/js/freeciv.js   Sat May 13 15:17:53 2017
@@ -22,9 +22,9 @@
* place.
   
   if (window.ui.os=="Windows") {
-$("#download_button").attr("href", 
"http://prdownloads.sourceforge.net/freeciv/Freeciv-2.5.6-win32-gtk2-setup.exe?download;);
+$("#download_button").attr("href", 
"http://prdownloads.sourceforge.net/freeciv/Freeciv-2.5.7-win32-gtk2-setup.exe?download;);
   } else if (window.ui.os=="Linux") {
-$("#download_button").attr("href", 
"http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.6.tar.bz2?download;);
+$("#download_button").attr("href", 
"http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.7.tar.bz2?download;);
   } else if (window.ui.os=="Mac OS X") {
 $("#download_button").attr("href", 

[Freeciv-commits] r35552 - /website/index.html

[0jacobnk . gna]

Author: jtn
Date: Sat May 13 15:11:07 2017
New Revision: 35552

URL: http://svn.gna.org/viewcvs/freeciv?rev=35552=rev
Log:
Change gna.org links from https to http.

gna.org is still there, but they've let their TLS certificate lapse.

Modified:
website/index.html

Modified: website/index.html
URL: 
http://svn.gna.org/viewcvs/freeciv/website/index.html?rev=35552=35551=35552=diff
==
--- website/index.html  (original)
+++ website/index.html  Sat May 13 15:11:07 2017
@@ -83,7 +83,7 @@
   https://www.hostedredmine.com/projects/freeciv;>Bug 
tracker | 
   http://gna.org/projects/freeciv/;>Code | 
   https://github.com/freeciv/freeciv-web;>Freeciv-web 
Github | 
-  https://gna.org/mail/?group=freeciv;>Mailing lists  
+  http://gna.org/mail/?group=freeciv;>Mailing lists  
 
 
 
@@ -92,7 +92,7 @@
 
   Project news

-16th Apr 2017 - https://gna.org/;>Gna!, which has been faithfully hosting the Freeciv 
code for nearly 12 years, is https://gna.org/forum/forum.php?forum_id=2545;>expected to shut down 
soon. This website is unaffected and we have already moved downloads to new 
hosting, but we expect some interruption to some other project infrastructure 
(code version control, bug tracking, and mailing lists). We are in the process 
of making alternative arrangements; all important project data is already 
safely backed up. Watch this space for more detail.
+16th Apr 2017 - http://gna.org/;>Gna!, 
which has been faithfully hosting the Freeciv code for nearly 12 years, is http://gna.org/forum/forum.php?forum_id=2545;>expected to shut down 
soon. This website is unaffected and we have already moved downloads to new 
hosting, but we expect some interruption to some other project infrastructure 
(code version control, bug tracking, and mailing lists). We are in the process 
of making alternative arrangements; all important project data is already 
safely backed up. Watch this space for more detail.
 19th Nov 2016 - http://www.freeciv.org/wiki/NEWS-2.5.6;>Freeciv 2.5.6 is a bugfix 
release in the stable 2.5 series.
 30th Jul 2016 - http://www.freeciv.org/wiki/NEWS-2.5.5;>Freeciv 2.5.5 is a bugfix 
release in the stable 2.5 series.
 14th May 2016 - http://www.freeciv.org/wiki/NEWS-2.5.4;>Freeciv 2.5.4 is a bugfix 
release in the stable 2.5 series.


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35550 - in /branches/S3_0: doc/README.msys2 windows/installer_msys2/Makefile

[cazfi74]

Author: cazfi
Date: Sat May 13 14:31:02 2017
New Revision: 35550

URL: http://svn.gna.org/viewcvs/freeciv?rev=35550=rev
Log:
Update msys2 environment to 170422 level

See hrm Task #652797

Modified:
branches/S3_0/doc/README.msys2
branches/S3_0/windows/installer_msys2/Makefile

Modified: branches/S3_0/doc/README.msys2
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/doc/README.msys2?rev=35550=35549=35550=diff
==
--- branches/S3_0/doc/README.msys2  (original)
+++ branches/S3_0/doc/README.msys2  Sat May 13 14:31:02 2017
@@ -57,10 +57,11 @@
 
  - tar
 
-2.1.1.3) Arch independent packages needed for building freeciv from svn 
checkout
- These are needed in addition to the ones always needed for building freeciv.
+2.1.1.3) Arch independent packages needed for building freeciv from repository
+ checkout. These are needed in addition to the ones always needed for building
+ freeciv.
 
- - subversion
+ - git
  - automake
  - libtool
  - autoconf
@@ -111,9 +112,9 @@
 
 win64 host:
 ---
-msys2-freeciv-win64-170126.7z, based on
+msys2-freeciv-win64-170422.7z, based on
 
https://sourceforge.net/projects/msys2/files/Base/x86-64/msys2-x86_64-20161025.exe
-with packages updated to 26-Jan-17 level.
+with packages updated to 22-Apr-17 level.
 
 Only win64 target is included - replace  with 'x86_64' in package names 
below
 
@@ -122,7 +123,7 @@
 - make
 - pkg-config
 - tar
-- subversion
+- git
 - patch
 - nano
 - automake

Modified: branches/S3_0/windows/installer_msys2/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/windows/installer_msys2/Makefile?rev=35550=35549=35550=diff
==
--- branches/S3_0/windows/installer_msys2/Makefile  (original)
+++ branches/S3_0/windows/installer_msys2/Makefile  Sat May 13 14:31:02 2017
@@ -229,7 +229,8 @@
libepoxy-0.dll \
libgraphite2.dll \
libpangoft2-1.0-0.dll \
-   libpcre-1.dll
+   libpcre-1.dll \
+   libunistring-2.dll
 
 install-env-default-fcmp: install-env-common
cp -R $(addprefix $(DLLPATH_PREFIX), $(DEFAULT_FCMP_DLLS)) 
install-$(WINARCH)-$(GUI)/
@@ -272,7 +273,7 @@
SDL2_ttf.dll \
libjpeg-8.dll \
libtiff-5.dll \
-   libwebp-6.dll
+   libwebp-7.dll
 
 install-env-sdl2: install-env-default-fcmp
# add DLLs
@@ -289,7 +290,8 @@
Qt5Gui.dll \
Qt5Widgets.dll \
libgraphite2.dll \
-   libpcre-1.dll
+   libpcre-1.dll \
+   libunistring-2.dll
 
 install-env-qt: install-env-common
# add DLLs


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35549 - in /trunk: doc/README.msys2 windows/installer_msys2/Makefile

[cazfi74]

Author: cazfi
Date: Sat May 13 14:30:55 2017
New Revision: 35549

URL: http://svn.gna.org/viewcvs/freeciv?rev=35549=rev
Log:
Update msys2 environment to 170422 level

See hrm Task #652797

Modified:
trunk/doc/README.msys2
trunk/windows/installer_msys2/Makefile

Modified: trunk/doc/README.msys2
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.msys2?rev=35549=35548=35549=diff
==
--- trunk/doc/README.msys2  (original)
+++ trunk/doc/README.msys2  Sat May 13 14:30:55 2017
@@ -56,10 +56,11 @@
 
  - tar
 
-2.1.1.3) Arch independent packages needed for building freeciv from svn 
checkout
- These are needed in addition to the ones always needed for building freeciv.
+2.1.1.3) Arch independent packages needed for building freeciv from repository
+ checkout. These are needed in addition to the ones always needed for building
+ freeciv.
 
- - subversion
+ - git
  - automake
  - libtool
  - autoconf
@@ -107,9 +108,9 @@
 
 win64 host:
 ---
-msys2-freeciv-win64-170126.7z, based on
+msys2-freeciv-win64-170422.7z, based on
 
https://sourceforge.net/projects/msys2/files/Base/x86-64/msys2-x86_64-20161025.exe
-with packages updated to 26-Jan-17 level.
+with packages updated to 22-Apr-17 level.
 
 Only win64 target is included - replace  with 'x86_64' in package names 
below
 
@@ -118,7 +119,7 @@
 - make
 - pkg-config
 - tar
-- subversion
+- git
 - patch
 - nano
 - automake

Modified: trunk/windows/installer_msys2/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_msys2/Makefile?rev=35549=35548=35549=diff
==
--- trunk/windows/installer_msys2/Makefile  (original)
+++ trunk/windows/installer_msys2/Makefile  Sat May 13 14:30:55 2017
@@ -221,7 +221,8 @@
libepoxy-0.dll \
libgraphite2.dll \
libpangoft2-1.0-0.dll \
-   libpcre-1.dll
+   libpcre-1.dll \
+   libunistring-2.dll
 
 install-env-default-fcmp: install-env-common
cp -R $(addprefix $(DLLPATH_PREFIX), $(DEFAULT_FCMP_DLLS)) 
install-$(WINARCH)-$(GUI)/
@@ -245,7 +246,7 @@
SDL2_ttf.dll \
libjpeg-8.dll \
libtiff-5.dll \
-   libwebp-6.dll
+   libwebp-7.dll
 
 install-env-sdl2: install-env-default-fcmp
# add DLLs
@@ -262,7 +263,8 @@
Qt5Gui.dll \
Qt5Widgets.dll \
libgraphite2.dll \
-   libpcre-1.dll
+   libpcre-1.dll \
+   libunistring-2.dll
 
 install-env-qt: install-env-common
# add DLLs


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35551 - in /branches/S2_6: doc/README.msys2 win32/installer_msys2/Makefile

[cazfi74]

Author: cazfi
Date: Sat May 13 14:31:09 2017
New Revision: 35551

URL: http://svn.gna.org/viewcvs/freeciv?rev=35551=rev
Log:
Update msys2 environment to 170422 level

See hrm Task #652797

Modified:
branches/S2_6/doc/README.msys2
branches/S2_6/win32/installer_msys2/Makefile

Modified: branches/S2_6/doc/README.msys2
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/README.msys2?rev=35551=35550=35551=diff
==
--- branches/S2_6/doc/README.msys2  (original)
+++ branches/S2_6/doc/README.msys2  Sat May 13 14:31:09 2017
@@ -59,10 +59,11 @@
 
  - tar
 
-2.1.1.3) Arch independent packages needed for building freeciv from svn 
checkout
- These are needed in addition to the ones always needed for building freeciv.
+2.1.1.3) Arch independent packages needed for building freeciv from repository
+ checkout. These are needed in addition to the ones always needed for building
+ freeciv.
 
- - subversion
+ - git
  - automake
  - libtool
  - autoconf
@@ -112,9 +113,9 @@
 
 win64 host:
 ---
-msys2-freeciv-win64-170126.7z, based on
+msys2-freeciv-win64-170422.7z, based on
 
https://sourceforge.net/projects/msys2/files/Base/x86-64/msys2-x86_64-20161025.exe
-with packages updated to 26-Jan-17 level.
+with packages updated to 22-Apr-17 level.
 
 Only win64 target is included - replace  with 'x86_64' in package names 
below
 
@@ -123,7 +124,7 @@
 - make
 - pkg-config
 - tar
-- subversion
+- git
 - patch
 - nano
 - automake

Modified: branches/S2_6/win32/installer_msys2/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/Makefile?rev=35551=35550=35551=diff
==
--- branches/S2_6/win32/installer_msys2/Makefile(original)
+++ branches/S2_6/win32/installer_msys2/MakefileSat May 13 14:31:09 2017
@@ -232,7 +232,8 @@
libepoxy-0.dll \
libgraphite2.dll \
libpangoft2-1.0-0.dll \
-   libpcre-1.dll
+   libpcre-1.dll \
+   libunistring-2.dll
 
 install-env-default-fcmp: install-env-common
cp -R $(addprefix $(DLLPATH_PREFIX), $(DEFAULT_FCMP_DLLS)) 
install-$(WINARCH)-$(GUI)/
@@ -277,7 +278,7 @@
SDL2_ttf.dll \
libjpeg-8.dll \
libtiff-5.dll \
-   libwebp-6.dll
+   libwebp-7.dll
 
 install-env-sdl2: install-env-default-fcmp
# add DLLs
@@ -294,7 +295,8 @@
Qt5Gui.dll \
Qt5Widgets.dll \
libgraphite2.dll \
-   libpcre-1.dll
+   libpcre-1.dll \
+   libunistring-2.dll
 
 install-env-qt: install-env-common
# add DLLs


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35548 - /trunk/ai/tex/texaiworld.c

[cazfi74]

Author: cazfi
Date: Sat May 13 14:00:50 2017
New Revision: 35548

URL: http://svn.gna.org/viewcvs/freeciv?rev=35548=rev
Log:
Tex: Free city when it's destroyed from the world.

See hrm Bug #659528

Modified:
trunk/ai/tex/texaiworld.c

Modified: trunk/ai/tex/texaiworld.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/ai/tex/texaiworld.c?rev=35548=35547=35548=diff
==
--- trunk/ai/tex/texaiworld.c   (original)
+++ trunk/ai/tex/texaiworld.c   Sat May 13 14:00:50 2017
@@ -168,4 +168,5 @@
   struct city *pcity = idex_lookup_city(_world, info->id);
 
   idex_unregister_city(_world, pcity);
+  destroy_city_virtual(pcity);
 }


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35547 - /tags/R2_5_7/fc_version

[0jacobnk . gna]

Author: jtn
Date: Sat May 13 13:48:48 2017
New Revision: 35547

URL: http://svn.gna.org/viewcvs/freeciv?rev=35547=rev
Log:
Strip '+' from version string for release.

Modified:
tags/R2_5_7/fc_version

Modified: tags/R2_5_7/fc_version
URL: 
http://svn.gna.org/viewcvs/freeciv/tags/R2_5_7/fc_version?rev=35547=35546=35547=diff
==
--- tags/R2_5_7/fc_version  (original)
+++ tags/R2_5_7/fc_version  Sat May 13 13:48:48 2017
@@ -7,7 +7,7 @@
 MAJOR_VERSION="2"
 MINOR_VERSION="5"
 PATCH_VERSION="7"
-VERSION_LABEL="+"
+VERSION_LABEL=""
 
 # 1) Development until MAJOR and MINOR version numbers are
 #set to new release series:


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35546 - /tags/R2_5_7/

[0jacobnk . gna]

Author: jtn
Date: Sat May 13 13:41:05 2017
New Revision: 35546

URL: http://svn.gna.org/viewcvs/freeciv?rev=35546=rev
Log:
Tag 2.5.7 release.

Added:
tags/R2_5_7/
  - copied from r35545, branches/S2_5/


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35545 - /branches/S2_5/ChangeLog

[0jacobnk . gna]

Author: jtn
Date: Sat May 13 13:39:02 2017
New Revision: 35545

URL: http://svn.gna.org/viewcvs/freeciv?rev=35545=rev
Log:
Update ChangeLog as of S2_5 r35544.

Modified:
branches/S2_5/ChangeLog

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/S2_5/ChangeLog
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/ChangeLog?rev=35545=35544=35545=diff


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35544 - /branches/S2_5/fc_version

[0jacobnk . gna]

Author: jtn
Date: Sat May 13 13:36:18 2017
New Revision: 35544

URL: http://svn.gna.org/viewcvs/freeciv?rev=35544=rev
Log:
Bump version number to '2.5.7'.

Modified:
branches/S2_5/fc_version

Modified: branches/S2_5/fc_version
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/fc_version?rev=35544=35543=35544=diff
==
--- branches/S2_5/fc_version(original)
+++ branches/S2_5/fc_versionSat May 13 13:36:18 2017
@@ -6,7 +6,7 @@
 
 MAJOR_VERSION="2"
 MINOR_VERSION="5"
-PATCH_VERSION="6"
+PATCH_VERSION="7"
 VERSION_LABEL="+"
 
 # 1) Development until MAJOR and MINOR version numbers are


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35543 - /branches/S2_5/NEWS-2.5

[0jacobnk . gna]

Author: jtn
Date: Sat May 13 13:30:59 2017
New Revision: 35543

URL: http://svn.gna.org/viewcvs/freeciv?rev=35543=rev
Log:
Refresh NEWS-2.5 for 2.5.7, from wiki.

Modified:
branches/S2_5/NEWS-2.5

Modified: branches/S2_5/NEWS-2.5
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/NEWS-2.5?rev=35543=35542=35543=diff
==
--- branches/S2_5/NEWS-2.5  (original)
+++ branches/S2_5/NEWS-2.5  Sat May 13 13:30:59 2017
@@ -1,10 +1,76 @@
 
-Welcome to Freeciv 2.5.6
+Welcome to Freeciv 2.5.7
 
 
 The changes in the 2.5.x series are summarised below.
 For changes prior to 2.5, see NEWS. For more detailed changes,
 see the ChangeLog file.
+
+
+CHANGES FROM 2.5.6 to 2.5.7
+---
+
+   (from )
+
+   2.5.7 is a bugfix release.
+
+Server / General
+
+Changes affecting players (supplied rulesets)
+
+ * The score list shown when the game is over now includes dead
+   players. GNA#17248
+ * Fix a server crash when the AI could not find a suitable ferryboat
+   unit type. (This was observed with a modified ruleset.) GNA#25628
+ * Fix a typo'd city name in the Newfoundland nation. HRM#658528
+ * Correctly diagnose failure to load a ruleset needed by a saved
+   game. HRM#659503
+ * Improved behavior after failing to write a file such as a saved
+   game. GNAPATCH#8048 GNA#25391
+ * Improved robustness against reading broken savegames. GNA#25416
+
+General
+
+ * Tiny optimization for speed. HRM#658612
+ * Fix a tiny memory leak. GNA#25246
+ * Various internal changes which should only affect developers.
+   GNA#25319 GNA#25508 HRM#655305 GNA#25430
+
+Clients
+
+ * The "Manual Turn Done in AI mode" client option now does something
+   useful. HRM#657412
+ * (Qt) Player dialog now shows whether given nation shares vision to
+   other nations. GNAPATCH#8115
+ * (Qt) In pregame, pressing Enter on the username text box will now
+   initiate a connection. GNAPATCH#8118
+ * (Qt) The player dialog sometimes did not show new players, e.g.
+   after a civil war. GNA#25506
+ * (Qt) Focus might be set incorrectly to map after the selected unit
+   changed. GNA#25505
+ * (Gtk3) Fix some Gtk warnings on the console. GNAPATCH#7163
+
+Help / Documentation
+
+ * Update docs to reflect move away from gna.org. HRM#637952
+   HRM#652494 HRM#655380 HRM#637953 HRM#656595
+ * Refresh some links in INSTALL. HRM#656476
+ * Update the FAQ a bit.
+ * Miscellaneous changes to developer/ruleset docs. GNAPATCH#8109
+
+Translations
+
+ * Updated translations:
+  + Complete translations: French, British English, Russian.
+  + Incomplete translations: Finnish (100% core, 92% nations),
+Ukrainian (100% core, 79% nations).
+
+Build/portability
+
+ * Fix warning seen with Clang 3.9. Freeciv builds cleanly with Clang
+   4.0. GNA#25314
+ * Fix warnings seen with GCC 7, with which Freeciv builds cleanly.
+   HRM#657309 HRM#657332
 
 
 CHANGES FROM 2.5.5 to 2.5.6


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35542 - in /branches/S2_5/translations: freeciv/ nations/

[0jacobnk . gna]

Author: jtn
Date: Sat May 13 13:22:58 2017
New Revision: 35542

URL: http://svn.gna.org/viewcvs/freeciv?rev=35542=rev
Log:
Results of running "make update-po"
in translations/freeciv/ and translations/nations/

Modified:
branches/S2_5/translations/freeciv/ar.po
branches/S2_5/translations/freeciv/bg.po
branches/S2_5/translations/freeciv/ca.po
branches/S2_5/translations/freeciv/cs.po
branches/S2_5/translations/freeciv/da.po
branches/S2_5/translations/freeciv/de.po
branches/S2_5/translations/freeciv/el.po
branches/S2_5/translations/freeciv/en_GB.po
branches/S2_5/translations/freeciv/eo.po
branches/S2_5/translations/freeciv/es.po
branches/S2_5/translations/freeciv/et.po
branches/S2_5/translations/freeciv/fa.po
branches/S2_5/translations/freeciv/fi.po
branches/S2_5/translations/freeciv/fr.po
branches/S2_5/translations/freeciv/ga.po
branches/S2_5/translations/freeciv/gd.po
branches/S2_5/translations/freeciv/he.po
branches/S2_5/translations/freeciv/hu.po
branches/S2_5/translations/freeciv/id.po
branches/S2_5/translations/freeciv/it.po
branches/S2_5/translations/freeciv/ja.po
branches/S2_5/translations/freeciv/ko.po
branches/S2_5/translations/freeciv/lt.po
branches/S2_5/translations/freeciv/nb.po
branches/S2_5/translations/freeciv/nl.po
branches/S2_5/translations/freeciv/pl.po
branches/S2_5/translations/freeciv/pt.po
branches/S2_5/translations/freeciv/pt_BR.po
branches/S2_5/translations/freeciv/ro.po
branches/S2_5/translations/freeciv/ru.po
branches/S2_5/translations/freeciv/sr.po
branches/S2_5/translations/freeciv/sv.po
branches/S2_5/translations/freeciv/tr.po
branches/S2_5/translations/freeciv/uk.po
branches/S2_5/translations/freeciv/zh_CN.po
branches/S2_5/translations/freeciv/zh_TW.po
branches/S2_5/translations/nations/ar.po
branches/S2_5/translations/nations/bg.po
branches/S2_5/translations/nations/ca.po
branches/S2_5/translations/nations/cs.po
branches/S2_5/translations/nations/da.po
branches/S2_5/translations/nations/de.po
branches/S2_5/translations/nations/el.po
branches/S2_5/translations/nations/en_GB.po
branches/S2_5/translations/nations/eo.po
branches/S2_5/translations/nations/es.po
branches/S2_5/translations/nations/et.po
branches/S2_5/translations/nations/fa.po
branches/S2_5/translations/nations/fi.po
branches/S2_5/translations/nations/fr.po
branches/S2_5/translations/nations/ga.po
branches/S2_5/translations/nations/gd.po
branches/S2_5/translations/nations/he.po
branches/S2_5/translations/nations/hu.po
branches/S2_5/translations/nations/id.po
branches/S2_5/translations/nations/it.po
branches/S2_5/translations/nations/ja.po
branches/S2_5/translations/nations/ko.po
branches/S2_5/translations/nations/lt.po
branches/S2_5/translations/nations/nb.po
branches/S2_5/translations/nations/nl.po
branches/S2_5/translations/nations/pl.po
branches/S2_5/translations/nations/pt.po
branches/S2_5/translations/nations/pt_BR.po
branches/S2_5/translations/nations/ro.po
branches/S2_5/translations/nations/ru.po
branches/S2_5/translations/nations/sr.po
branches/S2_5/translations/nations/sv.po
branches/S2_5/translations/nations/tr.po
branches/S2_5/translations/nations/uk.po
branches/S2_5/translations/nations/zh_CN.po
branches/S2_5/translations/nations/zh_TW.po

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/S2_5/translations/freeciv/ar.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/ar.po?rev=35542=35541=35542=diff

Modified: branches/S2_5/translations/freeciv/bg.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/bg.po?rev=35542=35541=35542=diff

Modified: branches/S2_5/translations/freeciv/ca.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/ca.po?rev=35542=35541=35542=diff

Modified: branches/S2_5/translations/freeciv/cs.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/cs.po?rev=35542=35541=35542=diff

Modified: branches/S2_5/translations/freeciv/da.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/da.po?rev=35542=35541=35542=diff

Modified: branches/S2_5/translations/freeciv/de.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/de.po?rev=35542=35541=35542=diff

Modified: branches/S2_5/translations/freeciv/el.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/el.po?rev=35542=35541=35542=diff

Modified: branches/S2_5/translations/freeciv/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/en_GB.po?rev=35542=35541=35542=diff

Modified: branches/S2_5/translations/freeciv/eo.po
URL: 

[Freeciv-commits] r35541 - /branches/S2_5/translations/nations/en_GB.po

[0jacobnk . gna]

Author: jtn
Date: Sat May 13 13:20:01 2017
New Revision: 35541

URL: http://svn.gna.org/viewcvs/freeciv?rev=35541=rev
Log:
Update my email address in nations/en_GB.po too.

Modified:
branches/S2_5/translations/nations/en_GB.po

Modified: branches/S2_5/translations/nations/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/nations/en_GB.po?rev=35541=35540=35541=diff
==
--- branches/S2_5/translations/nations/en_GB.po (original)
+++ branches/S2_5/translations/nations/en_GB.po Sat May 13 13:20:01 2017
@@ -5,7 +5,7 @@
 # ...
 # Daniel Markstedt , 2009.
 # "TimR" (timr@gna), 2010.
-# Jacob Nevins <0jacobnk@chiark.greenend.org.uk>, 2010-2016.
+# Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>, 2010-2016.
 #
 # This file aims to provide a translation for every string, even those that
 # are identical (previously it only included msgstrs that were different).
@@ -20,7 +20,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-11-19 11:39+\n"
 "PO-Revision-Date: 2016-07-07 01:48+0100\n"
-"Last-Translator: Jacob Nevins <0jacobnk@chiark.greenend.org.uk>\n"
+"Last-Translator: Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>\n"
 "Language-Team: \n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35540 - /branches/S2_5/doc/FAQ

[0jacobnk . gna]

Author: jtn
Date: Sat May 13 13:09:19 2017
New Revision: 35540

URL: http://svn.gna.org/viewcvs/freeciv?rev=35540=rev
Log:
Update doc/FAQ manually from wiki.

Modified:
branches/S2_5/doc/FAQ

Modified: branches/S2_5/doc/FAQ
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/doc/FAQ?rev=35540=35539=35540=diff
==
--- branches/S2_5/doc/FAQ   (original)
+++ branches/S2_5/doc/FAQ   Sat May 13 13:09:19 2017
@@ -647,7 +647,7 @@
 mike@localhost:/usr/local/bin$ ./freeciv-server
 This is the server for Freeciv version 2.5.0
 You can learn a lot about Freeciv at http://www.freeciv.org/
-2: Loading rulesets
+2: Loading rulesets.
 2: AI*1 has been added as Easy level AI-controlled player (classic).
 2: AI*2 has been added as Easy level AI-controlled player (classic).
 2: AI*3 has been added as Easy level AI-controlled player (classic).
@@ -679,9 +679,11 @@
If your Metaserver tab turns up an empty list, there might something
wrong with your setup.
 
-   First, check your Freeciv version. Freeciv 1.9.0 up to and including
-   1.14.2 use the old metaserver, 2.0 and higher use the new metaserver;
-   if you're mixing versions, you may be getting the wrong list.
+   First, check your Freeciv version. Freeciv clients can only talk to
+   servers of the same major version (2.5.x can only talk to 2.5.y), and
+   there may simply be no public servers for the version you're running.
+   Check out the web interface (which shows servers for all versions) and
+   look at the "version" column.
 
If you can view the metaserver page with your web browser, and servers
are listed, but the client's Metaserver tab still fails to list them,
@@ -698,8 +700,8 @@
 
 3.5 Am I using the latest version? Do I need to upgrade?
 
-   The current stable Freeciv version is 2.4.2. For an overview of changes
-   that went into this release, see the NEWS-2.4.2 article.
+   The current stable Freeciv version is 2.5.7. For an overview of changes
+   that went into this release, see the NEWS-2.5.7 article.
 
The NEWS-#.#.# article is only updated for a new release; updates to
Subversion are listed in the freeciv-commits archives (see Mailing
@@ -710,14 +712,14 @@
contributed binaries.
 
It's unlikely that all precompiled binaries and ports have been updated
-   to 2.4.2 yet. If you can contribute, please do! Prepare a package and
+   to 2.5.7 yet. If you can contribute, please do! Prepare a package and
announce it to freeciv-...@freelists.org.
 
Clients and servers of different major versions are generally
incompatible due to changes in the client/server protocol. You will see
incompatibilities as a 'mismatched capabilities' error. Different minor
versions should be compatible, however. For example, 2.0.0 and 2.0.8
-   are compatible; 2.0.0 and 2.4.2 are not.
+   are compatible; 2.0.0 and 2.5.7 are not.
 
 ---
 
@@ -736,7 +738,7 @@
 3.7 HOME directory not set?
 
The Freeciv client wants to write a configuration file named
-   .freeciv-client-rc-2.2 (for Freeciv 2.2.x) in your $HOME directory. On
+   .freeciv-client-rc-2.5 (for Freeciv 2.5.x) in your $HOME directory. On
Windows XP $HOME is usually "C:\Documents and
Settings\username\Application Data" On Windows 7 it can be found under
"C:\Users\username\AppData\Roaming".The $HOME directory can be set from
@@ -764,9 +766,9 @@
 3.9 How do I restart a saved game?
 
If for some reason you can't use the start-screen interface for loading
-   a game, you can load one directly through the server command line (see
-   Command-line options). You can start freeciv-server with the -f option,
-   for example:
+   a game, you can load one directly through the client or server command
+   line (see Command-line options). You can start a client such as
+   freeciv-gtk2, or freeciv-server, with the -f option, for example:
 freeciv-server -f freeciv-T0175-Y01250-auto.sav.bz2
 
Or you can use the /load command inside the server before starting the
@@ -779,11 +781,12 @@
In a local game started from the client, the games will be saved into
the default Freeciv save directory (typically ~/.freeciv/saves/). If
you are running the server from the command line, however, any
-   savegames will be stored in the current directory. If the saveturns
-   server variable is set, the server will periodically save the game
-   automatically (which can take a lot of disk space in some cases). In
-   any case, you should check the ownership, permissions, and disk
-   space/quota for the directory or partition you're trying to save to.
+   savegames will be stored in the current directory. If the autosaves
+   server setting is set appropriately, the server will periodically save
+   the game automatically (which can take a lot of disk space in some
+   cases); the frequency is controlled by the saveturns setting. In any
+   case, you should check the ownership, 

[Freeciv-commits] r35539 - in /branches/S3_0/ai/tex: Makefile.am texai.c threxprai.c

[cazfi74]

Author: cazfi
Date: Sat May 13 12:33:41 2017
New Revision: 35539

URL: http://svn.gna.org/viewcvs/freeciv?rev=35539=rev
Log:
Rename threxprai.c as texai.c

See hrm Feature #658487

Added:
branches/S3_0/ai/tex/texai.c
  - copied unchanged from r35538, branches/S3_0/ai/tex/threxprai.c
Removed:
branches/S3_0/ai/tex/threxprai.c
Modified:
branches/S3_0/ai/tex/Makefile.am

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/S3_0/ai/tex/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/ai/tex/Makefile.am?rev=35539=35538=35539=diff

Removed: branches/S3_0/ai/tex/threxprai.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/ai/tex/threxprai.c?rev=35538=auto


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35538 - in /trunk/ai/tex: Makefile.am texai.c threxprai.c

[cazfi74]

Author: cazfi
Date: Sat May 13 12:33:35 2017
New Revision: 35538

URL: http://svn.gna.org/viewcvs/freeciv?rev=35538=rev
Log:
Rename threxprai.c as texai.c

See hrm Feature #658487

Added:
trunk/ai/tex/texai.c
  - copied unchanged from r35537, trunk/ai/tex/threxprai.c
Removed:
trunk/ai/tex/threxprai.c
Modified:
trunk/ai/tex/Makefile.am

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: trunk/ai/tex/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/ai/tex/Makefile.am?rev=35538=35537=35538=diff

Removed: trunk/ai/tex/threxprai.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/ai/tex/threxprai.c?rev=35537=auto


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35537 - /branches/S2_5/server/savegame2.c

[0jacobnk . gna]

Author: jtn
Date: Sat May 13 12:03:37 2017
New Revision: 35537

URL: http://svn.gna.org/viewcvs/freeciv?rev=35537=rev
Log:
Bomb out after failing to load ruleset during savegame loading.

Since first parameter of sg_failure_ret() is an assert kind of pattern
to decide if any error handling is needed, having 'TRUE' there is
certainly an error. There is one such case, when loading of ruleset has
failed.

Patch by Marko Lindqvist.

See hrm bug #659503.

Modified:
branches/S2_5/server/savegame2.c

Modified: branches/S2_5/server/savegame2.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/savegame2.c?rev=35537=35536=35537=diff
==
--- branches/S2_5/server/savegame2.c(original)
+++ branches/S2_5/server/savegame2.cSat May 13 12:03:37 2017
@@ -1660,7 +1660,7 @@
   }
   if (!load_rulesets(NULL, TRUE)) {
 /* Failed to load correct ruleset */
-sg_failure_ret(TRUE, "Failed to load ruleset");
+sg_failure_ret(FALSE, "Failed to load ruleset");
   }
 
   /* Load improvements. */


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35536 - /branches/S2_5/doc/README

[0jacobnk . gna]

Author: jtn
Date: Sat May 13 12:03:33 2017
New Revision: 35536

URL: http://svn.gna.org/viewcvs/freeciv?rev=35536=rev
Log:
Update README for freeciv-announce move.

See hrm feature #637953.

Modified:
branches/S2_5/doc/README

Modified: branches/S2_5/doc/README
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/doc/README?rev=35536=35535=35536=diff
==
--- branches/S2_5/doc/README(original)
+++ branches/S2_5/doc/READMESat May 13 12:03:33 2017
@@ -516,24 +516,29 @@
 Mailing lists:
 ==
 
-We maintain 4 mailing lists. (At the time of writing, the mailing list
-hosting for -announce and -commits is subject to change.)
-
-  freeciv-annou...@gna.org
+We maintain 4 mailing lists:
+
+  freeciv-annou...@freelists.org
Announcements of general interest.
This is a "Read Only" list, with infrequent messages.
In other words you can't mail this list, just read it.
+   Subscribe: https://www.freelists.org/list/freeciv-announce
   freeciv-i...@freelists.org
Freeciv translation.
All discussions related to translating the Freeciv code,
documentation, and website, into other languages than
English.
+   Subscribe: https://www.freelists.org/list/freeciv-i18n
   freeciv-...@freelists.org
Freeciv development.
+   Subscribe: https://www.freelists.org/list/freeciv-dev
   freeciv-commits@gna.org
Notifications of changes to the code repository.
This is a "Read Only" list, carrying automated messages.
In other words you can't mail this list, just read it.
+   (At the time of writing, gna.org is expected to shut
+   down soon; we're not yet sure what arrangements we'll
+   have for a replacement commits mailing list.)
 
 All lists are open to the general public and everyone is welcome to join.
 Only maintainers may post to the -announce and -commits lists.


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35534 - /branches/S2_6/doc/README

[0jacobnk . gna]

Author: jtn
Date: Sat May 13 12:03:11 2017
New Revision: 35534

URL: http://svn.gna.org/viewcvs/freeciv?rev=35534=rev
Log:
Update README for freeciv-announce move.

See hrm feature #637953.

Modified:
branches/S2_6/doc/README

Modified: branches/S2_6/doc/README
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/README?rev=35534=35533=35534=diff
==
--- branches/S2_6/doc/README(original)
+++ branches/S2_6/doc/READMESat May 13 12:03:11 2017
@@ -526,24 +526,29 @@
 Mailing lists:
 ==
 
-We maintain 4 mailing lists. (At the time of writing, the mailing list
-hosting for -announce and -commits is subject to change.)
-
-  freeciv-annou...@gna.org
+We maintain 4 mailing lists:
+
+  freeciv-annou...@freelists.org
Announcements of general interest.
This is a "Read Only" list, with infrequent messages.
In other words you can't mail this list, just read it.
+   Subscribe: https://www.freelists.org/list/freeciv-announce
   freeciv-i...@freelists.org
Freeciv translation.
All discussions related to translating the Freeciv code,
documentation, and website, into other languages than
English.
+   Subscribe: https://www.freelists.org/list/freeciv-i18n
   freeciv-...@freelists.org
Freeciv development.
+   Subscribe: https://www.freelists.org/list/freeciv-dev
   freeciv-commits@gna.org
Notifications of changes to the code repository.
This is a "Read Only" list, carrying automated messages.
In other words you can't mail this list, just read it.
+   (At the time of writing, gna.org is expected to shut
+   down soon; we're not yet sure what arrangements we'll
+   have for a replacement commits mailing list.)
 
 All lists are open to the general public and everyone is welcome to join.
 Only maintainers may post to the -announce and -commits lists.


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35535 - /branches/S2_6/server/savegame2.c

[0jacobnk . gna]

Author: jtn
Date: Sat May 13 12:03:15 2017
New Revision: 35535

URL: http://svn.gna.org/viewcvs/freeciv?rev=35535=rev
Log:
Bomb out after failing to load ruleset during savegame loading.

Since first parameter of sg_failure_ret() is an assert kind of pattern
to decide if any error handling is needed, having 'TRUE' there is
certainly an error. There is one such case, when loading of ruleset has
failed.

Patch by Marko Lindqvist.

See hrm bug #659503.

Modified:
branches/S2_6/server/savegame2.c

Modified: branches/S2_6/server/savegame2.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/savegame2.c?rev=35535=35534=35535=diff
==
--- branches/S2_6/server/savegame2.c(original)
+++ branches/S2_6/server/savegame2.cSat May 13 12:03:15 2017
@@ -1569,7 +1569,7 @@
   }
   if (!load_rulesets(NULL, TRUE, FALSE)) {
 /* Failed to load correct ruleset */
-sg_failure_ret(TRUE, _("Failed to load ruleset"));
+sg_failure_ret(FALSE, _("Failed to load ruleset"));
   }
 }
 


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35533 - in /branches/S3_0/server: savegame2.c savegame3.c

[0jacobnk . gna]

Author: jtn
Date: Sat May 13 12:02:44 2017
New Revision: 35533

URL: http://svn.gna.org/viewcvs/freeciv?rev=35533=rev
Log:
Bomb out after failing to load ruleset during savegame loading.

Since first parameter of sg_failure_ret() is an assert kind of pattern
to decide if any error handling is needed, having 'TRUE' there is
certainly an error. There is one such case, when loading of ruleset has
failed.

Patch by Marko Lindqvist.

See hrm bug #659503.

Modified:
branches/S3_0/server/savegame2.c
branches/S3_0/server/savegame3.c

Modified: branches/S3_0/server/savegame2.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/server/savegame2.c?rev=35533=35532=35533=diff
==
--- branches/S3_0/server/savegame2.c(original)
+++ branches/S3_0/server/savegame2.cSat May 13 12:02:44 2017
@@ -1093,7 +1093,7 @@
   }
   if (!load_rulesets(NULL, FALSE, TRUE, FALSE)) {
 /* Failed to load correct ruleset */
-sg_failure_ret(TRUE, _("Failed to load ruleset"));
+sg_failure_ret(FALSE, _("Failed to load ruleset"));
   }
 }
 

Modified: branches/S3_0/server/savegame3.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/server/savegame3.c?rev=35533=35532=35533=diff
==
--- branches/S3_0/server/savegame3.c(original)
+++ branches/S3_0/server/savegame3.cSat May 13 12:02:44 2017
@@ -1312,7 +1312,7 @@
 }
 if (!load_rulesets(NULL, FALSE, TRUE, FALSE)) {
   /* Failed to load correct ruleset */
-  sg_failure_ret(TRUE, "Failed to load ruleset");
+  sg_failure_ret(FALSE, "Failed to load ruleset");
 }
   }
 


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35532 - /branches/S3_0/doc/README

[0jacobnk . gna]

Author: jtn
Date: Sat May 13 12:02:40 2017
New Revision: 35532

URL: http://svn.gna.org/viewcvs/freeciv?rev=35532=rev
Log:
Update README for freeciv-announce move.

See hrm feature #637953.

Modified:
branches/S3_0/doc/README

Modified: branches/S3_0/doc/README
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/doc/README?rev=35532=35531=35532=diff
==
--- branches/S3_0/doc/README(original)
+++ branches/S3_0/doc/READMESat May 13 12:02:40 2017
@@ -521,24 +521,29 @@
 Mailing lists:
 ==
 
-We maintain 4 mailing lists. (At the time of writing, the mailing list
-hosting for -announce and -commits is subject to change.)
-
-  freeciv-annou...@gna.org
+We maintain 4 mailing lists:
+
+  freeciv-annou...@freelists.org
Announcements of general interest.
This is a "Read Only" list, with infrequent messages.
In other words you can't mail this list, just read it.
+   Subscribe: https://www.freelists.org/list/freeciv-announce
   freeciv-i...@freelists.org
Freeciv translation.
All discussions related to translating the Freeciv code,
documentation, and website, into other languages than
English.
+   Subscribe: https://www.freelists.org/list/freeciv-i18n
   freeciv-...@freelists.org
Freeciv development.
+   Subscribe: https://www.freelists.org/list/freeciv-dev
   freeciv-commits@gna.org
Notifications of changes to the code repository.
This is a "Read Only" list, carrying automated messages.
In other words you can't mail this list, just read it.
+   (At the time of writing, gna.org is expected to shut
+   down soon; we're not yet sure what arrangements we'll
+   have for a replacement commits mailing list.)
 
 All lists are open to the general public and everyone is welcome to join.
 Only maintainers may post to the -announce and -commits lists.


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35531 - in /trunk/server: savegame2.c savegame3.c

[0jacobnk . gna]

Author: jtn
Date: Sat May 13 12:02:18 2017
New Revision: 35531

URL: http://svn.gna.org/viewcvs/freeciv?rev=35531=rev
Log:
Bomb out after failing to load ruleset during savegame loading.

Since first parameter of sg_failure_ret() is an assert kind of pattern
to decide if any error handling is needed, having 'TRUE' there is
certainly an error. There is one such case, when loading of ruleset has
failed.

Patch by Marko Lindqvist.

See hrm bug #659503.

Modified:
trunk/server/savegame2.c
trunk/server/savegame3.c

Modified: trunk/server/savegame2.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame2.c?rev=35531=35530=35531=diff
==
--- trunk/server/savegame2.c(original)
+++ trunk/server/savegame2.cSat May 13 12:02:18 2017
@@ -1099,7 +1099,7 @@
   }
   if (!load_rulesets(NULL, FALSE, TRUE, FALSE)) {
 /* Failed to load correct ruleset */
-sg_failure_ret(TRUE, _("Failed to load ruleset"));
+sg_failure_ret(FALSE, _("Failed to load ruleset"));
   }
 }
 

Modified: trunk/server/savegame3.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame3.c?rev=35531=35530=35531=diff
==
--- trunk/server/savegame3.c(original)
+++ trunk/server/savegame3.cSat May 13 12:02:18 2017
@@ -1318,7 +1318,7 @@
 }
 if (!load_rulesets(NULL, FALSE, TRUE, FALSE)) {
   /* Failed to load correct ruleset */
-  sg_failure_ret(TRUE, "Failed to load ruleset");
+  sg_failure_ret(FALSE, "Failed to load ruleset");
 }
   }
 


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35530 - /trunk/doc/README

[0jacobnk . gna]

Author: jtn
Date: Sat May 13 12:02:14 2017
New Revision: 35530

URL: http://svn.gna.org/viewcvs/freeciv?rev=35530=rev
Log:
Update README for freeciv-announce move.

See hrm feature #637953.

Modified:
trunk/doc/README

Modified: trunk/doc/README
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README?rev=35530=35529=35530=diff
==
--- trunk/doc/README(original)
+++ trunk/doc/READMESat May 13 12:02:14 2017
@@ -516,24 +516,29 @@
 Mailing lists:
 ==
 
-We maintain 4 mailing lists. (At the time of writing, the mailing list
-hosting for -announce and -commits is subject to change.)
-
-  freeciv-annou...@gna.org
+We maintain 4 mailing lists:
+
+  freeciv-annou...@freelists.org
Announcements of general interest.
This is a "Read Only" list, with infrequent messages.
In other words you can't mail this list, just read it.
+   Subscribe: https://www.freelists.org/list/freeciv-announce
   freeciv-i...@freelists.org
Freeciv translation.
All discussions related to translating the Freeciv code,
documentation, and website, into other languages than
English.
+   Subscribe: https://www.freelists.org/list/freeciv-i18n
   freeciv-...@freelists.org
Freeciv development.
+   Subscribe: https://www.freelists.org/list/freeciv-dev
   freeciv-commits@gna.org
Notifications of changes to the code repository.
This is a "Read Only" list, carrying automated messages.
In other words you can't mail this list, just read it.
+   (At the time of writing, gna.org is expected to shut
+   down soon; we're not yet sure what arrangements we'll
+   have for a replacement commits mailing list.)
 
 All lists are open to the general public and everyone is welcome to join.
 Only maintainers may post to the -announce and -commits lists.


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits