This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository freeciv.
commit e51d98a0865da7b5415b9542dbb62b4bab4e7b71 Merge: b7868e2 fde7431 Author: Markus Koschany <[email protected]> Date: Thu Aug 17 02:24:58 2017 +0200 Updated version 2.5.8 from 'upstream/2.5.8' with Debian dir 3203a7a22cb89b18decf7697dd032f68a65b45cb ChangeLog | 581 +++++++++++++++++++ INSTALL | 12 +- Makefile.am | 2 - Makefile.in | 2 - NEWS-2.5 | 99 +++- ai/default/advdiplomacy.c | 2 +- bootstrap/fc_svnrev_gen.h.tmpl | 33 -- bootstrap/generate_svnrev.sh | 47 -- client/control.c | 2 +- client/gui-gtk-2.0/pages.c | 28 +- client/gui-gtk-2.0/unitselect.c | 9 +- client/gui-gtk-3.0/mapctrl.c | 3 +- client/gui-gtk-3.0/pages.c | 28 +- client/gui-gtk-3.0/unitselect.c | 9 +- client/gui-qt/citydlg.cpp | 2 +- client/gui-qt/pages.cpp | 43 +- client/gui-sdl/pages.c | 16 +- client/gui-xaw/Freeciv.h | 2 +- client/gui-xaw/graphics.c | 28 +- client/luascript/tolua_client_gen.h | 2 +- client/mapview_common.c | 6 +- client/options.c | 2 +- common/Makefile.am | 8 +- common/Makefile.in | 11 +- common/combat.c | 6 +- common/scriptcore/tolua_common_a_gen.h | 2 +- common/scriptcore/tolua_common_z_gen.h | 2 +- common/scriptcore/tolua_game_gen.c | 20 +- common/scriptcore/tolua_game_gen.h | 2 +- common/scriptcore/tolua_signal_gen.h | 2 +- common/unit.c | 6 +- common/version.c | 36 +- common/version.h | 1 - configure | 85 +-- configure.ac | 12 - data/Freeciv | 2 +- data/Makefile.in | 2 +- data/civ1/cities.ruleset | 1 + data/civ2/cities.ruleset | 1 + data/civ2civ3/cities.ruleset | 1 + data/civ2civ3/terrain.ruleset | 6 +- data/civ2civ3/units.ruleset | 2 + data/classic/cities.ruleset | 1 + data/classic/units.ruleset | 2 + data/default/default.lua | 2 +- data/experimental/cities.ruleset | 1 + data/experimental/units.ruleset | 2 + data/isophex.tilespec | 10 +- data/isophex/rivers.png | Bin 18368 -> 18199 bytes data/isophex/rivers.spec | 141 ++--- data/isophex/terrain1.png | Bin 52450 -> 48364 bytes data/isophex/terrain1.spec | 229 ++++---- data/isophex/terrain2.png | Bin 115514 -> 84441 bytes data/isophex/terrain2.spec | 589 ++++++++++--------- data/multiplayer/cities.ruleset | 1 + data/multiplayer/units.ruleset | 2 + data/nation/american.ruleset | 2 +- data/themes/gui-sdl/human/theme.themespec | 4 +- dependencies/tolua-5.2/src/bin/Makefile.am | 3 + dependencies/tolua-5.2/src/bin/Makefile.in | 3 + dependencies/tolua-5.2/src/bin/tolua.pkg | 28 + diff_ignore | 2 +- doc/CodingStyle | 4 +- doc/FAQ | 92 ++- doc/HACKING | 4 +- doc/INSTALL.Cygwin | 2 +- doc/Makefile.am | 1 + doc/Makefile.in | 1 + doc/README | 2 +- doc/README.fcdb | 11 +- doc/README.ruleset_civ2civ3 | 13 +- doc/README.tilesets | 30 + fc_config.h.in | 3 - fc_version | 6 +- lua/database.lua | 2 +- m4/ac_path_lib.m4 | 2 +- m4/gprof.m4 | 2 +- m4/vsnprintf.m4 | 2 +- server/citytools.c | 10 +- server/cityturn.c | 7 +- server/diplomats.c | 6 +- server/generator/mapgen.c | 1 + server/maphand.c | 4 + server/report.c | 2 +- server/sanitycheck.c | 6 +- server/scripting/api_server_edit.c | 14 + server/scripting/tolua_fcdb_gen.h | 2 +- server/scripting/tolua_server_gen.c | 6 +- server/scripting/tolua_server_gen.h | 2 +- server/srv_main.c | 93 ++- server/techtools.c | 8 +- server/unittools.c | 14 +- tools/mpcli.c | 14 +- tools/mpgui_gtk2.c | 17 +- tools/mpgui_gtk3.c | 17 +- tools/mpgui_qt.cpp | 17 +- translations/freeciv/ar.gmo | Bin 189864 -> 189776 bytes translations/freeciv/ar.po | 866 ++++++++++++++-------------- translations/freeciv/bg.gmo | Bin 119377 -> 119283 bytes translations/freeciv/bg.po | 866 ++++++++++++++-------------- translations/freeciv/ca.gmo | Bin 1024625 -> 1024904 bytes translations/freeciv/ca.po | 896 +++++++++++++++-------------- translations/freeciv/cs.gmo | Bin 214502 -> 214424 bytes translations/freeciv/cs.po | 867 ++++++++++++++-------------- translations/freeciv/da.gmo | Bin 564280 -> 564213 bytes translations/freeciv/da.po | 868 ++++++++++++++-------------- translations/freeciv/de.gmo | Bin 1039812 -> 1039438 bytes translations/freeciv/de.po | 865 ++++++++++++++-------------- translations/freeciv/el.gmo | Bin 245533 -> 245435 bytes translations/freeciv/el.po | 866 ++++++++++++++-------------- translations/freeciv/en_GB.gmo | Bin 962969 -> 963187 bytes translations/freeciv/en_GB.po | 864 ++++++++++++++-------------- translations/freeciv/eo.gmo | Bin 176400 -> 176326 bytes translations/freeciv/eo.po | 865 ++++++++++++++-------------- translations/freeciv/es.gmo | Bin 1040295 -> 1039931 bytes translations/freeciv/es.po | 869 ++++++++++++++-------------- translations/freeciv/et.gmo | Bin 227478 -> 227404 bytes translations/freeciv/et.po | 867 ++++++++++++++-------------- translations/freeciv/fa.gmo | Bin 96136 -> 96047 bytes translations/freeciv/fa.po | 865 ++++++++++++++-------------- translations/freeciv/fi.gmo | Bin 1016762 -> 1017009 bytes translations/freeciv/fi.po | 866 ++++++++++++++-------------- translations/freeciv/fr.gmo | Bin 1052988 -> 1053243 bytes translations/freeciv/fr.po | 868 ++++++++++++++-------------- translations/freeciv/freeciv.pot | 846 ++++++++++++++------------- translations/freeciv/ga.gmo | Bin 210707 -> 210632 bytes translations/freeciv/ga.po | 865 ++++++++++++++-------------- translations/freeciv/gd.gmo | Bin 795310 -> 795231 bytes translations/freeciv/gd.po | 869 ++++++++++++++-------------- translations/freeciv/he.gmo | Bin 97381 -> 97381 bytes translations/freeciv/he.po | 862 +++++++++++++-------------- translations/freeciv/hu.gmo | Bin 140508 -> 140436 bytes translations/freeciv/hu.po | 868 ++++++++++++++-------------- translations/freeciv/id.gmo | Bin 215769 -> 215702 bytes translations/freeciv/id.po | 868 ++++++++++++++-------------- translations/freeciv/it.gmo | Bin 473855 -> 473783 bytes translations/freeciv/it.po | 870 ++++++++++++++-------------- translations/freeciv/ja.gmo | Bin 1061863 -> 1061577 bytes translations/freeciv/ja.po | 867 ++++++++++++++-------------- translations/freeciv/ko.gmo | Bin 423645 -> 423510 bytes translations/freeciv/ko.po | 865 ++++++++++++++-------------- translations/freeciv/lt.gmo | Bin 176757 -> 176692 bytes translations/freeciv/lt.po | 868 ++++++++++++++-------------- translations/freeciv/nb.gmo | Bin 194250 -> 194184 bytes translations/freeciv/nb.po | 868 ++++++++++++++-------------- translations/freeciv/nl.gmo | Bin 403534 -> 403468 bytes translations/freeciv/nl.po | 868 ++++++++++++++-------------- translations/freeciv/pl.gmo | Bin 899520 -> 899271 bytes translations/freeciv/pl.po | 869 ++++++++++++++-------------- translations/freeciv/pt.gmo | Bin 130445 -> 130372 bytes translations/freeciv/pt.po | 867 ++++++++++++++-------------- translations/freeciv/pt_BR.gmo | Bin 430492 -> 430420 bytes translations/freeciv/pt_BR.po | 868 ++++++++++++++-------------- translations/freeciv/ro.gmo | Bin 198254 -> 198183 bytes translations/freeciv/ro.po | 868 ++++++++++++++-------------- translations/freeciv/ru.gmo | Bin 1401807 -> 1402076 bytes translations/freeciv/ru.po | 866 ++++++++++++++-------------- translations/freeciv/sr.gmo | Bin 144669 -> 144669 bytes translations/freeciv/sr.po | 860 +++++++++++++-------------- translations/freeciv/sv.gmo | Bin 295373 -> 295308 bytes translations/freeciv/sv.po | 868 ++++++++++++++-------------- translations/freeciv/tr.gmo | Bin 226528 -> 226460 bytes translations/freeciv/tr.po | 868 ++++++++++++++-------------- translations/freeciv/uk.gmo | Bin 1273785 -> 1273375 bytes translations/freeciv/uk.po | 865 ++++++++++++++-------------- translations/freeciv/zh_CN.gmo | Bin 164600 -> 164542 bytes translations/freeciv/zh_CN.po | 866 ++++++++++++++-------------- translations/freeciv/zh_TW.gmo | Bin 98755 -> 98755 bytes translations/freeciv/zh_TW.po | 858 +++++++++++++-------------- translations/nations/ar.gmo | Bin 8111 -> 8111 bytes translations/nations/ar.po | 2 +- translations/nations/bg.gmo | Bin 25942 -> 25942 bytes translations/nations/bg.po | 2 +- translations/nations/ca.gmo | Bin 439418 -> 439480 bytes translations/nations/ca.po | 72 +-- translations/nations/cs.gmo | Bin 14232 -> 14232 bytes translations/nations/cs.po | 2 +- translations/nations/da.gmo | Bin 136522 -> 136522 bytes translations/nations/da.po | 2 +- translations/nations/de.gmo | Bin 236278 -> 236278 bytes translations/nations/de.po | 2 +- translations/nations/el.gmo | Bin 16120 -> 16120 bytes translations/nations/el.po | 2 +- translations/nations/en_GB.gmo | Bin 430143 -> 430143 bytes translations/nations/en_GB.po | 2 +- translations/nations/eo.gmo | Bin 15192 -> 15192 bytes translations/nations/eo.po | 2 +- translations/nations/es.gmo | Bin 442543 -> 442543 bytes translations/nations/es.po | 2 +- translations/nations/et.gmo | Bin 22087 -> 22087 bytes translations/nations/et.po | 2 +- translations/nations/fa.gmo | Bin 9777 -> 9777 bytes translations/nations/fa.po | 2 +- translations/nations/fi.gmo | Bin 290157 -> 305650 bytes translations/nations/fi.po | 139 ++++- translations/nations/fr.gmo | Bin 449519 -> 449519 bytes translations/nations/fr.po | 6 +- translations/nations/freeciv-nations.pot | 2 +- translations/nations/ga.gmo | Bin 56956 -> 56956 bytes translations/nations/ga.po | 2 +- translations/nations/gd.gmo | Bin 332059 -> 332059 bytes translations/nations/gd.po | 2 +- translations/nations/he.gmo | Bin 8205 -> 8205 bytes translations/nations/he.po | 2 +- translations/nations/hu.gmo | Bin 5157 -> 5157 bytes translations/nations/hu.po | 2 +- translations/nations/id.gmo | Bin 93595 -> 93595 bytes translations/nations/id.po | 2 +- translations/nations/it.gmo | Bin 53499 -> 53499 bytes translations/nations/it.po | 2 +- translations/nations/ja.gmo | Bin 418742 -> 418742 bytes translations/nations/ja.po | 2 +- translations/nations/ko.gmo | Bin 24991 -> 24991 bytes translations/nations/ko.po | 2 +- translations/nations/lt.gmo | Bin 24758 -> 24758 bytes translations/nations/lt.po | 2 +- translations/nations/nb.gmo | Bin 6977 -> 6977 bytes translations/nations/nb.po | 2 +- translations/nations/nl.gmo | Bin 161936 -> 161936 bytes translations/nations/nl.po | 2 +- translations/nations/pl.gmo | Bin 441094 -> 441094 bytes translations/nations/pl.po | 2 +- translations/nations/pt.gmo | Bin 4748 -> 4748 bytes translations/nations/pt.po | 2 +- translations/nations/pt_BR.gmo | Bin 51658 -> 51658 bytes translations/nations/pt_BR.po | 2 +- translations/nations/ro.gmo | Bin 6160 -> 6160 bytes translations/nations/ro.po | 2 +- translations/nations/ru.gmo | Bin 622772 -> 622772 bytes translations/nations/ru.po | 4 +- translations/nations/sr.gmo | Bin 7952 -> 7952 bytes translations/nations/sr.po | 2 +- translations/nations/sv.gmo | Bin 32776 -> 32776 bytes translations/nations/sv.po | 2 +- translations/nations/tr.gmo | Bin 10677 -> 10677 bytes translations/nations/tr.po | 2 +- translations/nations/uk.gmo | Bin 154775 -> 154775 bytes translations/nations/uk.po | 2 +- translations/nations/zh_CN.gmo | Bin 12245 -> 12245 bytes translations/nations/zh_CN.po | 2 +- translations/nations/zh_TW.gmo | Bin 33716 -> 33716 bytes translations/nations/zh_TW.po | 2 +- utility/fc_utf8.c | 2 +- utility/ioz.c | 2 +- win32/installer/Makefile | 5 +- 245 files changed, 18035 insertions(+), 16931 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freeciv.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
