[freecol] 70/125: Imported Debian patch 0.10.7+dfsg-3
Markus Koschany
apo-guest at moszumanska.debian.org
Sun Dec 20 19:39:25 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository freecol.
commit 03359d3dd00a9621438c8603798bdcf08bd87ded
Merge: 1ab0bc4 20bf331
Author: Vincent Fourmond <fourmond at debian.org>
Date: Mon Dec 1 21:30:25 2014 +0100
Imported Debian patch 0.10.7+dfsg-3
build.xml | 43 +-
data/maps/Africa.fsg | Bin 103480 -> 103463 bytes
data/maps/America_large.fsg | Bin 152651 -> 141913 bytes
data/maps/Australia.fsg | Bin 68792 -> 68345 bytes
data/maps/Caribbean_basin.fsg | Bin 50981 -> 50982 bytes
data/rules/classic/resources.properties | 313 +-
.../images/forest/{ => boreal}/boreal.png | Bin
.../resources/images/forest/boreal/boreal0001.png | Bin 0 -> 15863 bytes
.../resources/images/forest/boreal/boreal0010.png | Bin 0 -> 15917 bytes
.../resources/images/forest/boreal/boreal0011.png | Bin 0 -> 15985 bytes
.../resources/images/forest/boreal/boreal0100.png | Bin 0 -> 15858 bytes
.../resources/images/forest/boreal/boreal0101.png | Bin 0 -> 15932 bytes
.../resources/images/forest/boreal/boreal0110.png | Bin 0 -> 15862 bytes
.../resources/images/forest/boreal/boreal0111.png | Bin 0 -> 15926 bytes
.../resources/images/forest/boreal/boreal1000.png | Bin 0 -> 15883 bytes
.../resources/images/forest/boreal/boreal1001.png | Bin 0 -> 15907 bytes
.../resources/images/forest/boreal/boreal1010.png | Bin 0 -> 15989 bytes
.../resources/images/forest/boreal/boreal1011.png | Bin 0 -> 15986 bytes
.../resources/images/forest/boreal/boreal1100.png | Bin 0 -> 15927 bytes
.../resources/images/forest/boreal/boreal1101.png | Bin 0 -> 15943 bytes
.../resources/images/forest/boreal/boreal1110.png | Bin 0 -> 15925 bytes
.../resources/images/forest/boreal/boreal1111.png | Bin 0 -> 15928 bytes
.../images/forest/{ => broadleaf}/broadleaf.png | Bin
.../images/forest/broadleaf/broadleaf0001.png | Bin 0 -> 18094 bytes
.../images/forest/broadleaf/broadleaf0010.png | Bin 0 -> 17975 bytes
.../images/forest/broadleaf/broadleaf0011.png | Bin 0 -> 18161 bytes
.../images/forest/broadleaf/broadleaf0100.png | Bin 0 -> 18017 bytes
.../images/forest/broadleaf/broadleaf0101.png | Bin 0 -> 18196 bytes
.../images/forest/broadleaf/broadleaf0110.png | Bin 0 -> 18052 bytes
.../images/forest/broadleaf/broadleaf0111.png | Bin 0 -> 18227 bytes
.../images/forest/broadleaf/broadleaf1000.png | Bin 0 -> 17920 bytes
.../images/forest/broadleaf/broadleaf1001.png | Bin 0 -> 18162 bytes
.../images/forest/broadleaf/broadleaf1010.png | Bin 0 -> 17983 bytes
.../images/forest/broadleaf/broadleaf1011.png | Bin 0 -> 18205 bytes
.../images/forest/broadleaf/broadleaf1100.png | Bin 0 -> 18023 bytes
.../images/forest/broadleaf/broadleaf1101.png | Bin 0 -> 18236 bytes
.../images/forest/broadleaf/broadleaf1110.png | Bin 0 -> 18044 bytes
.../images/forest/broadleaf/broadleaf1111.png | Bin 0 -> 18248 bytes
.../images/forest/{ => conifer}/conifer.png | Bin
.../images/forest/conifer/conifer0001.png | Bin 0 -> 15855 bytes
.../images/forest/conifer/conifer0010.png | Bin 0 -> 15880 bytes
.../images/forest/conifer/conifer0011.png | Bin 0 -> 16080 bytes
.../images/forest/conifer/conifer0100.png | Bin 0 -> 15716 bytes
.../images/forest/conifer/conifer0101.png | Bin 0 -> 15921 bytes
.../images/forest/conifer/conifer0110.png | Bin 0 -> 15916 bytes
.../images/forest/conifer/conifer0111.png | Bin 0 -> 16111 bytes
.../images/forest/conifer/conifer1000.png | Bin 0 -> 15937 bytes
.../images/forest/conifer/conifer1001.png | Bin 0 -> 16025 bytes
.../images/forest/conifer/conifer1010.png | Bin 0 -> 16141 bytes
.../images/forest/conifer/conifer1011.png | Bin 0 -> 16223 bytes
.../images/forest/conifer/conifer1100.png | Bin 0 -> 16013 bytes
.../images/forest/conifer/conifer1101.png | Bin 0 -> 16084 bytes
.../images/forest/conifer/conifer1110.png | Bin 0 -> 16173 bytes
.../images/forest/conifer/conifer1111.png | Bin 0 -> 16241 bytes
.../resources/images/forest/{ => mixed}/mixed.png | Bin
.../resources/images/forest/mixed/mixed0001.png | Bin 0 -> 17864 bytes
.../resources/images/forest/mixed/mixed0010.png | Bin 0 -> 17317 bytes
.../resources/images/forest/mixed/mixed0011.png | Bin 0 -> 18017 bytes
.../resources/images/forest/mixed/mixed0100.png | Bin 0 -> 17201 bytes
.../resources/images/forest/mixed/mixed0101.png | Bin 0 -> 17920 bytes
.../resources/images/forest/mixed/mixed0110.png | Bin 0 -> 17314 bytes
.../resources/images/forest/mixed/mixed0111.png | Bin 0 -> 18019 bytes
.../resources/images/forest/mixed/mixed1000.png | Bin 0 -> 17421 bytes
.../resources/images/forest/mixed/mixed1001.png | Bin 0 -> 18005 bytes
.../resources/images/forest/mixed/mixed1010.png | Bin 0 -> 17526 bytes
.../resources/images/forest/mixed/mixed1011.png | Bin 0 -> 18108 bytes
.../resources/images/forest/mixed/mixed1100.png | Bin 0 -> 17471 bytes
.../resources/images/forest/mixed/mixed1101.png | Bin 0 -> 18055 bytes
.../resources/images/forest/mixed/mixed1110.png | Bin 0 -> 17517 bytes
.../resources/images/forest/mixed/mixed1111.png | Bin 0 -> 18100 bytes
.../resources/images/forest/{ => rain}/rain.png | Bin
.../resources/images/forest/rain/rain0001.png | Bin 0 -> 19965 bytes
.../resources/images/forest/rain/rain0010.png | Bin 0 -> 19669 bytes
.../resources/images/forest/rain/rain0011.png | Bin 0 -> 20031 bytes
.../resources/images/forest/rain/rain0100.png | Bin 0 -> 19792 bytes
.../resources/images/forest/rain/rain0101.png | Bin 0 -> 20145 bytes
.../resources/images/forest/rain/rain0110.png | Bin 0 -> 19824 bytes
.../resources/images/forest/rain/rain0111.png | Bin 0 -> 20186 bytes
.../resources/images/forest/rain/rain1000.png | Bin 0 -> 20042 bytes
.../resources/images/forest/rain/rain1001.png | Bin 0 -> 20260 bytes
.../resources/images/forest/rain/rain1010.png | Bin 0 -> 20109 bytes
.../resources/images/forest/rain/rain1011.png | Bin 0 -> 20329 bytes
.../resources/images/forest/rain/rain1100.png | Bin 0 -> 20223 bytes
.../resources/images/forest/rain/rain1101.png | Bin 0 -> 20465 bytes
.../resources/images/forest/rain/rain1110.png | Bin 0 -> 20267 bytes
.../resources/images/forest/rain/rain1111.png | Bin 0 -> 20507 bytes
.../resources/images/forest/{ => scrub}/scrub.png | Bin
.../resources/images/forest/scrub/scrub0001.png | Bin 0 -> 2544 bytes
.../resources/images/forest/scrub/scrub0010.png | Bin 0 -> 2686 bytes
.../resources/images/forest/scrub/scrub0011.png | Bin 0 -> 2407 bytes
.../resources/images/forest/scrub/scrub0100.png | Bin 0 -> 2667 bytes
.../resources/images/forest/scrub/scrub0101.png | Bin 0 -> 2383 bytes
.../resources/images/forest/scrub/scrub0110.png | Bin 0 -> 2529 bytes
.../resources/images/forest/scrub/scrub0111.png | Bin 0 -> 2244 bytes
.../resources/images/forest/scrub/scrub1000.png | Bin 0 -> 2531 bytes
.../resources/images/forest/scrub/scrub1001.png | Bin 0 -> 2234 bytes
.../resources/images/forest/scrub/scrub1010.png | Bin 0 -> 2366 bytes
.../resources/images/forest/scrub/scrub1011.png | Bin 0 -> 2070 bytes
.../resources/images/forest/scrub/scrub1100.png | Bin 0 -> 2370 bytes
.../resources/images/forest/scrub/scrub1101.png | Bin 0 -> 2071 bytes
.../resources/images/forest/scrub/scrub1110.png | Bin 0 -> 2207 bytes
.../resources/images/forest/scrub/scrub1111.png | Bin 0 -> 1906 bytes
.../images/forest/{ => tropical}/tropical.png | Bin
.../images/forest/tropical/tropical0001.png | Bin 0 -> 18018 bytes
.../images/forest/tropical/tropical0010.png | Bin 0 -> 17769 bytes
.../images/forest/tropical/tropical0011.png | Bin 0 -> 18073 bytes
.../images/forest/tropical/tropical0100.png | Bin 0 -> 17714 bytes
.../images/forest/tropical/tropical0101.png | Bin 0 -> 18017 bytes
.../images/forest/tropical/tropical0110.png | Bin 0 -> 17776 bytes
.../images/forest/tropical/tropical0111.png | Bin 0 -> 18078 bytes
.../images/forest/tropical/tropical1000.png | Bin 0 -> 17935 bytes
.../images/forest/tropical/tropical1001.png | Bin 0 -> 18394 bytes
.../images/forest/tropical/tropical1010.png | Bin 0 -> 17993 bytes
.../images/forest/tropical/tropical1011.png | Bin 0 -> 18447 bytes
.../images/forest/tropical/tropical1100.png | Bin 0 -> 17946 bytes
.../images/forest/tropical/tropical1101.png | Bin 0 -> 18395 bytes
.../images/forest/tropical/tropical1110.png | Bin 0 -> 18003 bytes
.../images/forest/tropical/tropical1111.png | Bin 0 -> 18449 bytes
.../images/forest/{ => wetland}/wetland.png | Bin
.../images/forest/wetland/wetland0001.png | Bin 0 -> 14111 bytes
.../images/forest/wetland/wetland0010.png | Bin 0 -> 13775 bytes
.../images/forest/wetland/wetland0011.png | Bin 0 -> 14186 bytes
.../images/forest/wetland/wetland0100.png | Bin 0 -> 13842 bytes
.../images/forest/wetland/wetland0101.png | Bin 0 -> 14275 bytes
.../images/forest/wetland/wetland0110.png | Bin 0 -> 13949 bytes
.../images/forest/wetland/wetland0111.png | Bin 0 -> 14350 bytes
.../images/forest/wetland/wetland1000.png | Bin 0 -> 13868 bytes
.../images/forest/wetland/wetland1001.png | Bin 0 -> 14164 bytes
.../images/forest/wetland/wetland1010.png | Bin 0 -> 13947 bytes
.../images/forest/wetland/wetland1011.png | Bin 0 -> 14212 bytes
.../images/forest/wetland/wetland1100.png | Bin 0 -> 14025 bytes
.../images/forest/wetland/wetland1101.png | Bin 0 -> 14286 bytes
.../images/forest/wetland/wetland1110.png | Bin 0 -> 14101 bytes
.../images/forest/wetland/wetland1111.png | Bin 0 -> 14343 bytes
data/rules/classic/resources/images/misc/coin.png | Bin 0 -> 1960 bytes
.../classic/resources/images/river/river0001.png | Bin 0 -> 9230 bytes
.../classic/resources/images/river/river0002.png | Bin 0 -> 9222 bytes
.../classic/resources/images/river/river0010.png | Bin 0 -> 9265 bytes
.../classic/resources/images/river/river0011.png | Bin 0 -> 9330 bytes
.../classic/resources/images/river/river0012.png | Bin 0 -> 9363 bytes
.../classic/resources/images/river/river0020.png | Bin 0 -> 9291 bytes
.../classic/resources/images/river/river0021.png | Bin 0 -> 9374 bytes
.../classic/resources/images/river/river0022.png | Bin 0 -> 9363 bytes
.../classic/resources/images/river/river0100.png | Bin 0 -> 9128 bytes
.../classic/resources/images/river/river0101.png | Bin 0 -> 9315 bytes
.../classic/resources/images/river/river0102.png | Bin 0 -> 9414 bytes
.../classic/resources/images/river/river0110.png | Bin 0 -> 9316 bytes
.../classic/resources/images/river/river0111.png | Bin 0 -> 9471 bytes
.../classic/resources/images/river/river0112.png | Bin 0 -> 9555 bytes
.../classic/resources/images/river/river0120.png | Bin 0 -> 9314 bytes
.../classic/resources/images/river/river0121.png | Bin 0 -> 9479 bytes
.../classic/resources/images/river/river0122.png | Bin 0 -> 9491 bytes
.../classic/resources/images/river/river0200.png | Bin 0 -> 9148 bytes
.../classic/resources/images/river/river0201.png | Bin 0 -> 9401 bytes
.../classic/resources/images/river/river0202.png | Bin 0 -> 9320 bytes
.../classic/resources/images/river/river0210.png | Bin 0 -> 9329 bytes
.../classic/resources/images/river/river0211.png | Bin 0 -> 9528 bytes
.../classic/resources/images/river/river0212.png | Bin 0 -> 9531 bytes
.../classic/resources/images/river/river0220.png | Bin 0 -> 9311 bytes
.../classic/resources/images/river/river0221.png | Bin 0 -> 9483 bytes
.../classic/resources/images/river/river0222.png | Bin 0 -> 9448 bytes
.../classic/resources/images/river/river1000.png | Bin 0 -> 9187 bytes
.../classic/resources/images/river/river1001.png | Bin 0 -> 9318 bytes
.../classic/resources/images/river/river1002.png | Bin 0 -> 9312 bytes
.../classic/resources/images/river/river1010.png | Bin 0 -> 9413 bytes
.../classic/resources/images/river/river1011.png | Bin 0 -> 9526 bytes
.../classic/resources/images/river/river1012.png | Bin 0 -> 9528 bytes
.../classic/resources/images/river/river1020.png | Bin 0 -> 9477 bytes
.../classic/resources/images/river/river1021.png | Bin 0 -> 9577 bytes
.../classic/resources/images/river/river1022.png | Bin 0 -> 9551 bytes
.../classic/resources/images/river/river1100.png | Bin 0 -> 9244 bytes
.../classic/resources/images/river/river1101.png | Bin 0 -> 9412 bytes
.../classic/resources/images/river/river1102.png | Bin 0 -> 9464 bytes
.../classic/resources/images/river/river1110.png | Bin 0 -> 9483 bytes
.../classic/resources/images/river/river1111.png | Bin 0 -> 9627 bytes
.../classic/resources/images/river/river1112.png | Bin 0 -> 9587 bytes
.../classic/resources/images/river/river1120.png | Bin 0 -> 9501 bytes
.../classic/resources/images/river/river1121.png | Bin 0 -> 9657 bytes
.../classic/resources/images/river/river1122.png | Bin 0 -> 9612 bytes
.../classic/resources/images/river/river1200.png | Bin 0 -> 9301 bytes
.../classic/resources/images/river/river1201.png | Bin 0 -> 9453 bytes
.../classic/resources/images/river/river1202.png | Bin 0 -> 9455 bytes
.../classic/resources/images/river/river1210.png | Bin 0 -> 9480 bytes
.../classic/resources/images/river/river1211.png | Bin 0 -> 9640 bytes
.../classic/resources/images/river/river1212.png | Bin 0 -> 9656 bytes
.../classic/resources/images/river/river1220.png | Bin 0 -> 9468 bytes
.../classic/resources/images/river/river1221.png | Bin 0 -> 9641 bytes
.../classic/resources/images/river/river1222.png | Bin 0 -> 9627 bytes
.../classic/resources/images/river/river2000.png | Bin 0 -> 9213 bytes
.../classic/resources/images/river/river2001.png | Bin 0 -> 9319 bytes
.../classic/resources/images/river/river2002.png | Bin 0 -> 9323 bytes
.../classic/resources/images/river/river2010.png | Bin 0 -> 9501 bytes
.../classic/resources/images/river/river2011.png | Bin 0 -> 9572 bytes
.../classic/resources/images/river/river2012.png | Bin 0 -> 9584 bytes
.../classic/resources/images/river/river2020.png | Bin 0 -> 9348 bytes
.../classic/resources/images/river/river2021.png | Bin 0 -> 9525 bytes
.../classic/resources/images/river/river2022.png | Bin 0 -> 9521 bytes
.../classic/resources/images/river/river2100.png | Bin 0 -> 9284 bytes
.../classic/resources/images/river/river2101.png | Bin 0 -> 9456 bytes
.../classic/resources/images/river/river2102.png | Bin 0 -> 9460 bytes
.../classic/resources/images/river/river2110.png | Bin 0 -> 9538 bytes
.../classic/resources/images/river/river2111.png | Bin 0 -> 9574 bytes
.../classic/resources/images/river/river2112.png | Bin 0 -> 9593 bytes
.../classic/resources/images/river/river2120.png | Bin 0 -> 9461 bytes
.../classic/resources/images/river/river2121.png | Bin 0 -> 9626 bytes
.../classic/resources/images/river/river2122.png | Bin 0 -> 9590 bytes
.../classic/resources/images/river/river2200.png | Bin 0 -> 9372 bytes
.../classic/resources/images/river/river2201.png | Bin 0 -> 9470 bytes
.../classic/resources/images/river/river2202.png | Bin 0 -> 9427 bytes
.../classic/resources/images/river/river2210.png | Bin 0 -> 9530 bytes
.../classic/resources/images/river/river2211.png | Bin 0 -> 9627 bytes
.../classic/resources/images/river/river2212.png | Bin 0 -> 9663 bytes
.../classic/resources/images/river/river2220.png | Bin 0 -> 9424 bytes
.../classic/resources/images/river/river2221.png | Bin 0 -> 9653 bytes
.../classic/resources/images/river/river2222.png | Bin 0 -> 9626 bytes
.../images/terrain/hills/border_E_even.png | Bin 7932 -> 0 bytes
.../images/terrain/hills/border_E_odd.png | Bin 7932 -> 0 bytes
.../images/terrain/hills/border_NE_even.png | Bin 2040 -> 0 bytes
.../images/terrain/hills/border_NE_odd.png | Bin 1799 -> 0 bytes
.../images/terrain/hills/border_NW_even.png | Bin 1799 -> 0 bytes
.../images/terrain/hills/border_NW_odd.png | Bin 2040 -> 0 bytes
.../images/terrain/hills/border_N_even.png | Bin 7932 -> 0 bytes
.../images/terrain/hills/border_N_odd.png | Bin 7932 -> 0 bytes
.../images/terrain/hills/border_SE_even.png | Bin 1556 -> 0 bytes
.../images/terrain/hills/border_SE_odd.png | Bin 1492 -> 0 bytes
.../images/terrain/hills/border_SW_even.png | Bin 1492 -> 0 bytes
.../images/terrain/hills/border_SW_odd.png | Bin 1554 -> 0 bytes
.../images/terrain/hills/border_S_even.png | Bin 7932 -> 0 bytes
.../images/terrain/hills/border_S_odd.png | Bin 7932 -> 0 bytes
.../images/terrain/hills/border_W_even.png | Bin 7932 -> 0 bytes
.../images/terrain/hills/border_W_odd.png | Bin 7932 -> 0 bytes
.../resources/images/terrain/hills/hill1a.png | Bin 4399 -> 0 bytes
.../images/terrain/mountains/border_E_even.png | Bin 7932 -> 0 bytes
.../images/terrain/mountains/border_E_odd.png | Bin 7932 -> 0 bytes
.../images/terrain/mountains/border_NE_even.png | Bin 7932 -> 0 bytes
.../images/terrain/mountains/border_NE_odd.png | Bin 7932 -> 0 bytes
.../images/terrain/mountains/border_NW_even.png | Bin 13034 -> 0 bytes
.../images/terrain/mountains/border_NW_odd.png | Bin 12779 -> 0 bytes
.../images/terrain/mountains/border_N_even.png | Bin 7330 -> 0 bytes
.../images/terrain/mountains/border_N_odd.png | Bin 5361 -> 0 bytes
.../images/terrain/mountains/border_SE_even.png | Bin 12241 -> 0 bytes
.../images/terrain/mountains/border_SE_odd.png | Bin 11767 -> 0 bytes
.../images/terrain/mountains/border_SW_even.png | Bin 7932 -> 0 bytes
.../images/terrain/mountains/border_SW_odd.png | Bin 7932 -> 0 bytes
.../images/terrain/mountains/border_S_even.png | Bin 8757 -> 0 bytes
.../images/terrain/mountains/border_S_odd.png | Bin 7825 -> 0 bytes
.../images/terrain/mountains/border_W_even.png | Bin 7932 -> 0 bytes
.../images/terrain/mountains/border_W_odd.png | Bin 7932 -> 0 bytes
.../images/terrain/unexplored/border_E_even.png | Bin 1304 -> 754 bytes
.../images/terrain/unexplored/border_E_odd.png | Bin 1300 -> 754 bytes
.../images/terrain/unexplored/border_NE_even.png | Bin 1511 -> 800 bytes
.../images/terrain/unexplored/border_NE_odd.png | Bin 1492 -> 800 bytes
.../images/terrain/unexplored/border_NW_even.png | Bin 1537 -> 824 bytes
.../images/terrain/unexplored/border_NW_odd.png | Bin 1508 -> 824 bytes
.../images/terrain/unexplored/border_N_even.png | Bin 1321 -> 1027 bytes
.../images/terrain/unexplored/border_N_odd.png | Bin 1333 -> 1027 bytes
.../images/terrain/unexplored/border_SE_even.png | Bin 1524 -> 830 bytes
.../images/terrain/unexplored/border_SE_odd.png | Bin 1507 -> 830 bytes
.../images/terrain/unexplored/border_SW_even.png | Bin 1509 -> 817 bytes
.../images/terrain/unexplored/border_SW_odd.png | Bin 1527 -> 817 bytes
.../images/terrain/unexplored/border_S_even.png | Bin 1337 -> 966 bytes
.../images/terrain/unexplored/border_S_odd.png | Bin 1338 -> 966 bytes
.../images/terrain/unexplored/border_W_even.png | Bin 1304 -> 725 bytes
.../images/terrain/unexplored/border_W_odd.png | Bin 1304 -> 725 bytes
.../classic/resources/images/ui/minimap-skin.png | Bin 68789 -> 104068 bytes
data/rules/classic/specification.xml | 1501 ++++++---
data/rules/freecol/specification.xml | 21 +-
data/strings/FreeColMessages.properties | 2063 +++++++++---
data/strings/FreeColMessages_af.properties | 56 +-
data/strings/FreeColMessages_ang.properties | 100 +-
data/strings/FreeColMessages_ar.properties | 206 +-
data/strings/FreeColMessages_arz.properties | 82 +-
data/strings/FreeColMessages_be-tarask.properties | 87 +-
data/strings/FreeColMessages_br.properties | 472 ++-
data/strings/FreeColMessages_bs.properties | 62 +-
data/strings/FreeColMessages_ca.properties | 149 +-
data/strings/FreeColMessages_cs_CZ.properties | 844 +++--
data/strings/FreeColMessages_da.properties | 636 ++--
data/strings/FreeColMessages_de.properties | 397 ++-
data/strings/FreeColMessages_el.properties | 342 +-
data/strings/FreeColMessages_eo.properties | 676 ++--
data/strings/FreeColMessages_es_ES.properties | 796 ++++-
data/strings/FreeColMessages_fi.properties | 59 +-
data/strings/FreeColMessages_fr.properties | 412 ++-
data/strings/FreeColMessages_gl.properties | 576 ++--
data/strings/FreeColMessages_he.properties | 52 +-
data/strings/FreeColMessages_hsb.properties | 279 +-
data/strings/FreeColMessages_hu.properties | 120 +-
data/strings/FreeColMessages_ia.properties | 374 ++-
data/strings/FreeColMessages_it_IT.properties | 717 +++--
data/strings/FreeColMessages_ja.properties | 377 ++-
data/strings/FreeColMessages_ko.properties | 1192 +++++++
data/strings/FreeColMessages_lt.properties | 84 +-
data/strings/FreeColMessages_mk.properties | 1082 +++++--
data/strings/FreeColMessages_ms.properties | 2475 +++++++++++++++
data/strings/FreeColMessages_nb_NO.properties | 31 +-
data/strings/FreeColMessages_nds.properties | 23 +-
data/strings/FreeColMessages_nl.properties | 510 ++-
data/strings/FreeColMessages_nl_BE.properties | 55 +-
data/strings/FreeColMessages_nn.properties | 35 +-
data/strings/FreeColMessages_oc.properties | 54 +-
data/strings/FreeColMessages_pl_PL.properties | 726 ++++-
data/strings/FreeColMessages_pms.properties | 24 +-
data/strings/FreeColMessages_pt_BR.properties | 94 +-
data/strings/FreeColMessages_pt_PT.properties | 337 +-
data/strings/FreeColMessages_qqq.properties | 24 +-
data/strings/FreeColMessages_ru.properties | 745 +++--
data/strings/FreeColMessages_sq.properties | 26 +-
data/strings/FreeColMessages_sv_SE.properties | 289 +-
data/strings/FreeColMessages_tl.properties | 900 ++++--
data/strings/FreeColMessages_uk.properties | 982 ++++--
data/strings/FreeColMessages_zh_CN.properties | 569 ++--
debian/README.source | 9 -
debian/changelog | 61 +-
debian/compat | 2 +-
debian/control | 36 +-
debian/copyright | 76 +-
debian/freecol.desktop | 2 +
debian/freecol.doc-base | 12 +
debian/freecol.install | 5 +-
debian/patches/disable-listener.diff | 43 -
debian/patches/series | 1 -
debian/rules | 3 +-
doc/FreeCol.aux | 910 +++---
doc/FreeCol.idx | 787 ++---
doc/FreeCol.ilg | 10 +-
doc/FreeCol.ind | 788 ++---
doc/FreeCol.log | 205 +-
doc/FreeCol.pdf | Bin 3785688 -> 3813453 bytes
doc/FreeCol.tex | 239 +-
doc/FreeCol.toc | 111 +-
freecol | 83 +-
freecol.cmd | 1 +
packaging/common/freecol | 3 -
packaging/common/freecol.cmd | 1 +
packaging/common/freecol.sh | 82 +
schema/data/data-exportData.xsd | 2 +-
schema/data/data-lostCityRumour.xsd | 1 +
schema/data/data-modifier.xsd | 2 +
schema/data/data-monarch.xsd | 33 +-
schema/data/data-player.xsd | 3 +
schema/data/data-region.xsd | 143 +-
schema/data/data-specification.xsd | 138 +-
schema/data/data-tile.xsd | 1 +
schema/data/data-tileimprovement.xsd | 2 +-
schema/specification-schema.xsd | 247 +-
src/MANIFEST.MF | 11 +-
src/net/sf/freecol/FreeCol.java | 444 +--
src/net/sf/freecol/client/ClientOptions.java | 24 +-
src/net/sf/freecol/client/FreeColClient.java | 195 +-
.../freecol/client/control/ConnectController.java | 713 ++---
.../freecol/client/control/InGameController.java | 938 +++---
.../freecol/client/control/InGameInputHandler.java | 441 +--
.../sf/freecol/client/control/InputHandler.java | 83 +-
.../client/control/MapEditorController.java | 41 +-
.../freecol/client/control/PreGameController.java | 173 +-
.../client/control/PreGameInputHandler.java | 488 ++-
.../freecol/client/gui/AbstractCanvasListener.java | 99 +
src/net/sf/freecol/client/gui/Canvas.java | 472 ++-
.../client/gui/CanvasMapEditorMouseListener.java | 255 +-
.../sf/freecol/client/gui/CanvasMouseListener.java | 37 +-
.../client/gui/CanvasMouseMotionListener.java | 272 +-
.../sf/freecol/client/gui/FrameMotionListener.java | 63 +
src/net/sf/freecol/client/gui/FreeColFrame.java | 47 +
src/net/sf/freecol/client/gui/FullScreenFrame.java | 27 +-
src/net/sf/freecol/client/gui/GUI.java | 317 +-
src/net/sf/freecol/client/gui/GrayLayer.java | 133 +
src/net/sf/freecol/client/gui/ImageLibrary.java | 725 +++--
src/net/sf/freecol/client/gui/MapViewer.java | 1258 ++++----
src/net/sf/freecol/client/gui/ScrollThread.java | 88 +
src/net/sf/freecol/client/gui/TerrainCursor.java | 13 +-
src/net/sf/freecol/client/gui/TilePopup.java | 579 +---
src/net/sf/freecol/client/gui/ViewMode.java | 110 -
src/net/sf/freecol/client/gui/WindowedFrame.java | 36 +-
.../freecol/client/gui/WindowedFrameListener.java | 60 +-
.../freecol/client/gui/action/ActionManager.java | 56 +-
.../client/gui/action/AssignTradeRouteAction.java | 10 +-
.../client/gui/action/BuildColonyAction.java | 7 +-
.../sf/freecol/client/gui/action/ChangeAction.java | 2 +-
.../sf/freecol/client/gui/action/ChatAction.java | 2 +-
.../client/gui/action/ClearOrdersAction.java | 7 +-
.../freecol/client/gui/action/ColopediaAction.java | 6 +-
.../freecol/client/gui/action/ContinueAction.java | 12 +-
.../sf/freecol/client/gui/action/DebugAction.java | 16 +-
.../gui/action/DeclareIndependenceAction.java | 7 +-
.../client/gui/action/DetermineHighSeasAction.java | 108 +-
.../client/gui/action/DisbandUnitAction.java | 7 +-
.../freecol/client/gui/action/EndTurnAction.java | 7 +-
.../client/gui/action/ExecuteGotoOrdersAction.java | 10 +-
.../freecol/client/gui/action/FortifyAction.java | 8 +-
.../freecol/client/gui/action/FreeColAction.java | 6 +-
.../sf/freecol/client/gui/action/GotoAction.java | 7 +-
.../client/gui/action/ImprovementAction.java | 10 +-
.../sf/freecol/client/gui/action/LoadAction.java | 21 +-
.../client/gui/action/MapControlsAction.java | 52 +-
.../client/gui/action/MiniMapZoomInAction.java | 10 +-
.../client/gui/action/MiniMapZoomOutAction.java | 10 +-
.../sf/freecol/client/gui/action/MoveAction.java | 27 +-
.../sf/freecol/client/gui/action/NewAction.java | 6 +-
.../client/gui/action/NewEmptyMapAction.java | 2 +-
.../sf/freecol/client/gui/action/OpenAction.java | 7 +-
.../freecol/client/gui/action/ReconnectAction.java | 8 +-
.../sf/freecol/client/gui/action/RenameAction.java | 8 +-
.../client/gui/action/ReportTurnAction.java | 7 +-
.../sf/freecol/client/gui/action/SaveAction.java | 7 +-
.../client/gui/action/SaveAndQuitAction.java | 7 +-
.../freecol/client/gui/action/ScaleMapAction.java | 106 +-
.../sf/freecol/client/gui/action/SentryAction.java | 8 +-
.../client/gui/action/ShowDifficultyAction.java | 2 +-
.../freecol/client/gui/action/ShowMainAction.java | 8 +-
.../freecol/client/gui/action/SkipUnitAction.java | 7 +-
.../client/gui/action/ToggleViewModeAction.java | 2 +-
.../client/gui/action/TradeRouteAction.java | 5 +-
.../sf/freecol/client/gui/action/UnloadAction.java | 24 +-
.../sf/freecol/client/gui/action/WaitAction.java | 7 +-
src/net/sf/freecol/client/gui/action/package.html | 3 +-
.../freecol/client/gui/animation/Animations.java | 37 +-
.../client/gui/animation/UnitAttackAnimation.java | 31 +-
.../client/gui/animation/UnitImageAnimation.java | 28 +-
.../client/gui/animation/UnitMoveAnimation.java | 13 +-
src/net/sf/freecol/client/gui/i18n/Messages.java | 301 +-
.../sf/freecol/client/gui/i18n/NumberRules.java | 14 +-
.../sf/freecol/client/gui/i18n/TurnSelector.java | 89 +
src/net/sf/freecol/client/gui/menu/DebugMenu.java | 506 +--
.../freecol/client/gui/menu/FreeColMenuTest.java | 5 +-
.../sf/freecol/client/gui/menu/InGameMenuBar.java | 10 +-
.../freecol/client/gui/menu/MapEditorMenuBar.java | 7 +-
.../client/gui/menu/MenuMouseMotionListener.java | 40 +
.../client/gui/option/AbstractUnitOptionUI.java | 2 +
.../client/gui/option/AudioMixerOptionUI.java | 7 +-
.../sf/freecol/client/gui/option/FileOptionUI.java | 12 +-
.../client/gui/option/LanguageOptionUI.java | 1 +
.../sf/freecol/client/gui/option/ListOptionUI.java | 63 +-
.../sf/freecol/client/gui/option/ModOptionUI.java | 1 +
.../freecol/client/gui/option/OptionGroupUI.java | 217 +-
src/net/sf/freecol/client/gui/option/OptionUI.java | 7 +-
.../freecol/client/gui/option/SelectOptionUI.java | 21 +-
.../freecol/client/gui/option/StringOptionUI.java | 1 +
.../client/gui/option/UnitTypeOptionUI.java | 1 +
.../sf/freecol/client/gui/panel/AboutPanel.java | 9 +-
.../client/gui/panel/AbstractGoodsLabel.java | 16 +-
.../client/gui/panel/AdvantageCellEditor.java | 1 +
.../freecol/client/gui/panel/BuildQueuePanel.java | 101 +-
.../client/gui/panel/BuildingDetailPanel.java | 27 +-
.../sf/freecol/client/gui/panel/BuildingPanel.java | 63 +-
.../freecol/client/gui/panel/BuildingToolTip.java | 77 +-
.../client/gui/panel/CaptureGoodsDialog.java | 10 +-
.../sf/freecol/client/gui/panel/CargoPanel.java | 46 +-
src/net/sf/freecol/client/gui/panel/ChatPanel.java | 66 +-
.../sf/freecol/client/gui/panel/ChoiceDialog.java | 7 +-
.../sf/freecol/client/gui/panel/ChoiceItem.java | 24 +-
.../gui/panel/ChooseFoundingFatherDialog.java | 17 +-
.../client/gui/panel/ClassicMapControls.java | 45 +-
.../client/gui/panel/ClientOptionsDialog.java | 20 +-
.../sf/freecol/client/gui/panel/ColonyPanel.java | 1473 +++++----
.../gui/panel/ColopediaGameObjectTypePanel.java | 3 +-
.../freecol/client/gui/panel/ColopediaPanel.java | 12 +-
.../freecol/client/gui/panel/ColorCellEditor.java | 172 -
.../client/gui/panel/CompactLabourReport.java | 22 +-
.../client/gui/panel/ConceptDetailPanel.java | 6 +-
.../client/gui/panel/ConfirmDeclarationDialog.java | 8 +-
.../client/gui/panel/ConstructionPanel.java | 30 +-
.../client/gui/panel/CornerMapControls.java | 105 +-
.../client/gui/panel/DeclarationDialog.java | 9 +-
.../client/gui/panel/DefaultTransferHandler.java | 414 +--
.../freecol/client/gui/panel/DifficultyDialog.java | 143 +-
.../sf/freecol/client/gui/panel/DragListener.java | 595 +---
.../net/sf/freecol/client/gui/panel/Draggable.java | 21 +-
.../sf/freecol/client/gui/panel/DropTarget.java | 57 +
.../freecol/client/gui/panel/DumpCargoDialog.java | 12 +-
.../freecol/client/gui/panel/EditOptionDialog.java | 45 +
.../client/gui/panel/EditSettlementDialog.java | 17 +-
.../sf/freecol/client/gui/panel/EndTurnDialog.java | 1 +
.../sf/freecol/client/gui/panel/ErrorPanel.java | 15 +-
.../sf/freecol/client/gui/panel/EuropePanel.java | 441 ++-
.../sf/freecol/client/gui/panel/EventPanel.java | 9 +-
src/net/sf/freecol/client/gui/panel/FileList.java | 2 +
.../client/gui/panel/FindSettlementDialog.java | 1 +
.../sf/freecol/client/gui/panel/FreeColDialog.java | 71 +-
.../sf/freecol/client/gui/panel/FreeColPanel.java | 81 +-
.../client/gui/panel/FreeColProgressBar.java | 25 +-
.../client/gui/panel/GameOptionsDialog.java | 27 +-
.../freecol/client/gui/panel/GoodsDetailPanel.java | 6 +-
.../sf/freecol/client/gui/panel/GoodsLabel.java | 12 +-
.../sf/freecol/client/gui/panel/InPortPanel.java | 65 +
.../client/gui/panel/IndianSettlementPanel.java | 100 +-
src/net/sf/freecol/client/gui/panel/InfoPanel.java | 107 +-
.../client/gui/panel/InformationDialog.java | 25 +-
.../sf/freecol/client/gui/panel/LabourData.java | 32 +-
.../client/gui/panel/LoadingSavegameDialog.java | 28 +-
src/net/sf/freecol/client/gui/panel/MainPanel.java | 16 +-
.../sf/freecol/client/gui/panel/MapControls.java | 110 +-
.../client/gui/panel/MapEditorTransformPanel.java | 48 +-
.../gui/panel/MapGeneratorOptionsDialog.java | 34 +-
.../sf/freecol/client/gui/panel/MarketLabel.java | 34 +-
src/net/sf/freecol/client/gui/panel/MiniMap.java | 124 +-
.../sf/freecol/client/gui/panel/MonarchPanel.java | 16 +-
.../freecol/client/gui/panel/NationCellEditor.java | 1 +
.../client/gui/panel/NationCellRenderer.java | 1 +
.../client/gui/panel/NationTypeDetailPanel.java | 4 +-
.../client/gui/panel/NegotiationDialog.java | 765 ++---
src/net/sf/freecol/client/gui/panel/NewPanel.java | 44 +-
.../sf/freecol/client/gui/panel/OptionsDialog.java | 30 +-
.../sf/freecol/client/gui/panel/Parameters.java | 20 +
.../freecol/client/gui/panel/ParametersDialog.java | 110 +
.../sf/freecol/client/gui/panel/PlayersTable.java | 22 +-
src/net/sf/freecol/client/gui/panel/PortPanel.java | 89 +
.../freecol/client/gui/panel/PreCombatDialog.java | 43 +-
.../freecol/client/gui/panel/ProductionLabel.java | 51 +-
.../{DragListener.java => QuickActionMenu.java} | 535 ++--
.../sf/freecol/client/gui/panel/RebelToolTip.java | 103 +-
.../sf/freecol/client/gui/panel/RecruitDialog.java | 4 +-
.../freecol/client/gui/panel/ReportCargoPanel.java | 153 +-
.../client/gui/panel/ReportColonyPanel.java | 90 +-
.../gui/panel/ReportContinentalCongressPanel.java | 10 +-
.../client/gui/panel/ReportEducationPanel.java | 11 +-
.../client/gui/panel/ReportForeignAffairPanel.java | 2 +-
.../client/gui/panel/ReportHighScoresPanel.java | 9 +-
.../client/gui/panel/ReportIndianPanel.java | 128 +-
.../client/gui/panel/ReportLabourDetailPanel.java | 93 +-
.../client/gui/panel/ReportLabourPanel.java | 59 +-
.../client/gui/panel/ReportMilitaryPanel.java | 153 +-
.../freecol/client/gui/panel/ReportNavalPanel.java | 140 +-
.../sf/freecol/client/gui/panel/ReportPanel.java | 8 +-
.../client/gui/panel/ReportProductionPanel.java | 6 +-
.../freecol/client/gui/panel/ReportTradePanel.java | 2 +-
.../freecol/client/gui/panel/ReportTurnPanel.java | 129 +-
.../freecol/client/gui/panel/ReportUnitPanel.java | 250 ++
.../client/gui/panel/ResourcesDetailPanel.java | 7 +-
.../freecol/client/gui/panel/RiverStylePanel.java | 44 +-
.../client/gui/panel/ScaleMapSizeDialog.java | 110 +
.../client/gui/panel/SelectAmountDialog.java | 1 +
.../client/gui/panel/SelectDestinationDialog.java | 143 +-
.../freecol/client/gui/panel/ServerListPanel.java | 21 +-
.../freecol/client/gui/panel/StartGamePanel.java | 13 +-
.../freecol/client/gui/panel/StatisticsPanel.java | 14 +-
.../sf/freecol/client/gui/panel/StatusPanel.java | 27 +-
src/net/sf/freecol/client/gui/panel/TilePanel.java | 23 +-
.../freecol/client/gui/panel/TradeRouteDialog.java | 86 +-
.../client/gui/panel/TradeRouteInputDialog.java | 186 +-
.../freecol/client/gui/panel/UnitDetailPanel.java | 20 +-
src/net/sf/freecol/client/gui/panel/UnitLabel.java | 163 +-
src/net/sf/freecol/client/gui/panel/UnitPanel.java | 125 +
.../sf/freecol/client/gui/panel/VictoryPanel.java | 2 +-
.../freecol/client/gui/panel/WarehouseDialog.java | 16 +-
.../client/gui/panel/WorkProductionPanel.java | 167 +-
...reeColListUI.java => FreeColFileChooserUI.java} | 41 +-
.../sf/freecol/client/gui/plaf/FreeColListUI.java | 1 +
.../client/gui/plaf/FreeColLookAndFeel.java | 15 +-
...FreeColListUI.java => FreeColOptionPaneUI.java} | 31 +-
.../freecol/client/gui/plaf/FreeColToolTipUI.java | 49 +-
.../client/gui/sound/OggVorbisDecoderFactory.java | 443 +++
.../sf/freecol/client/gui/sound/SoundPlayer.java | 233 +-
.../freecol/client/networking/UserServerAPI.java | 39 +
src/net/sf/freecol/client/networking/package.html | 1 -
src/net/sf/freecol/common/FreeColSeed.java | 48 +
src/net/sf/freecol/common/debug/DebugUtils.java | 1041 +++++++
.../sf/freecol/common/debug/FreeColDebugger.java | 282 ++
.../sf/freecol/common/io/FreeColDirectories.java | 279 ++
src/net/sf/freecol/common/io/FreeColModFile.java | 6 +-
.../sf/freecol/common/io/FreeColSavegameFile.java | 8 +-
src/net/sf/freecol/common/io/FreeColTcFile.java | 67 +-
src/net/sf/freecol/common/io/Mods.java | 82 +-
.../sf/freecol/common/logging/DefaultHandler.java | 44 +-
src/net/sf/freecol/common/model/Ability.java | 130 +-
src/net/sf/freecol/common/model/AbstractGoods.java | 115 +-
src/net/sf/freecol/common/model/AbstractUnit.java | 122 +-
src/net/sf/freecol/common/model/BuildQueue.java | 28 +-
src/net/sf/freecol/common/model/BuildableType.java | 283 +-
src/net/sf/freecol/common/model/Building.java | 633 ++--
src/net/sf/freecol/common/model/BuildingType.java | 316 +-
src/net/sf/freecol/common/model/Colony.java | 991 +++---
src/net/sf/freecol/common/model/ColonyTile.java | 532 ++--
.../sf/freecol/common/model/ColonyTradeItem.java | 19 +-
src/net/sf/freecol/common/model/ColonyWas.java | 5 +
.../sf/freecol/common/model/DiplomaticTrade.java | 49 +-
src/net/sf/freecol/common/model/Disaster.java | 215 ++
src/net/sf/freecol/common/model/Effect.java | 221 ++
src/net/sf/freecol/common/model/EquipmentType.java | 291 +-
src/net/sf/freecol/common/model/Europe.java | 80 +-
src/net/sf/freecol/common/model/EuropeWas.java | 27 +
.../freecol/common/model/EuropeanNationType.java | 198 +-
src/net/sf/freecol/common/model/Event.java | 6 +
src/net/sf/freecol/common/model/ExportData.java | 41 +-
src/net/sf/freecol/common/model/Feature.java | 378 ++-
.../sf/freecol/common/model/FeatureContainer.java | 669 ++--
.../sf/freecol/common/model/FoundingFather.java | 3 +-
.../sf/freecol/common/model/FreeColGameObject.java | 30 +-
.../common/model/FreeColGameObjectType.java | 288 +-
src/net/sf/freecol/common/model/FreeColObject.java | 711 ++++-
src/net/sf/freecol/common/model/Game.java | 177 +-
src/net/sf/freecol/common/model/GameOptions.java | 25 +
src/net/sf/freecol/common/model/GoldTradeItem.java | 6 +-
src/net/sf/freecol/common/model/Goods.java | 78 +-
.../sf/freecol/common/model/GoodsContainer.java | 62 +-
src/net/sf/freecol/common/model/GoodsLocation.java | 281 +-
.../sf/freecol/common/model/GoodsTradeItem.java | 13 +-
src/net/sf/freecol/common/model/GoodsType.java | 73 +-
src/net/sf/freecol/common/model/HighScore.java | 6 +-
src/net/sf/freecol/common/model/HighSeas.java | 7 +
src/net/sf/freecol/common/model/HistoryEvent.java | 2 +-
.../sf/freecol/common/model/IndianNationType.java | 199 +-
.../sf/freecol/common/model/IndianSettlement.java | 891 +++---
src/net/sf/freecol/common/model/LastSale.java | 2 +-
src/net/sf/freecol/common/model/Limit.java | 179 +-
src/net/sf/freecol/common/model/Locatable.java | 26 +-
src/net/sf/freecol/common/model/Location.java | 70 +-
.../sf/freecol/common/model/LostCityRumour.java | 9 +-
src/net/sf/freecol/common/model/Map.java | 2594 ++++++++-------
src/net/sf/freecol/common/model/Market.java | 49 +-
src/net/sf/freecol/common/model/MarketData.java | 16 +-
src/net/sf/freecol/common/model/ModelMessage.java | 19 +-
src/net/sf/freecol/common/model/Modifier.java | 230 +-
src/net/sf/freecol/common/model/Monarch.java | 488 ++-
src/net/sf/freecol/common/model/Nation.java | 2 +-
src/net/sf/freecol/common/model/NationOptions.java | 33 +-
src/net/sf/freecol/common/model/NationType.java | 221 +-
src/net/sf/freecol/common/model/Operand.java | 128 +-
src/net/sf/freecol/common/model/PathNode.java | 334 +-
src/net/sf/freecol/common/model/Player.java | 719 +++--
.../freecol/common/model/PlayerExploredTile.java | 123 +-
.../sf/freecol/common/model/ProductionCache.java | 32 +-
src/net/sf/freecol/common/model/ProductionMap.java | 14 +-
src/net/sf/freecol/common/model/Region.java | 301 +-
src/net/sf/freecol/common/model/Resource.java | 6 +-
src/net/sf/freecol/common/model/ResourceType.java | 6 +-
src/net/sf/freecol/common/model/Role.java | 287 ++
src/net/sf/freecol/common/model/Scope.java | 169 +-
src/net/sf/freecol/common/model/Settlement.java | 307 +-
.../sf/freecol/common/model/SettlementType.java | 17 +
.../sf/freecol/common/model/SimpleCombatModel.java | 40 +-
src/net/sf/freecol/common/model/Specification.java | 323 +-
.../sf/freecol/common/model/StanceTradeItem.java | 6 +-
.../sf/freecol/common/model/StringTemplate.java | 2 +-
src/net/sf/freecol/common/model/Tension.java | 4 +-
src/net/sf/freecol/common/model/Tile.java | 508 +--
.../sf/freecol/common/model/TileImprovement.java | 137 +-
.../freecol/common/model/TileImprovementStyle.java | 170 +
.../freecol/common/model/TileImprovementType.java | 46 +-
src/net/sf/freecol/common/model/TileItem.java | 12 +-
.../sf/freecol/common/model/TileItemContainer.java | 56 +-
src/net/sf/freecol/common/model/TileType.java | 79 +-
.../sf/freecol/common/model/TileTypeChange.java | 2 +-
src/net/sf/freecol/common/model/TradeItem.java | 12 +-
src/net/sf/freecol/common/model/TradeRoute.java | 100 +-
.../sf/freecol/common/model/TradeRouteStop.java | 23 +-
src/net/sf/freecol/common/model/Turn.java | 154 +-
src/net/sf/freecol/common/model/Unit.java | 1715 +++++-----
src/net/sf/freecol/common/model/UnitLocation.java | 301 +-
src/net/sf/freecol/common/model/UnitTradeItem.java | 12 +-
src/net/sf/freecol/common/model/UnitType.java | 745 ++---
.../sf/freecol/common/model/UnitTypeChange.java | 271 +-
src/net/sf/freecol/common/model/UnitWas.java | 143 +-
src/net/sf/freecol/common/model/WorkLocation.java | 298 +-
.../common/model/mission/AbstractMission.java | 5 +-
.../common/model/mission/ImprovementMission.java | 4 +-
.../common/model/pathfinding/BaseCostDecider.java | 154 +-
.../common/model/pathfinding/CostDecider.java | 34 +-
.../common/model/pathfinding/CostDeciders.java | 165 +-
.../common/model/pathfinding/GoalDeciders.java | 177 ++
.../common/networking/AbandonColonyMessage.java | 23 +-
.../freecol/common/networking/AskSkillMessage.java | 26 +-
.../common/networking/AssignTeacherMessage.java | 17 +-
.../common/networking/AssignTradeRouteMessage.java | 25 +-
.../freecol/common/networking/AttackMessage.java | 38 +-
.../common/networking/BuildColonyMessage.java | 27 +-
.../freecol/common/networking/BuyGoodsMessage.java | 26 +-
.../sf/freecol/common/networking/BuyMessage.java | 30 +-
.../common/networking/BuyPropositionMessage.java | 38 +-
.../networking/CashInTreasureTrainMessage.java | 13 +-
.../common/networking/ChangeStateMessage.java | 14 +-
.../ChangeWorkImprovementTypeMessage.java | 20 +-
.../common/networking/ChangeWorkTypeMessage.java | 15 +-
.../sf/freecol/common/networking/ChatMessage.java | 31 +-
.../networking/ChooseFoundingFatherMessage.java | 2 +-
.../common/networking/ClaimLandMessage.java | 83 +-
.../common/networking/ClearSpecialityMessage.java | 12 +-
.../{client => common}/networking/Client.java | 31 +-
.../common/networking/CloseTransactionMessage.java | 17 +-
.../sf/freecol/common/networking/Connection.java | 620 ++--
.../sf/freecol/common/networking/DOMMessage.java | 288 +-
.../networking/DeclareIndependenceMessage.java | 7 +-
.../common/networking/DeclineMoundsMessage.java | 29 +-
.../common/networking/DeliverGiftMessage.java | 33 +-
.../common/networking/DemandTributeMessage.java | 36 +-
.../common/networking/DiplomacyMessage.java | 26 +-
.../common/networking/DisbandUnitMessage.java | 12 +-
.../common/networking/DisembarkMessage.java | 15 +-
.../freecol/common/networking/EmbarkMessage.java | 48 +-
.../common/networking/EmigrateUnitMessage.java | 10 +-
.../common/networking/EquipUnitMessage.java | 16 +-
.../common/networking/GetNationSummaryMessage.java | 23 +-
.../common/networking/GetTransactionMessage.java | 20 +-
.../common/networking/GoodsForSaleMessage.java | 26 +-
.../freecol/common/networking/InciteMessage.java | 55 +-
.../common/networking/IndianDemandMessage.java | 60 +-
.../common/networking/JoinColonyMessage.java | 25 +-
.../common/networking/LearnSkillMessage.java | 30 +-
.../common/networking/LoadCargoMessage.java | 13 +-
.../sf/freecol/common/networking/LoginMessage.java | 194 ++
.../common/networking/LootCargoMessage.java | 18 +-
src/net/sf/freecol/common/networking/Message.java | 216 +-
.../freecol/common/networking/MessageHandler.java | 23 +-
.../common/networking/MissionaryMessage.java | 34 +-
.../common/networking/MonarchActionMessage.java | 21 +-
.../sf/freecol/common/networking/MoveMessage.java | 42 +-
.../freecol/common/networking/MoveToMessage.java | 24 +-
.../common/networking/NetworkReplyObject.java | 77 +-
.../common/networking/NewLandNameMessage.java | 41 +-
.../common/networking/NewRegionNameMessage.java | 15 +-
.../common/networking/PayArrearsMessage.java | 5 +-
.../common/networking/PayForBuildingMessage.java | 17 +-
.../common/networking/PutOutsideColonyMessage.java | 15 +-
.../freecol/common/networking/ReceivingThread.java | 436 ++-
.../freecol/common/networking/RenameMessage.java | 27 +-
.../networking/ScoutIndianSettlementMessage.java | 30 +-
.../common/networking/SellGoodsMessage.java | 30 +-
.../sf/freecol/common/networking/SellMessage.java | 31 +-
.../common/networking/SellPropositionMessage.java | 31 +-
.../sf/freecol/common/networking/ServerAPI.java | 564 ++--
.../common/networking/SetBuildQueueMessage.java | 19 +-
.../common/networking/SetDestinationMessage.java | 27 +-
.../common/networking/SetGoodsLevelsMessage.java | 23 +-
.../common/networking/SetTradeRoutesMessage.java | 28 +-
.../common/networking/SpySettlementMessage.java | 38 +-
.../networking/TrainUnitInEuropeMessage.java | 5 +-
.../common/networking/UnloadCargoMessage.java | 7 +-
.../networking/UpdateCurrentStopMessage.java | 12 +-
.../common/networking/UpdateTradeRouteMessage.java | 22 +-
.../sf/freecol/common/networking/WorkMessage.java | 36 +-
.../sf/freecol/common/option/AbstractOption.java | 196 +-
.../freecol/common/option/AbstractUnitOption.java | 10 +-
.../sf/freecol/common/option/IntegerOption.java | 33 +-
.../sf/freecol/common/option/LanguageOption.java | 4 +-
src/net/sf/freecol/common/option/ListOption.java | 8 +-
src/net/sf/freecol/common/option/OptionGroup.java | 46 +-
src/net/sf/freecol/common/option/SelectOption.java | 2 +-
src/net/sf/freecol/common/option/StringOption.java | 2 +-
.../sf/freecol/common/resources/AudioResource.java | 31 +-
.../sf/freecol/common/resources/ChipResource.java | 241 --
.../sf/freecol/common/resources/ImageResource.java | 65 +-
.../freecol/common/resources/ResourceFactory.java | 5 +-
.../freecol/common/resources/ResourceManager.java | 152 +-
.../freecol/common/resources/ResourceMapping.java | 36 +-
src/net/sf/freecol/common/util/RandomChoice.java | 2 +-
src/net/sf/freecol/common/util/Utils.java | 205 +-
src/net/sf/freecol/common/util/XMLStream.java | 21 +-
src/net/sf/freecol/metaserver/MetaRegister.java | 148 +-
src/net/sf/freecol/metaserver/MetaServer.java | 33 +-
src/net/sf/freecol/metaserver/NetworkHandler.java | 14 +-
src/net/sf/freecol/server/FreeColServer.java | 750 ++---
src/net/sf/freecol/server/ai/AIColony.java | 833 ++---
src/net/sf/freecol/server/ai/AIGoods.java | 502 +--
.../sf/freecol/server/ai/AIInGameInputHandler.java | 44 +-
src/net/sf/freecol/server/ai/AIMain.java | 361 +--
src/net/sf/freecol/server/ai/AIMessage.java | 138 +-
src/net/sf/freecol/server/ai/AIObject.java | 134 +-
src/net/sf/freecol/server/ai/AIPlayer.java | 449 +--
src/net/sf/freecol/server/ai/AIUnit.java | 750 +++--
src/net/sf/freecol/server/ai/ColonyPlan.java | 253 +-
src/net/sf/freecol/server/ai/EuropeanAIPlayer.java | 3286 ++++++++++++--------
src/net/sf/freecol/server/ai/GoodsWish.java | 187 +-
src/net/sf/freecol/server/ai/NativeAIPlayer.java | 1100 ++++---
src/net/sf/freecol/server/ai/ProductionCache.java | 8 +-
src/net/sf/freecol/server/ai/REFAIPlayer.java | 224 +-
.../sf/freecol/server/ai/TileImprovementPlan.java | 256 +-
src/net/sf/freecol/server/ai/Transportable.java | 208 +-
src/net/sf/freecol/server/ai/ValuedAIObject.java | 74 +-
src/net/sf/freecol/server/ai/Wish.java | 161 +-
src/net/sf/freecol/server/ai/WorkLocationPlan.java | 127 +-
src/net/sf/freecol/server/ai/WorkerWish.java | 202 +-
.../freecol/server/ai/goal/GotoAdjacentGoal.java | 2 +-
.../server/ai/mission/BuildColonyMission.java | 610 ++--
.../ai/mission/CashInTreasureTrainMission.java | 451 ++-
.../server/ai/mission/DefendSettlementMission.java | 383 ++-
...nyMission.java => IdleAtSettlementMission.java} | 144 +-
.../server/ai/mission/IndianBringGiftMission.java | 373 ++-
.../server/ai/mission/IndianDemandMission.java | 457 ++-
src/net/sf/freecol/server/ai/mission/Mission.java | 1039 ++++---
.../server/ai/mission/MissionaryMission.java | 480 +++
.../server/ai/mission/PioneeringMission.java | 785 +++--
.../server/ai/mission/PrivateerMission.java | 638 ++--
.../freecol/server/ai/mission/ScoutingMission.java | 631 ++--
.../server/ai/mission/TransportMission.java | 2718 +++++++++-------
.../ai/mission/UnitSeekAndDestroyMission.java | 605 ++--
.../ai/mission/UnitWanderHostileMission.java | 207 +-
.../server/ai/mission/UnitWanderMission.java | 106 +-
.../server/ai/mission/WishRealizationMission.java | 246 +-
.../server/ai/mission/WorkInsideColonyMission.java | 152 +-
src/net/sf/freecol/server/control/ChangeSet.java | 455 ++-
src/net/sf/freecol/server/control/Controller.java | 6 +-
.../freecol/server/control/InGameController.java | 388 ++-
.../freecol/server/control/InGameInputHandler.java | 2 +-
.../sf/freecol/server/control/InputHandler.java | 43 +-
.../freecol/server/control/PreGameController.java | 65 +-
.../server/control/PreGameInputHandler.java | 218 +-
.../server/control/UserConnectionHandler.java | 350 +--
.../sf/freecol/server/generator/LandGenerator.java | 40 +-
.../sf/freecol/server/generator/MapGenerator.java | 22 +
.../generator/MapLayerGenerator.java} | 39 +-
.../generator/MapLoader.java} | 41 +-
src/net/sf/freecol/server/generator/River.java | 15 +-
.../sf/freecol/server/generator/RiverSection.java | 95 +-
.../server/generator/SimpleMapGenerator.java | 246 +-
.../freecol/server/generator/TerrainGenerator.java | 1753 ++++++-----
.../sf/freecol/server/model/ServerBuilding.java | 1 -
src/net/sf/freecol/server/model/ServerColony.java | 110 +-
.../sf/freecol/server/model/ServerColonyTile.java | 21 +-
src/net/sf/freecol/server/model/ServerEurope.java | 18 +-
src/net/sf/freecol/server/model/ServerGame.java | 64 +-
.../server/model/ServerIndianSettlement.java | 22 +-
src/net/sf/freecol/server/model/ServerPlayer.java | 1050 ++++---
src/net/sf/freecol/server/model/ServerRegion.java | 32 +-
src/net/sf/freecol/server/model/ServerUnit.java | 191 +-
src/net/sf/freecol/server/model/TradeSession.java | 10 +-
.../freecol/server/networking/DummyConnection.java | 10 +-
src/net/sf/freecol/server/networking/Server.java | 233 +-
.../sf/freecol/tools/ColonizationMapReader.java | 175 ++
test/data/specification.xml | 1 -
.../net/sf/freecol/client/ClientTestHelper.java | 19 +-
.../sf/freecol/client/gui/i18n/MessagesTest.java | 62 +-
.../net/sf/freecol/client/gui/sound/SoundTest.java | 78 +-
test/src/net/sf/freecol/common/AllTests.java | 21 +-
test/src/net/sf/freecol/common/io/ModTest.java | 22 +-
test/src/net/sf/freecol/common/model/AllTests.java | 2 +
.../freecol/common/model/BaseCostDeciderTest.java | 61 +-
.../net/sf/freecol/common/model/BuildingTest.java | 349 ++-
.../freecol/common/model/ColonyProductionTest.java | 50 +-
.../net/sf/freecol/common/model/ColonyTest.java | 30 +-
.../net/sf/freecol/common/model/CombatTest.java | 12 +-
.../net/sf/freecol/common/model/DisasterTest.java | 54 +
.../freecol/common/model/FoundingFatherTest.java | 10 +-
.../src/net/sf/freecol/common/model/GoodsTest.java | 5 +-
.../freecol/common/model/IndianSettlementTest.java | 2 +-
.../freecol/common/model/IndividualFatherTest.java | 30 +-
.../src/net/sf/freecol/common/model/LimitTest.java | 11 +-
test/src/net/sf/freecol/common/model/MapTest.java | 319 +-
.../net/sf/freecol/common/model/ModifierTest.java | 51 +-
.../net/sf/freecol/common/model/MonarchTest.java | 2 +-
.../net/sf/freecol/common/model/MovementTest.java | 21 +-
.../sf/freecol/common/model/NationTypeTest.java | 36 +
.../common/model/{SoLTest.java => RoleTest.java} | 37 +-
.../net/sf/freecol/common/model/SchoolTest.java | 18 +-
.../sf/freecol/common/model/SerializationTest.java | 52 +-
test/src/net/sf/freecol/common/model/SoLTest.java | 4 +-
.../sf/freecol/common/model/SpecificationTest.java | 2 +-
.../freecol/common/model/TileImprovementTest.java | 130 +
test/src/net/sf/freecol/common/model/TileTest.java | 100 +-
test/src/net/sf/freecol/common/model/UnitTest.java | 493 +--
.../freecol/common/model/UnitTypeChangeTest.java | 35 +-
.../net/sf/freecol/common/option/OptionTest.java | 45 +-
.../sf/freecol/common/{ => utils}/AllTests.java | 17 +-
.../src/net/sf/freecol/common/utils/UtilsTest.java | 57 +
test/src/net/sf/freecol/server/SaveLoadTest.java | 3 +
.../net/sf/freecol/server/ServerTestHelper.java | 13 +-
.../src/net/sf/freecol/server/ai/AIColonyTest.java | 12 +-
.../net/sf/freecol/server/ai/ColonyPlanTest.java | 7 +-
.../freecol/server/ai/MissionAssignmentTest.java | 194 +-
test/src/net/sf/freecol/server/ai/REFTest.java | 11 +-
.../sf/freecol/server/ai/StandardAIPlayerTest.java | 8 +-
test/src/net/sf/freecol/server/ai/TensionTest.java | 24 +-
.../server/ai/mission/PioneeringMissionTest.java | 38 +-
.../server/ai/mission/PrivateerMissionTest.java | 8 +-
.../server/ai/mission/ScoutingMissionTest.java | 80 +-
.../server/ai/mission/TransportMissionTest.java | 99 +-
.../ai/mission/UnitSeekAndDestroyMissionTest.java | 23 +-
.../server/control/InGameControllerTest.java | 104 +-
.../freecol/server/generator/MapGeneratorTest.java | 13 +-
.../freecol/server/model/ServerBuildingTest.java | 7 +-
.../sf/freecol/server/model/ServerColonyTest.java | 61 +-
.../server/model/ServerIndianSettlementTest.java | 6 +-
.../sf/freecol/server/model/ServerPlayerTest.java | 151 +-
.../sf/freecol/server/model/ServerUnitTest.java | 9 +-
.../net/sf/freecol/util/test/FreeColTestCase.java | 89 +-
.../net/sf/freecol/util/test/MockPseudoRandom.java | 7 +-
875 files changed, 62847 insertions(+), 40014 deletions(-)
diff --cc debian/changelog
index 606784e,0000000..1080439
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,250 -1,0 +1,281 @@@
- freecol (0.10.5+dfsg-1+deb7u1) stable; urgency=low
-
++freecol (0.10.7+dfsg-3) unstable; urgency=medium
++
+ * Disable intro video to avoid hanging at startup (closes: #771700)
+
- -- Vincent Fourmond <fourmond at debian.org> Sat, 20 Dec 2014 23:57:15 +0100
++ -- Vincent Fourmond <fourmond at debian.org> Mon, 01 Dec 2014 21:30:25 +0100
++
++freecol (0.10.7+dfsg-2) unstable; urgency=low
++
++ * Now depend on texlive-fonts-recommended, to fix FTBS (closes: #738091)
++ * Already conforms to standards 3.9.5
++
++ -- Vincent Fourmond <fourmond at debian.org> Sat, 08 Feb 2014 23:29:59 +0100
++
++freecol (0.10.7+dfsg-1) unstable; urgency=low
++
++ * Team upload.
++ * New upstream release.
++ * Bump Standards-Version to 3.9.4, no changes.
++ * Bump compat level to 9, require debhelper >= 9.
++ * debian/control:
++ - Remove versioned dependencies. They are trivially satisfied in Debian.
++ - Switch to default-jdk. (Closes: #683450)
++ * Drop README.source. Dpatch is not in use anymore.
++ * debian/rules: Set JAVA_HOME_DIRS to default-jdk.
++ * freecol.desktop: Add keywords and a comment in German.
++ * Remove disable-listener.diff. The patch was disabled and incorporated
++ upstream.
++ * Install data/freecol.png to /usr/share/pixmaps. Use a higher resolution
++ desktop icon.
++ * Update debian/copyright to copyright format 1.0.
++ * Register freecol documentation with doc-base. Add freecol.doc-base.
++
++ [Evgeni Golov]
++ * Correct Vcs-* URLs to point to anonscm.debian.org
++
++ -- Markus Koschany <apo at gambaru.de> Sun, 25 Aug 2013 13:11:53 +0200
+
+freecol (0.10.5+dfsg-1) unstable; urgency=low
+
+ * New upstream release
+ * Bump standards version
+ * Refresh patches/40-manpage.diff
+
+ -- Vincent Fourmond <fourmond at debian.org> Tue, 06 Mar 2012 00:10:22 +0100
+
+freecol (0.10.0+dfsg-5) unstable; urgency=low
-
++
+ [ Giovanni Mascellani ]
- * Remove the libwoodstox-java dependency, which isn't necessary.
++ * Remove the libwoodstox-java dependency, which isn't necessary.
+ (closes: #650745)
+
+ [ Vincent Fourmond ]
+ * Fix classpath, which fixes problems with starting the game when newer
+ woodstox is installed (closes: #657866)
+
+ -- Vincent Fourmond <fourmond at debian.org> Sun, 29 Jan 2012 16:04:03 +0100
+
+freecol (0.10.0+dfsg-4) unstable; urgency=low
+
+ * Handle the rename of ttf-liberation to fonts-liberation (and the
+ corresponding file rename)
+
+ -- Vincent Fourmond <fourmond at debian.org> Mon, 24 Oct 2011 19:28:57 +0200
+
+freecol (0.10.0+dfsg-3) unstable; urgency=low
+
+ * Fix FTBS with recent openjdk-6 (closes: #642788)
+
+ -- Vincent Fourmond <fourmond at debian.org> Thu, 29 Sep 2011 21:40:24 +0200
+
+freecol (0.10.0+dfsg-2) unstable; urgency=low
+
+ * Refrain from installing the Liberation fonts, and symlink from those
+ in ttf-liberation
+ * Use javahelper for dependencies
+
+ -- Vincent Fourmond <fourmond at debian.org> Sat, 25 Jun 2011 21:44:41 +0200
+
+freecol (0.10.0+dfsg-1) unstable; urgency=low
+
+ * New upstream release (closes: #631611)
+ * Disable disable-listener.diff, now incorporated upstream (thanks !)
+ * Refreshed other patches
+ * Now using javahelper to handle installation and classpath tweaks (I
+ can't decently ignore lintian warnings I wrote ;-)...)
+ * Pass -Dbuild.sysclasspath=only to ant to fully ignore classpath in
+ the build file.
+ * Conforms to newer standards (3.9.2)
+ * Small improvements in the package description
+ * Increase a bit the memory allocated to freecol
+
+ -- Vincent Fourmond <fourmond at debian.org> Sat, 25 Jun 2011 18:18:38 +0200
+
+freecol (0.9.2+dfsg-2) unstable; urgency=low
+
+ * Now pass -Xincgc as java argument, as GC crashes apparently do not
+ occur using this GC engine. Closes: #583692 (BTW, it seems to
+ significantly speed up AI turn)
+ * Already conforms to 3.9.0
+
+ -- Vincent Fourmond <fourmond at debian.org> Wed, 21 Jul 2010 00:44:19 +0200
+
+freecol (0.9.2+dfsg-1) unstable; urgency=low
+
+ * New upstream release (closes: #567803)
+ * Switch to 3.0 (quilt) format + bzip2 repackaged archive
+ * Droping dependency on libhiglayout-java, apparently not needed anymore
+ * New dependencies:
+ - libcommons-cli-java
+ - libmiglayout-java
+ - libcortado-java
+ * Dropped dependency on dpatch now that we use format 3.0 (quilt)
+ * disable-listener.diff to disable what seems to be a custom feature
+ from cortado
+
+ -- Vincent Fourmond <fourmond at debian.org> Sun, 07 Mar 2010 18:00:39 +0100
+
+freecol (0.8.4+dfsg-2) unstable; urgency=low
+
+ * Disable IPV6 networking stack by default to work around Java bug
+ (see #560056) (closes: #562133)
+ * Already conforms to standards 3.8.3
+ * Update build-deps to reflect changes in TeXLive
+
+ -- Vincent Fourmond <fourmond at debian.org> Thu, 07 Jan 2010 22:53:26 +0100
+
+freecol (0.8.4+dfsg-1) unstable; urgency=low
+
+ * New upstream release
+ * Minor modifications to the debian/new-upstream script
+
+ -- Vincent Fourmond <fourmond at debian.org> Sat, 08 Aug 2009 21:27:55 +0200
+
+freecol (0.8.3+dfsg-1) unstable; urgency=low
+
+ * New upstream release
+ * Use viewsvn rather than wsvn for the Vcs-Browser field
+ * Now use a +dfsg instead of .dfsg (thanks lintian)
+ * Already conforms to standards 3.8.2
+
+ -- Vincent Fourmond <fourmond at debian.org> Sat, 27 Jun 2009 18:01:03 +0200
+
+freecol (0.8.1.dfsg-1) unstable; urgency=low
+
+ * New upstream release (closes: #514363)
+ - saves the log in ~/.freecol (closes: #488330)
+ - does not mess up language settings (closes: #497076)
+ * Adding alternate dependency on the virtual package java6-runtime, since
+ all variants seem to be able to run freecol. (closes: #503810)
+ * Switched to a machine-readable debian/copyright file
- * Updated to small newer features of java-wrappers (and bumped the
++ * Updated to small newer features of java-wrappers (and bumped the
+ version dependency accordingly)
- * Added a debian/README.source to mention the use of a patch system,
++ * Added a debian/README.source to mention the use of a patch system,
+ which makes it now comply to standards 3.8.0
+ * Adding ${misc:Depends} for potential debhelper-induced dependencies
+ * Refreshed debian/patches/10-fix-jar-path.dpatch
+ * Dropped debian/patches/25-change-save-dir.dpatch, superseded by
+ upstream modifications
+ * Remove unapplied patches
+ * Switch to using cdbs for building
+ * Update debian/NEWS to mention that save games from earlier
+ versions are not compatible.
+
+ -- Vincent Fourmond <fourmond at debian.org> Tue, 24 Feb 2009 18:55:19 +0100
+
+freecol (0.7.4.dfsg+1-1) unstable; urgency=low
+
- * Pseudo new upstream release to work around dak's
++ * Pseudo new upstream release to work around dak's
+ move-from-contrib-to-main bug.
-
++
+ -- Vincent Fourmond <fourmond at debian.org> Sun, 10 Aug 2008 16:59:02 +0200
+
+freecol (0.7.4.dfsg-2) unstable; urgency=low
+
+ * Fix watchfile to ignore the alpha releases (users and developers
+ seem to complain about their stability).
+ * Add openjdk in the wrapper script, and tighten up dependency on
+ java-wrappers accordingly.
+ * freecol can now move to main ! (closes: #491260)
+ * Adapted wrapper/freecol to work around a java-wrappers bug
+ * Document undocumented patches, and drop 15-fix-jar-manifest which
+ really isn't necessary now that we are using java-wrappers.
+
+ -- Vincent Fourmond <fourmond at debian.org> Sun, 10 Aug 2008 14:42:28 +0200
+
+freecol (0.7.4.dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ * Finally add a .dfsg suffix to the version number, to reflect the
- fact that the upstream tarball is repackaged (since this time I
++ fact that the upstream tarball is repackaged (since this time I
+ had forgotten that ;-)...).
+ * Update debian/new-upstream and debian/watch accordingly
+
+ -- Vincent Fourmond <fourmond at debian.org> Sun, 22 Jun 2008 09:21:57 +0200
+
+freecol (0.7.3-4) unstable; urgency=low
+
+ * Mmmm, also add openjdk-6 as JAVA_HOME in debian/rules (closes: #480107)
+
+ -- Vincent Fourmond <fourmond at debian.org> Fri, 16 May 2008 19:21:43 +0200
+
+freecol (0.7.3-3) unstable; urgency=low
+
- * Adding openjdk-6-* as alternative (Build-)?Deps, thanks to
++ * Adding openjdk-6-* as alternative (Build-)?Deps, thanks to
+ Matvey Kozhev <inetperson at gmail.com> for pointing out (closes: #480107)
+
+ -- Vincent Fourmond <fourmond at debian.org> Thu, 08 May 2008 08:32:20 +0200
+
+freecol (0.7.3-2) unstable; urgency=low
+
+ * Pushing memory limit to 180M, as it does not work anymore on AMD64 with
+ only 128M...
+
+ -- Vincent Fourmond <fourmond at debian.org> Sat, 03 May 2008 21:18:05 +0200
+
+freecol (0.7.3-1) unstable; urgency=low
+
+ [ Ansgar Burchardt ]
+ * Remove deprecated Encoding key from .desktop file
+
+ [ Vincent Fourmond ]
+ * New upstream release (Closes: #465490)
+ - dropped 30-language-option, included upstream
+ - updated 10-fix-jar-path and 15-fix-jar-manifest
+ * Now providing a debian/new-upstream to repackage upstream tarball
+ * Added a NEWS file
+ * Switched to java-wrappers for the wrapper script
+ - 40-manpage to point the user to java-wrappers(7)
+
+ -- Vincent Fourmond <fourmond at debian.org> Fri, 29 Feb 2008 23:09:02 +0100
+
+freecol (0.7.2-5) unstable; urgency=low
+
+ * Bumped standards-version to 3.7.3 (no changes required)
+ * Added many changes by Matvey Kozhev <sikon at lucidfox.org> for
+ Ubuntu (closes: #453836)
+ - added a desktop file
+ - fix wrapper file position and pathes
- - added icedtea dependencies
- * Added an icon for the menu
++ - added icedtea dependencies
++ * Added an icon for the menu
+
+ -- Vincent Fourmond <fourmond at debian.org> Fri, 14 Dec 2007 01:18:14 +0100
+
+freecol (0.7.2-4) unstable; urgency=low
+
+ * Pull upstream revision 3270 to add a --default-locale option
+ * Used this option to detect when LC_MESSAGES is different from
+ LC_CTYPE (Closes: #450944)
+
+ -- Vincent Fourmond <fourmond at debian.org> Mon, 26 Nov 2007 20:25:41 +0100
+
+freecol (0.7.2-3) unstable; urgency=low
+
- * Add a dependency on j2re1.6 for java-package made packages
++ * Add a dependency on j2re1.6 for java-package made packages
+ (Closes: #452407)
+ * Added various meta-information field to debian/control
+
+ -- Vincent Fourmond <fourmond at debian.org> Thu, 22 Nov 2007 19:21:34 +0100
+
+freecol (0.7.2-2) unstable; urgency=high
+
+ [ Barry deFreese ]
+ * Fix watch file
+
+ [ Vincent Fourmond ]
+ * Apparently, I cannot build freecol for java5, as libraries
+ are missing. Switching to java6 (Closes: #448082, #448083)
+ * Urgency high to fix two RC bugs in testing
- * Fixing table of contents and links in PDF manual
++ * Fixing table of contents and links in PDF manual
+
+ -- Vincent Fourmond <fourmond at debian.org> Fri, 26 Oct 2007 21:27:20 +0200
+
+freecol (0.7.2-1) unstable; urgency=low
+
+ * Initial release (Closes: #444199)
+ * {10,15}-fix-jar*: switch to external libraries for binary only jars.
+ * 20-freecol-executable: the freecol executable.
+ * 25-change-save-dir: switch saves directory to ~/.freecol
+ * Menu entry
+
+ -- Vincent Fourmond <fourmond at debian.org> Mon, 08 Oct 2007 15:56:18 +0200
diff --cc debian/compat
index 7ed6ff8,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 5
++9
diff --cc debian/control
index 4e0a7b0,0000000..5f9556c
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,25 -1,0 +1,39 @@@
+Source: freecol
+Section: games
+Priority: optional
+Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
- Uploaders: Vincent Fourmond <fourmond at debian.org>
- Build-Depends: debhelper (>= 5), ant, openjdk-6-jdk, cdbs
++Uploaders:
++ Vincent Fourmond <fourmond at debian.org>
++Build-Depends:
++ ant,
++ cdbs,
++ debhelper (>= 9),
++ default-jdk
+Build-Depends-Indep:
- tex4ht, texlive-binaries | texlive-base-bin, ant-optional,
- texlive-latex-recommended, libcommons-cli-java, libmiglayout-java,
- libcortado-java, javahelper
- Standards-Version: 3.9.3
++ ant-optional,
++ javahelper,
++ libcommons-cli-java,
++ libcortado-java,
++ libmiglayout-java,
++ tex4ht,
++ texlive-binaries | texlive-base-bin,
++ texlive-latex-recommended,
++ texlive-fonts-recommended
++Standards-Version: 3.9.5
+Homepage: http://www.freecol.org
- Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/freecol
- Vcs-Browser: http://svn.debian.org/viewsvn/pkg-games/packages/trunk/freecol
++Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/freecol
++Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/freecol
+
+Package: freecol
+Architecture: all
- Depends: openjdk-6-jre | java6-runtime,
- java-wrappers (>= 0.1.13), ${misc:Depends}, ${java:Depends},
- fonts-liberation (>= 1.07.0-2~)
++Depends:
++ default-jre | java7-runtime,
++ fonts-liberation,
++ java-wrappers,
++ ${java:Depends},
++ ${misc:Depends}
+Description: open source remake of the old Colonization
+ freecol is a game in the spirit of Civilization but taking place in a
+ colonial background. Colonize the new world, build towns, trade or
+ fight with natives and other European civilizations, trade with your
+ homeland until you're ready to fight for your independance !
diff --cc debian/copyright
index eb43a87,0000000..027b81b
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,73 -1,0 +1,73 @@@
- Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=437
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Source: http://www.freecol.org
+Upstream-Name: freecol
- Upstream-Maintainer: The FreeCol Team <freecol-developers at lists.sourceforge.net>
-
++Upstream-Contact: The FreeCol Team <freecol-developers at lists.sourceforge.net>
++Comment:
+ This package was debianized by Vincent Fourmond <fourmond at debian.org> on
+ Mon, 01 Oct 2007 23:58:51 +0200.
-
++ .
+ The original tarball was made downloading the freecol-*-src.tar.gz
+ tarball on http://www.freecol.org/download.html, applying the patch
+ debian/freecol-dist-targz.diff and then using the ant target
+ tarDistBundle.
-
++ .
+ For more details, see the debian/new-upstream script that does precisely
+ this.
+
+Files: *
+Copyright: Copyright (C) 2003-2009 The FreeCol Team
+License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- On Debian systems, the complete text of the GNU General Public
- License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
++ This package is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++ .
++ This package is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++ .
++ You should have received a copy of the GNU General Public License
++ along with this package; if not, write to the Free Software
++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++ .
++ On Debian systems, the complete text of the GNU General Public
++ License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+
+Files: debian/*
+Copyright: Copyright (C) 2007-2009 Vincent Fourmond <fourmond at debian.org>
+License: GPL-2+
+ (see above)
+
- Files: data/fonts/ShadowedBlack.ttf is
++Files: data/fonts/ShadowedBlack.ttf is
+Copyright: Copyright Paul Lloyd <Paul.Lloyd at uwa.edu.au>
+License: GPL-2+
+ (see above)
+
- Files: packaging/gentoo/freecol-0.3.0.ebuild is
- Copyright: Copyright 1999-2004 Gentoo Foundation
++Files: packaging/gentoo/freecol-0.3.0.ebuild is
++Copyright: Copyright 1999-2004 Gentoo Foundation
+License: GPL-2+
+ (see above)
+
+Files: data/images/ui/bg_map1.jpg
- Files: data/images/ui/military.png
- Files: data/images/ui/political.png
- Files: data/images/ui/religious.png
- Files: data/images/ui/trade.png
- Files: data/images/ui/exploration.png
- Files: data/images/ui/landing.png
++ data/images/ui/military.png
++ data/images/ui/political.png
++ data/images/ui/religious.png
++ data/images/ui/trade.png
++ data/images/ui/exploration.png
++ data/images/ui/landing.png
+Copyright: not copyrightable
+License: PD
- The aforementioned images are fidel copies of objects in the public
- domain and are thus not copyrightable (see for instance
- http://en.wikipedia.org/wiki/Bridgeman_Art_Library_v._Corel_Corp for
- more information).
++ The aforementioned images are fidel copies of objects in the public
++ domain and are thus not copyrightable (see for instance
++ http://en.wikipedia.org/wiki/Bridgeman_Art_Library_v._Corel_Corp for
++ more information).
+
+Files: data/images/monarch/*
- Files: data/images/ui/bg_europe.jpg
- Files: data/images/ui/doi.png
++ data/images/ui/bg_europe.jpg
++ data/images/ui/doi.png
+Copyright: no copyright
+License: PD
- The aforementioned files were downloaded from Wikimedia and are in
- the public domain.
++ The aforementioned files were downloaded from Wikimedia and are in
++ the public domain.
diff --cc debian/freecol.desktop
index d6b71dc,0000000..dbf9675
mode 100644,000000..100644
--- a/debian/freecol.desktop
+++ b/debian/freecol.desktop
@@@ -1,8 -1,0 +1,10 @@@
+[Desktop Entry]
+Name=FreeCol
+Comment=Turn-based strategy game
++Comment[de]=Rundenbasierendes Strategiespiel
+Exec=freecol
+Icon=freecol
+Terminal=false
+Type=Application
+Categories=Java;Game;StrategyGame;
++Keywords=strategy;colonization;civilization;turn-based;isometric;
diff --cc debian/freecol.doc-base
index 0000000,0000000..2cecbf8
new file mode 100644
--- /dev/null
+++ b/debian/freecol.doc-base
@@@ -1,0 -1,0 +1,12 @@@
++Document: freecol
++Title: freecol manual
++Author: The freecol project
++Abstract: This manual describes the gameplay of freecol.
++Section: Games/Simulation
++
++Format: PDF
++Files: /usr/share/doc/freecol/FreeCol.pdf.gz
++
++Format: HTML
++Index: /usr/share/doc/freecol/FreeCol.html
++Files: /usr/share/doc/freecol/FreeCol.html
diff --cc debian/freecol.install
index ad2bd75,0000000..415e651
mode 100644,000000..100644
--- a/debian/freecol.install
+++ b/debian/freecol.install
@@@ -1,6 -1,0 +1,5 @@@
+data/* usr/share/games/freecol
- debian/wrapper/freecol usr/games
+debian/freecol.desktop usr/share/applications
++debian/wrapper/freecol usr/games
+freecol.xpm usr/share/pixmaps
-
-
++data/freecol.png usr/share/pixmaps
diff --cc debian/patches/series
index ca75487,0000000..14a85c2
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,2 @@@
- # disable-listener.diff
+10-fix-jar-path.diff
+40-manpage.diff
diff --cc debian/rules
index 0a60ed1,0000000..b29baa9
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,38 -1,0 +1,37 @@@
+#!/usr/bin/make -f
+
+# debian/rules file for building freecol
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+VERSION = $(shell dpkg-parsechangelog | egrep '^Version' | \
+ sed -r 's/Version:\s*//' | sed -r 's/^[0-9]+://' | \
+ sed -r 's/(\.dfsg)?-[0-9.]+//')
+
+# export JITC_PROCESSOR_TYPE=6
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/javahelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+arch = $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
- JAVA_HOME_DIRS := /usr/lib/jvm/java-7-openjdk-$(arch) \
- /usr/lib/jvm/java-6-openjdk-$(arch) /usr/lib/jvm/java-6-openjdk
++JAVA_HOME_DIRS := /usr/lib/jvm/default-java
+ANT_HOME := /usr/share/ant
+DEB_JARS := ant-launcher ant-nodeps \
+ miglayout commons-cli cortado
+DEB_ANT_COMPILER := modern
+DEB_ANT_BUILD_TARGET := package online-manual print-manual
+DEB_BUILDDIR := .
+DEB_ANT_BUILDFILE := build.xml
+DEB_ANT_CLEAN_TARGET := clean
+# Override build classpath
+ANT_OPTS := -Dbuild.sysclasspath=only
+
+LIBERATION_FONTS := LiberationSerif-Bold.ttf LiberationSerif-BoldItalic.ttf LiberationSerif-Italic.ttf LiberationSerif-Regular.ttf
+
+# Refrain from installing those files
+DEB_DH_INSTALL_ARGS = $(patsubst %,-X%, $(LIBERATION_FONTS))
+
+DEB_DH_LINK_freecol = $(foreach file, $(LIBERATION_FONTS), usr/share/fonts/truetype/liberation/$(file) usr/share/games/freecol/base/resources/fonts/$(file))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freecol.git
More information about the Pkg-games-commits
mailing list