This is an automated email from the git hooks/post-receive script.
apo pushed a change to branch upstream
in repository freeciv.
from 9994989 Imported Upstream version 2.5.5
new bd2f246 New upstream version 2.5.6
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
ChangeLog | 1241 ++
Makefile.in | 1 +
NEWS-2.5 | 160 +-
ai/Makefile.in | 1 +
ai/classic/Makefile.in | 1 +
ai/default/Makefile.in | 1 +
ai/default/aisettler.c | 7 +-
ai/default/aiunit.c | 6 +-
ai/stub/Makefile.in | 1 +
ai/threaded/Makefile.in | 1 +
client/Makefile.in | 1 +
client/agents/Makefile.in | 1 +
client/audio.c | 9 +-
client/client_main.c | 24 +-
client/client_main.h | 5 +-
client/clinet.c | 2 +-
client/control.c | 3 +-
client/gui-gtk-2.0/Makefile.in | 1 +
client/gui-gtk-2.0/gui_main.c | 1 +
client/gui-gtk-3.0/Makefile.in | 1 +
client/gui-gtk-3.0/citydlg.c | 8 +-
client/gui-gtk-3.0/gui_main.c | 1 +
client/gui-gtk-3.0/gui_stuff.c | 41 +-
client/gui-gtk-3.0/pages.c | 23 +-
client/gui-qt/Makefile.in | 1 +
client/gui-qt/canvas.cpp | 4 +-
client/gui-qt/chatline.cpp | 22 +-
client/gui-qt/chatline.h | 9 +
client/gui-qt/citydlg.cpp | 2 +-
client/gui-qt/cityrep.cpp | 2 +-
client/gui-qt/dialogs.cpp | 12 +-
client/gui-qt/fc_client.cpp | 30 +-
client/gui-qt/fc_client.h | 1 +
client/gui-qt/gui_main.cpp | 9 +
client/gui-qt/gui_main.h | 3 +
client/gui-qt/mapview.cpp | 1 +
client/gui-qt/menu.cpp | 13 +
client/gui-qt/menu.h | 1 +
client/gui-qt/pages.cpp | 21 +-
client/gui-qt/plrdlg.cpp | 2 +-
client/gui-qt/themes.cpp | 6 +-
client/gui-sdl/Makefile.in | 1 +
client/gui-sdl/citydlg.c | 8 +-
client/gui-sdl/diplodlg.c | 30 +-
client/gui-sdl/gotodlg.c | 2 +-
client/gui-sdl/gui_main.c | 52 +-
client/gui-sdl/mapctrl.c | 10 +-
client/gui-sdl/themes.c | 8 +-
client/gui-stub/Makefile.in | 1 +
client/gui-stub/gui_main.c | 4 +
client/gui-xaw/Freeciv.h | 2 +-
client/gui-xaw/Makefile.in | 1 +
client/gui-xaw/gui_main.c | 87 +-
client/include/Makefile.in | 1 +
client/luascript/Makefile.in | 1 +
client/luascript/tolua_client_gen.h | 2 +-
client/mapctrl_common.c | 1 +
client/update_queue.c | 7 +
client/update_queue.h | 4 +-
common/Makefile.in | 1 +
common/aicore/Makefile.in | 1 +
common/aicore/caravan.c | 18 +-
common/city.c | 62 +-
common/connection.c | 2 +-
common/fc_types.h | 8 +-
common/featured_text.c | 4 +-
common/featured_text.h | 2 +-
common/game.c | 6 +-
common/improvement.c | 8 +-
common/player.c | 2 -
common/requirements.c | 196 +-
common/scriptcore/Makefile.in | 1 +
common/scriptcore/tolua_common_a_gen.h | 2 +-
common/scriptcore/tolua_common_z_gen.h | 2 +-
common/scriptcore/tolua_game_gen.c | 22 +-
common/scriptcore/tolua_game_gen.h | 2 +-
common/scriptcore/tolua_signal_gen.h | 2 +-
common/spaceship.c | 2 +-
common/spaceship.h | 2 +-
common/tile.h | 2 +-
common/unit.c | 6 +-
common/unit.h | 2 +-
common/vision.c | 1 -
common/vision.h | 2 +-
configure | 56 +-
configure.ac | 6 +-
data/Freeciv | 2 +-
data/Makefile.in | 1 +
data/amplio2/Makefile.in | 1 +
data/amplio2/ancientcities.spec | 2 +-
data/amplio2/medievalcities.spec | 2 +-
data/amplio2/moderncities.spec | 2 +-
data/buildings/Makefile.in | 1 +
data/cimpletoon/Makefile.in | 1 +
data/civ1/Makefile.in | 1 +
data/civ2/Makefile.in | 1 +
data/civ2civ3/Makefile.in | 1 +
data/classic/Makefile.in | 1 +
data/default/Makefile.in | 1 +
data/experimental/Makefile.in | 1 +
data/flags/Makefile.in | 1 +
data/hex2t/Makefile.in | 1 +
data/hex2t/select.png | Bin 731 -> 751 bytes
data/hex2t/select.spec | 2 +-
data/icons/Makefile.in | 1 +
data/isophex/Makefile.in | 1 +
data/isotrident/Makefile.in | 1 +
data/isotrident/cities.spec | 2 +-
data/isotrident/morecities.spec | 2 +-
data/misc/Makefile.in | 1 +
data/multiplayer/Makefile.in | 1 +
data/nation/Makefile.in | 1 +
data/nation/lycian.ruleset | 1 -
data/nation/texan.ruleset | 1 -
data/scenarios/Makefile.in | 1 +
data/stdsounds/Makefile.in | 1 +
data/themes/Makefile.in | 1 +
data/themes/gui-gtk-2.0/Freeciv/Makefile.in | 1 +
.../gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile.in | 1 +
.../Freeciv/gtk-2.0/Buttons/Makefile.in | 1 +
.../Freeciv/gtk-2.0/Check-Radio/Makefile.in | 1 +
.../gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile.in | 1 +
.../Freeciv/gtk-2.0/Frame-Gap/Makefile.in | 1 +
.../Freeciv/gtk-2.0/Handles/Makefile.in | 1 +
.../gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile.in | 1 +
.../Freeciv/gtk-2.0/ListHeaders/Makefile.in | 1 +
.../themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile.in | 1 +
.../Freeciv/gtk-2.0/Menu-Menubar/Makefile.in | 1 +
.../gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile.in | 1 +
.../gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile.in | 1 +
.../Freeciv/gtk-2.0/ProgressBar/Makefile.in | 1 +
.../gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile.in | 1 +
.../Freeciv/gtk-2.0/Scrollbars/Makefile.in | 1 +
.../Freeciv/gtk-2.0/Shadows/Makefile.in | 1 +
.../gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile.in | 1 +
.../gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile.in | 1 +
.../Freeciv/gtk-2.0/Toolbar/Makefile.in | 1 +
data/themes/gui-gtk-2.0/Makefile.in | 1 +
data/themes/gui-gtk-3.0/Freeciv/Makefile.in | 1 +
.../gui-gtk-3.0/Freeciv/gtk-3.0/Arrows/Makefile.in | 1 +
.../Freeciv/gtk-3.0/Buttons/Makefile.in | 1 +
.../Freeciv/gtk-3.0/Check-Radio/Makefile.in | 1 +
.../gui-gtk-3.0/Freeciv/gtk-3.0/Combo/Makefile.in | 1 +
.../Freeciv/gtk-3.0/Frame-Gap/Makefile.in | 1 +
.../Freeciv/gtk-3.0/Handles/Makefile.in | 1 +
.../gui-gtk-3.0/Freeciv/gtk-3.0/Lines/Makefile.in | 1 +
.../Freeciv/gtk-3.0/ListHeaders/Makefile.in | 1 +
.../themes/gui-gtk-3.0/Freeciv/gtk-3.0/Makefile.in | 1 +
.../Freeciv/gtk-3.0/Menu-Menubar/Makefile.in | 1 +
.../gui-gtk-3.0/Freeciv/gtk-3.0/Others/Makefile.in | 1 +
.../gui-gtk-3.0/Freeciv/gtk-3.0/Panel/Makefile.in | 1 +
.../Freeciv/gtk-3.0/ProgressBar/Makefile.in | 1 +
.../gui-gtk-3.0/Freeciv/gtk-3.0/Range/Makefile.in | 1 +
.../Freeciv/gtk-3.0/Scrollbars/Makefile.in | 1 +
.../Freeciv/gtk-3.0/Shadows/Makefile.in | 1 +
.../gui-gtk-3.0/Freeciv/gtk-3.0/Spin/Makefile.in | 1 +
.../gui-gtk-3.0/Freeciv/gtk-3.0/Tabs/Makefile.in | 1 +
.../Freeciv/gtk-3.0/Toolbar/Makefile.in | 1 +
data/themes/gui-gtk-3.0/Freeciv/gtk-3.0/gtk.css | 3 +-
data/themes/gui-gtk-3.0/Makefile.in | 1 +
data/themes/gui-qt/Makefile.in | 1 +
data/themes/gui-qt/icons/Makefile.in | 1 +
data/themes/gui-sdl/Makefile.in | 1 +
data/themes/gui-sdl/human/Makefile.in | 1 +
data/trident/Makefile.in | 1 +
data/trident/cities.spec | 2 +-
data/wonders/Makefile.in | 1 +
data/wonders/mausoleum_of_halicarnassus.png | Bin 7097 -> 6209 bytes
data/wonders/temple_of_artemis.png | Bin 9189 -> 7966 bytes
dependencies/Makefile.in | 1 +
dependencies/cvercmp/Makefile.in | 1 +
dependencies/lua-5.2/Makefile.in | 1 +
dependencies/lua-5.2/src/Makefile.in | 1 +
dependencies/luasql/Makefile.in | 1 +
dependencies/luasql/src/Makefile.in | 1 +
dependencies/tolua-5.2/Makefile.in | 1 +
dependencies/tolua-5.2/src/Makefile.in | 1 +
dependencies/tolua-5.2/src/bin/Makefile.in | 1 +
dependencies/tolua-5.2/src/lib/Makefile.in | 1 +
doc/CodingStyle | 2 +-
doc/Makefile.in | 1 +
doc/README.effects | 4 +-
doc/ca/Makefile.in | 1 +
doc/de/Makefile.in | 1 +
doc/fr/Makefile.in | 1 +
doc/it/Makefile.in | 1 +
doc/ja/Makefile.in | 1 +
doc/man/Makefile.in | 1 +
doc/man/freeciv-client.6.in | 6 +-
doc/nl/Makefile.in | 1 +
doc/sv/Makefile.in | 1 +
fc_version | 2 +-
lua/Makefile.in | 1 +
server/Makefile.in | 1 +
server/advisors/Makefile.in | 1 +
server/advisors/advbuilding.c | 4 +-
server/cityturn.c | 2 -
server/generator/Makefile.in | 1 +
server/maphand.c | 11 +
server/ruleset.c | 62 +-
server/scripting/Makefile.in | 1 +
server/scripting/tolua_fcdb_gen.h | 2 +-
server/scripting/tolua_server_gen.c | 8 +-
server/scripting/tolua_server_gen.h | 2 +-
server/sernet.c | 25 +-
server/settings.c | 4 +-
server/srv_main.c | 6 +
server/stdinhand.c | 11 +-
server/stdinhand.h | 6 +-
server/unithand.c | 20 +-
server/unittools.c | 60 +-
tests/Makefile.in | 1 +
tools/Makefile.in | 1 +
translations/Makefile.in | 1 +
translations/freeciv/ar.gmo | Bin 189864 -> 189864
bytes
translations/freeciv/ar.po | 2115 +--
translations/freeciv/bg.gmo | Bin 119377 -> 119377
bytes
translations/freeciv/bg.po | 2115 +--
translations/freeciv/ca.gmo | Bin 1024533 -> 1024533
bytes
translations/freeciv/ca.po | 2115 +--
translations/freeciv/cs.gmo | Bin 214502 -> 214502
bytes
translations/freeciv/cs.po | 2115 +--
translations/freeciv/da.gmo | Bin 564280 -> 564280
bytes
translations/freeciv/da.po | 2115 +--
translations/freeciv/de.gmo | Bin 1000567 -> 1039720
bytes
translations/freeciv/de.po | 3146 ++--
translations/freeciv/el.gmo | Bin 245533 -> 245533
bytes
translations/freeciv/el.po | 2115 +--
translations/freeciv/en_GB.gmo | Bin 962875 -> 962875
bytes
translations/freeciv/en_GB.po | 2115 +--
translations/freeciv/eo.gmo | Bin 176400 -> 176400
bytes
translations/freeciv/eo.po | 2115 +--
translations/freeciv/es.gmo | Bin 1040204 -> 1040204
bytes
translations/freeciv/es.po | 2115 +--
translations/freeciv/et.gmo | Bin 227478 -> 227478
bytes
translations/freeciv/et.po | 2115 +--
translations/freeciv/fa.gmo | Bin 96136 -> 96136 bytes
translations/freeciv/fa.po | 2115 +--
translations/freeciv/fi.gmo | Bin 1016548 -> 1016546
bytes
translations/freeciv/fi.po | 2145 +--
translations/freeciv/fr.gmo | Bin 1052897 -> 1052897
bytes
translations/freeciv/fr.po | 2115 +--
translations/freeciv/freeciv.pot | 2115 +--
translations/freeciv/ga.gmo | Bin 210707 -> 210707
bytes
translations/freeciv/ga.po | 2115 +--
translations/freeciv/gd.gmo | Bin 795218 -> 795218
bytes
translations/freeciv/gd.po | 2115 +--
translations/freeciv/he.gmo | Bin 97381 -> 97381 bytes
translations/freeciv/he.po | 2115 +--
translations/freeciv/hu.gmo | Bin 140508 -> 140508
bytes
translations/freeciv/hu.po | 2115 +--
translations/freeciv/id.gmo | Bin 215769 -> 215769
bytes
translations/freeciv/id.po | 2115 +--
translations/freeciv/it.gmo | Bin 473855 -> 473855
bytes
translations/freeciv/it.po | 2117 +--
translations/freeciv/ja.gmo | Bin 1061863 -> 1061863
bytes
translations/freeciv/ja.po | 2115 +--
translations/freeciv/ko.gmo | Bin 423645 -> 423645
bytes
translations/freeciv/ko.po | 2115 +--
translations/freeciv/lt.gmo | Bin 176757 -> 176757
bytes
translations/freeciv/lt.po | 2115 +--
translations/freeciv/nb.gmo | Bin 194250 -> 194250
bytes
translations/freeciv/nb.po | 2115 +--
translations/freeciv/nl.gmo | Bin 403534 -> 403534
bytes
translations/freeciv/nl.po | 2115 +--
translations/freeciv/pl.gmo | Bin 899428 -> 899428
bytes
translations/freeciv/pl.po | 2115 +--
translations/freeciv/pt.gmo | Bin 130445 -> 130445
bytes
translations/freeciv/pt.po | 2115 +--
translations/freeciv/pt_BR.gmo | Bin 430492 -> 430492
bytes
translations/freeciv/pt_BR.po | 2115 +--
translations/freeciv/ro.gmo | Bin 198254 -> 198254
bytes
translations/freeciv/ro.po | 2115 +--
translations/freeciv/ru.gmo | Bin 1401825 -> 1401697
bytes
translations/freeciv/ru.po | 2161 +--
translations/freeciv/sr.gmo | Bin 144669 -> 144669
bytes
translations/freeciv/sr.po | 2115 +--
translations/freeciv/sv.gmo | Bin 295373 -> 295373
bytes
translations/freeciv/sv.po | 2115 +--
translations/freeciv/tr.gmo | Bin 226528 -> 226528
bytes
translations/freeciv/tr.po | 2115 +--
translations/freeciv/uk.gmo | Bin 512718 -> 1269102
bytes
translations/freeciv/uk.po | 14225 ++++++++++---------
translations/freeciv/zh_CN.gmo | Bin 164600 -> 164600
bytes
translations/freeciv/zh_CN.po | 2115 +--
translations/freeciv/zh_TW.gmo | Bin 98755 -> 98755 bytes
translations/freeciv/zh_TW.po | 2115 +--
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 -> 439418
bytes
translations/nations/ca.po | 2 +-
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 430141 -> 430141
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 -> 290157
bytes
translations/nations/fi.po | 2 +-
translations/nations/fr.gmo | Bin 449519 -> 449519
bytes
translations/nations/fr.po | 2 +-
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 622776 -> 622772
bytes
translations/nations/ru.po | 6 +-
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 83765 -> 151556
bytes
translations/nations/uk.po | 2374 ++--
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/Makefile.in | 1 +
utility/netintf.c | 15 +-
utility/netintf.h | 8 +-
utility/shared.h | 14 +-
utility/specvec.h | 1 +
utility/support.c | 7 +-
win32/Makefile.in | 1 +
win32/installer/freeciv-mp-qt.cmd | 2 +-
win32/installer/freeciv-qt.cmd | 8 +-
369 files changed, 49823 insertions(+), 46834 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
