[freeciv] 01/02: Merge branch 'master' into jessie-backports
Markus Koschany
apo at moszumanska.debian.org
Fri Aug 5 09:46:16 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch jessie-backports
in repository freeciv.
commit 08e8511408072fc726923ff083e8c8e38f853d3e
Merge: 8fefe8d 9a8f006
Author: Markus Koschany <apo at debian.org>
Date: Fri Aug 5 11:25:13 2016 +0200
Merge branch 'master' into jessie-backports
ChangeLog | 1207 ++
NEWS-2.5 | 162 +-
autogen.sh | 2 +-
bootstrap/freeciv.spec.in | 2 +-
client/audio.c | 2 +-
client/client_main.c | 2 +-
client/connectdlg_common.c | 47 +-
client/gui-gtk-2.0/chatline.c | 10 +-
client/gui-gtk-2.0/citydlg.c | 48 +-
client/gui-gtk-2.0/cma_fe.c | 48 +-
client/gui-gtk-2.0/editprop.c | 2 +-
client/gui-gtk-2.0/gui_main.c | 5 +-
client/gui-gtk-2.0/pages.c | 16 +-
client/gui-gtk-2.0/soundset_dlg.c | 12 +-
client/gui-gtk-2.0/tileset_dlg.c | 12 +-
client/gui-gtk-2.0/wldlg.c | 2 +-
client/gui-gtk-3.0/chatline.c | 10 +-
client/gui-gtk-3.0/citydlg.c | 52 +-
client/gui-gtk-3.0/cma_fe.c | 42 +-
client/gui-gtk-3.0/editgui.c | 31 +-
client/gui-gtk-3.0/editgui.h | 3 +-
client/gui-gtk-3.0/editprop.c | 2 +-
client/gui-gtk-3.0/graphics.c | 21 -
client/gui-gtk-3.0/graphics.h | 3 -
client/gui-gtk-3.0/gui_main.c | 34 +-
client/gui-gtk-3.0/happiness.c | 22 +-
client/gui-gtk-3.0/happiness.h | 7 +-
client/gui-gtk-3.0/mapctrl.c | 4 +-
client/gui-gtk-3.0/pages.c | 16 +-
client/gui-gtk-3.0/soundset_dlg.c | 12 +-
client/gui-gtk-3.0/tileset_dlg.c | 12 +-
client/gui-gtk-3.0/wldlg.c | 2 +-
client/gui-qt/chatline.cpp | 104 +-
client/gui-qt/dialogs.cpp | 17 +-
client/gui-qt/fc_client.cpp | 5 +-
client/gui-qt/fc_client.h | 5 +-
client/gui-qt/gui_main.cpp | 6 +
client/gui-qt/mapctrl.cpp | 4 +-
client/gui-qt/mapview.cpp | 8 +
client/gui-qt/mapview.h | 1 +
client/gui-qt/messagewin.cpp | 48 +-
client/gui-qt/messagewin.h | 3 +
client/gui-qt/pages.cpp | 73 +-
client/gui-qt/repodlgs.cpp | 9 +-
client/gui-qt/themes.cpp | 39 +-
client/gui-sdl/citydlg.c | 2 +-
client/gui-sdl/gui_main.c | 7 +-
client/gui-sdl/themespec.c | 18 +-
client/gui-sdl/wldlg.c | 47 +-
client/gui-stub/mapctrl.c | 2 +-
client/gui-xaw/Freeciv.h | 2 +-
client/gui-xaw/cma_fe.c | 8 +-
client/gui-xaw/mapctrl.c | 12 +-
client/helpdata.c | 9 +-
client/luascript/tolua_client_gen.h | 2 +-
client/options.c | 7 +
client/packhand.c | 11 +-
client/reqtree.c | 3 +-
client/tilespec.c | 42 +-
common/Makefile.am | 1 +
common/Makefile.in | 1 +
common/aicore/aisupport.h | 15 +-
common/aicore/caravan.h | 15 +-
common/aicore/citymap.h | 17 +-
common/aicore/cm.h | 10 +-
common/aicore/path_finding.h | 17 +-
common/aicore/pf_tools.h | 19 +-
client/gui-gtk-3.0/graphics.h => common/chat.h | 37 +-
common/city.c | 3 +-
common/map.c | 75 +-
common/packets.def | 1 +
common/packets_gen.c | 458 +-
common/packets_gen.h | 1 +
common/player.c | 8 +-
common/road.c | 9 -
common/road.h | 9 +-
common/scriptcore/tolua_common_a_gen.h | 2 +-
common/scriptcore/tolua_common_z_gen.h | 2 +-
common/scriptcore/tolua_game_gen.c | 18 +-
common/scriptcore/tolua_game_gen.h | 2 +-
common/scriptcore/tolua_signal_gen.h | 2 +-
common/tile.c | 10 +-
common/tile.h | 12 +-
common/unittype.c | 35 +-
common/unittype.h | 20 +-
configure | 128 +-
configure.ac | 1 +
data/Freeciv | 2 +-
data/Makefile.in | 2 +-
data/civ1/game.ruleset | 2 +-
data/civ2/game.ruleset | 2 +-
data/civ2/units.ruleset | 2 +-
data/civ2civ3/game.ruleset | 2 +-
data/civ2civ3/terrain.ruleset | 2 +-
data/civ2civ3/units.ruleset | 2 +-
data/classic/buildings.ruleset | 22 +-
data/classic/game.ruleset | 8 +-
data/classic/terrain.ruleset | 2 +-
data/classic/units.ruleset | 2 +-
data/experimental/game.ruleset | 2 +-
data/experimental/terrain.ruleset | 2 +-
data/experimental/units.ruleset | 2 +-
data/helpdata.txt | 23 +-
data/multiplayer/buildings.ruleset | 16 +-
data/multiplayer/game.ruleset | 2 +
data/multiplayer/terrain.ruleset | 2 +-
data/multiplayer/units.ruleset | 2 +-
data/nation/african.ruleset | 2 +-
data/nation/latvian.ruleset | 45 +-
data/nation/texan.ruleset | 127 +-
data/scenarios/tutorial.sav | 15 +-
debian/changelog | 15 +-
debian/control | 25 +-
debian/freeciv-client-gtk3.install | 2 +
debian/freeciv-client-gtk3.links | 2 +
debian/freeciv-client-gtk3.menu | 5 +
debian/rules | 3 +-
dependencies/lua-5.2/freeciv_lua.patch | 49 +-
dependencies/lua-5.2/src/liolib.c | 2 +-
dependencies/lua-5.2/src/localluaconf.h | 3 +
doc/README.packaging | 9 +
doc/man/freeciv-client.6.in | 16 +-
doc/man/freeciv-server.6.in | 7 +
fc_config.h.in | 6 +
fc_version | 8 +-
m4/debug.m4 | 10 +-
server/cityhand.c | 4 +-
server/citytools.c | 50 +-
server/cityturn.c | 41 +-
server/cityturn.h | 2 +-
server/civserver.c | 15 +-
server/commands.c | 9 +-
server/edithand.c | 2 +-
server/handchat.c | 9 +-
server/handchat.h | 2 -
server/meta.c | 31 +-
server/meta.h | 4 +-
server/plrhand.c | 93 +-
server/ruleset.c | 1 +
server/scripting/tolua_fcdb_gen.h | 2 +-
server/scripting/tolua_server_gen.c | 10 +-
server/scripting/tolua_server_gen.h | 2 +-
server/settings.c | 28 +-
server/srv_main.c | 44 +-
server/srv_main.h | 3 +-
server/stdinhand.c | 46 +-
server/stdinhand.h | 4 +-
server/unithand.c | 54 +-
server/unithand.h | 3 +-
server/unittools.c | 4 +-
tools/civmanual.c | 4 +-
tools/mpcmdline.c | 3 +-
translations/freeciv/ar.gmo | Bin 190167 -> 189864 bytes
translations/freeciv/ar.po | 3757 ++--
translations/freeciv/bg.gmo | Bin 119624 -> 119377 bytes
translations/freeciv/bg.po | 3742 ++--
translations/freeciv/ca.gmo | Bin 1007410 -> 1024533 bytes
translations/freeciv/ca.po | 4026 +++--
translations/freeciv/cs.gmo | Bin 215991 -> 214502 bytes
translations/freeciv/cs.po | 3771 ++--
translations/freeciv/da.gmo | Bin 570712 -> 564280 bytes
translations/freeciv/da.po | 3833 ++--
translations/freeciv/de.gmo | Bin 1010504 -> 1000567 bytes
translations/freeciv/de.po | 3853 ++--
translations/freeciv/el.gmo | Bin 247758 -> 245533 bytes
translations/freeciv/el.po | 3805 ++--
translations/freeciv/en_GB.gmo | Bin 960479 -> 962875 bytes
translations/freeciv/en_GB.po | 3946 ++--
translations/freeciv/eo.gmo | Bin 177959 -> 176400 bytes
translations/freeciv/eo.po | 3747 ++--
translations/freeciv/es.gmo | Bin 1037529 -> 1040204 bytes
translations/freeciv/es.po | 3919 ++--
translations/freeciv/et.gmo | Bin 229190 -> 227478 bytes
translations/freeciv/et.po | 3771 ++--
translations/freeciv/fa.gmo | Bin 96136 -> 96136 bytes
translations/freeciv/fa.po | 3752 ++--
translations/freeciv/fi.gmo | Bin 1013862 -> 1016548 bytes
translations/freeciv/fi.po | 3891 ++--
translations/freeciv/fr.gmo | Bin 1050222 -> 1052897 bytes
translations/freeciv/fr.po | 3923 ++--
translations/freeciv/freeciv.pot | 3724 ++--
translations/freeciv/ga.gmo | Bin 210989 -> 210707 bytes
translations/freeciv/ga.po | 3745 ++--
translations/freeciv/gd.gmo | Bin 802213 -> 795218 bytes
translations/freeciv/gd.po | 3848 ++--
translations/freeciv/he.gmo | Bin 97655 -> 97381 bytes
translations/freeciv/he.po | 3756 ++--
translations/freeciv/hu.gmo | Bin 141202 -> 140508 bytes
translations/freeciv/hu.po | 3760 ++--
translations/freeciv/id.gmo | Bin 216538 -> 215769 bytes
translations/freeciv/id.po | 3755 ++--
translations/freeciv/it.gmo | Bin 476916 -> 473855 bytes
translations/freeciv/it.po | 3819 ++--
translations/freeciv/ja.gmo | Bin 992757 -> 1061863 bytes
translations/freeciv/ja.po | 5918 +++---
translations/freeciv/ko.gmo | Bin 429513 -> 423645 bytes
translations/freeciv/ko.po | 3811 ++--
translations/freeciv/lt.gmo | Bin 177385 -> 176757 bytes
translations/freeciv/lt.po | 3773 ++--
translations/freeciv/nb.gmo | Bin 195777 -> 194250 bytes
translations/freeciv/nb.po | 3773 ++--
translations/freeciv/nl.gmo | Bin 406987 -> 403534 bytes
translations/freeciv/nl.po | 3775 ++--
translations/freeciv/pl.gmo | Bin 908697 -> 899428 bytes
translations/freeciv/pl.po | 3846 ++--
translations/freeciv/pt.gmo | Bin 131013 -> 130445 bytes
translations/freeciv/pt.po | 3766 ++--
translations/freeciv/pt_BR.gmo | Bin 432375 -> 430492 bytes
translations/freeciv/pt_BR.po | 3810 ++--
translations/freeciv/ro.gmo | Bin 199037 -> 198254 bytes
translations/freeciv/ro.po | 3766 ++--
translations/freeciv/ru.gmo | Bin 1387938 -> 1401825 bytes
translations/freeciv/ru.po | 21825 +++--------------------
translations/freeciv/sr.gmo | Bin 145162 -> 144669 bytes
translations/freeciv/sr.po | 3743 ++--
translations/freeciv/sv.gmo | Bin 297238 -> 295373 bytes
translations/freeciv/sv.po | 3804 ++--
translations/freeciv/tr.gmo | Bin 228285 -> 226528 bytes
translations/freeciv/tr.po | 3794 ++--
translations/freeciv/uk.gmo | Bin 515471 -> 512718 bytes
translations/freeciv/uk.po | 3769 ++--
translations/freeciv/zh_CN.gmo | Bin 165500 -> 164600 bytes
translations/freeciv/zh_CN.po | 3758 ++--
translations/freeciv/zh_TW.gmo | Bin 98755 -> 98755 bytes
translations/freeciv/zh_TW.po | 3732 ++--
translations/nations/ar.gmo | Bin 8111 -> 8111 bytes
translations/nations/ar.po | 4 +-
translations/nations/bg.gmo | Bin 25942 -> 25942 bytes
translations/nations/bg.po | 4 +-
translations/nations/ca.gmo | Bin 439462 -> 439418 bytes
translations/nations/ca.po | 14 +-
translations/nations/cs.gmo | Bin 14232 -> 14232 bytes
translations/nations/cs.po | 4 +-
translations/nations/da.gmo | Bin 136522 -> 136522 bytes
translations/nations/da.po | 4 +-
translations/nations/de.gmo | Bin 236328 -> 236278 bytes
translations/nations/de.po | 5 +-
translations/nations/el.gmo | Bin 16120 -> 16120 bytes
translations/nations/el.po | 4 +-
translations/nations/en_GB.gmo | Bin 430139 -> 430141 bytes
translations/nations/en_GB.po | 10 +-
translations/nations/eo.gmo | Bin 15192 -> 15192 bytes
translations/nations/eo.po | 4 +-
translations/nations/es.gmo | Bin 442542 -> 442543 bytes
translations/nations/es.po | 10 +-
translations/nations/et.gmo | Bin 22087 -> 22087 bytes
translations/nations/et.po | 4 +-
translations/nations/fa.gmo | Bin 9777 -> 9777 bytes
translations/nations/fa.po | 4 +-
translations/nations/fi.gmo | Bin 277433 -> 290157 bytes
translations/nations/fi.po | 194 +-
translations/nations/fr.gmo | Bin 449518 -> 449519 bytes
translations/nations/fr.po | 6 +-
translations/nations/freeciv-nations.pot | 4 +-
translations/nations/ga.gmo | Bin 57007 -> 56956 bytes
translations/nations/ga.po | 5 +-
translations/nations/gd.gmo | Bin 332115 -> 332059 bytes
translations/nations/gd.po | 5 +-
translations/nations/he.gmo | Bin 8205 -> 8205 bytes
translations/nations/he.po | 4 +-
translations/nations/hu.gmo | Bin 5157 -> 5157 bytes
translations/nations/hu.po | 4 +-
translations/nations/id.gmo | Bin 93658 -> 93595 bytes
translations/nations/id.po | 5 +-
translations/nations/it.gmo | Bin 53499 -> 53499 bytes
translations/nations/it.po | 4 +-
translations/nations/ja.gmo | Bin 411935 -> 418742 bytes
translations/nations/ja.po | 137 +-
translations/nations/ko.gmo | Bin 25039 -> 24991 bytes
translations/nations/ko.po | 5 +-
translations/nations/lt.gmo | Bin 24758 -> 24758 bytes
translations/nations/lt.po | 4 +-
translations/nations/nb.gmo | Bin 6977 -> 6977 bytes
translations/nations/nb.po | 4 +-
translations/nations/nl.gmo | Bin 161986 -> 161936 bytes
translations/nations/nl.po | 5 +-
translations/nations/pl.gmo | Bin 441176 -> 441094 bytes
translations/nations/pl.po | 5 +-
translations/nations/pt.gmo | Bin 4748 -> 4748 bytes
translations/nations/pt.po | 4 +-
translations/nations/pt_BR.gmo | Bin 51658 -> 51658 bytes
translations/nations/pt_BR.po | 4 +-
translations/nations/ro.gmo | Bin 6160 -> 6160 bytes
translations/nations/ro.po | 4 +-
translations/nations/ru.gmo | Bin 622771 -> 622776 bytes
translations/nations/ru.po | 8 +-
translations/nations/sr.gmo | Bin 7952 -> 7952 bytes
translations/nations/sr.po | 4 +-
translations/nations/sv.gmo | Bin 32776 -> 32776 bytes
translations/nations/sv.po | 4 +-
translations/nations/tr.gmo | Bin 10677 -> 10677 bytes
translations/nations/tr.po | 4 +-
translations/nations/uk.gmo | Bin 83765 -> 83765 bytes
translations/nations/uk.po | 4 +-
translations/nations/zh_CN.gmo | Bin 12245 -> 12245 bytes
translations/nations/zh_CN.po | 4 +-
translations/nations/zh_TW.gmo | Bin 33758 -> 33716 bytes
translations/nations/zh_TW.po | 5 +-
utility/fcintl.c | 6 +-
win32/installer/Makefile | 6 +-
300 files changed, 77109 insertions(+), 88412 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freeciv.git
More information about the Pkg-games-commits
mailing list