[freeciv] 01/01: Merge branch 'master' into stretch-backports
Markus Koschany
apo at moszumanska.debian.org
Fri Sep 1 16:25:01 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch stretch-backports
in repository freeciv.
commit a29627503389cf1b1b6c61e58897e96c7aca3c68
Merge: 6173b25 a1d74e0
Author: Markus Koschany <apo at debian.org>
Date: Fri Sep 1 09:09:48 2017 +0200
Merge branch 'master' into stretch-backports
ChangeLog | 660 ++++++++++++++++
INSTALL | 12 +-
Makefile.am | 2 -
Makefile.in | 2 -
NEWS-2.5 | 113 ++-
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/nation/muskogee.ruleset | 2 +-
data/themes/gui-sdl/human/theme.themespec | 4 +-
debian/changelog | 19 +-
debian/control | 2 +-
debian/freeciv-client-extras.install | 2 +-
debian/freeciv-client-gtk.install | 2 +-
debian/freeciv-client-gtk3.install | 2 +-
debian/freeciv-client-qt.install | 2 +-
debian/freeciv-client-sdl.install | 2 +-
debian/freeciv-server.install | 2 +-
debian/patches/themes_sdl_use_system_fonts.patch | 13 +-
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 | 4 +-
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 -> 1024908 bytes
translations/freeciv/ca.po | 904 +++++++++++-----------
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 -> 1402050 bytes
translations/freeciv/ru.po | 920 +++++++++++------------
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 -> 8073 bytes
translations/nations/ar.po | 9 +-
translations/nations/bg.gmo | Bin 25942 -> 25894 bytes
translations/nations/bg.po | 9 +-
translations/nations/ca.gmo | Bin 439418 -> 439414 bytes
translations/nations/ca.po | 79 +-
translations/nations/cs.gmo | Bin 14232 -> 14197 bytes
translations/nations/cs.po | 9 +-
translations/nations/da.gmo | Bin 136522 -> 136486 bytes
translations/nations/da.po | 9 +-
translations/nations/de.gmo | Bin 236278 -> 236240 bytes
translations/nations/de.po | 9 +-
translations/nations/el.gmo | Bin 16120 -> 16074 bytes
translations/nations/el.po | 9 +-
translations/nations/en_GB.gmo | Bin 430143 -> 430077 bytes
translations/nations/en_GB.po | 9 +-
translations/nations/eo.gmo | Bin 15192 -> 15121 bytes
translations/nations/eo.po | 9 +-
translations/nations/es.gmo | Bin 442543 -> 442471 bytes
translations/nations/es.po | 9 +-
translations/nations/et.gmo | Bin 22087 -> 22050 bytes
translations/nations/et.po | 9 +-
translations/nations/fa.gmo | Bin 9777 -> 9699 bytes
translations/nations/fa.po | 9 +-
translations/nations/fi.gmo | Bin 290157 -> 305593 bytes
translations/nations/fi.po | 144 +++-
translations/nations/fr.gmo | Bin 449519 -> 449451 bytes
translations/nations/fr.po | 13 +-
translations/nations/freeciv-nations.pot | 6 +-
translations/nations/ga.gmo | Bin 56956 -> 56909 bytes
translations/nations/ga.po | 9 +-
translations/nations/gd.gmo | Bin 332059 -> 332014 bytes
translations/nations/gd.po | 9 +-
translations/nations/he.gmo | Bin 8205 -> 8157 bytes
translations/nations/he.po | 9 +-
translations/nations/hu.gmo | Bin 5157 -> 5123 bytes
translations/nations/hu.po | 9 +-
translations/nations/id.gmo | Bin 93595 -> 93554 bytes
translations/nations/id.po | 9 +-
translations/nations/it.gmo | Bin 53499 -> 53432 bytes
translations/nations/it.po | 9 +-
translations/nations/ja.gmo | Bin 418742 -> 418701 bytes
translations/nations/ja.po | 9 +-
translations/nations/ko.gmo | Bin 24991 -> 24959 bytes
translations/nations/ko.po | 9 +-
translations/nations/lt.gmo | Bin 24758 -> 24700 bytes
translations/nations/lt.po | 9 +-
translations/nations/nb.gmo | Bin 6977 -> 6925 bytes
translations/nations/nb.po | 9 +-
translations/nations/nl.gmo | Bin 161936 -> 161899 bytes
translations/nations/nl.po | 9 +-
translations/nations/pl.gmo | Bin 441094 -> 441056 bytes
translations/nations/pl.po | 9 +-
translations/nations/pt.gmo | Bin 4748 -> 4689 bytes
translations/nations/pt.po | 9 +-
translations/nations/pt_BR.gmo | Bin 51658 -> 51623 bytes
translations/nations/pt_BR.po | 9 +-
translations/nations/ro.gmo | Bin 6160 -> 6126 bytes
translations/nations/ro.po | 9 +-
translations/nations/ru.gmo | Bin 622772 -> 622694 bytes
translations/nations/ru.po | 8 +-
translations/nations/sr.gmo | Bin 7952 -> 7910 bytes
translations/nations/sr.po | 9 +-
translations/nations/sv.gmo | Bin 32776 -> 32739 bytes
translations/nations/sv.po | 9 +-
translations/nations/tr.gmo | Bin 10677 -> 10641 bytes
translations/nations/tr.po | 9 +-
translations/nations/uk.gmo | Bin 154775 -> 154729 bytes
translations/nations/uk.po | 9 +-
translations/nations/zh_CN.gmo | Bin 12245 -> 12197 bytes
translations/nations/zh_CN.po | 9 +-
translations/nations/zh_TW.gmo | Bin 33716 -> 33649 bytes
translations/nations/zh_TW.po | 9 +-
utility/fc_utf8.c | 2 +-
utility/ioz.c | 2 +-
win32/installer/Makefile | 5 +-
255 files changed, 18291 insertions(+), 17131 deletions(-)
diff --cc debian/changelog
index dc270cf,50e2b9c..9aa3374
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,17 +1,23 @@@
- freeciv (2.5.7-2~bpo9+1) stretch-backports; urgency=medium
++freeciv (2.5.9-1~bpo9+1) stretch-backports; urgency=medium
+
+ * Rebuild for stretch-backports.
+
- -- Markus Koschany <apo at debian.org> Sun, 02 Jul 2017 16:20:56 +0200
++ -- Markus Koschany <apo at debian.org> Fri, 01 Sep 2017 09:10:17 +0200
++
+ freeciv (2.5.9-1) unstable; urgency=medium
+
+ * New upstream version 2.5.9.
+
+ -- Markus Koschany <apo at debian.org> Sat, 19 Aug 2017 18:00:13 +0200
+
+ freeciv (2.5.8-1) unstable; urgency=medium
+
+ * New upstream version 2.5.8.
+ * Declare compliance with Debian Policy 4.0.1.
+ * Refresh themes_sdl_use_system_fonts.patch.
+ * Install appdata files into metainfo directory.
+
+ -- Markus Koschany <apo at debian.org> Thu, 17 Aug 2017 17:51:09 +0200
freeciv (2.5.7-2) unstable; urgency=medium
--
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