[megaglest] branch upstream updated (aef4f49 -> 6c93fa8)
Markus Koschany
apo-guest at moszumanska.debian.org
Tue Mar 17 17:11:14 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a change to branch upstream
in repository megaglest.
from aef4f49 Imported Upstream version 3.11.0+dfsg
new 6c93fa8 Imported Upstream version 3.11.1
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:
CMakeLists.txt | 173 ++++++++------
docs/CHANGELOG.txt | 12 +
docs/README.release-management.txt | 32 +--
mk/cmake/Modules/FindFriBiDi.cmake | 13 +-
mk/cmake/Modules/FindIrcclient.cmake | 4 +-
mk/linux/build-mg.sh | 10 +
mk/linux/make-binary-archive.sh | 1 +
mk/linux/make-data-archive.sh | 33 ++-
mk/linux/mg-version-synch.sh | 119 +++++++---
mk/linux/mg-version.sh | 15 +-
mk/linux/mojosetup/megaglest-installer/make.sh | 2 +-
.../megaglest-installer/scripts/config.lua | 10 +-
mk/linux/setupBuildDeps.sh | 130 ++++++-----
mk/linux/start_megaglest_gameserver | 9 +-
mk/macosx/.gitignore | 13 ++
mk/macosx/CMakeLists.txt | 70 +++---
mk/macosx/PkgInfo | 2 -
mk/macosx/build-mg.sh | 214 +++++++++++++++++
.../{Info.plist => bundle_resources/Info.plist.in} | 12 +-
mk/macosx/{ => bundle_resources}/MegaGlest.icns | Bin
mk/macosx/bundle_resources/MegaGlest.sh | 12 +
mk/{linux => macosx}/glest-dev.ini | 0
mk/{windoze => macosx}/glest.ini | 23 +-
mk/macosx/make-binary-archive.sh | 67 ++++++
mk/macosx/make-release-archives.sh | 55 +++++
.../start_headless_gameserver.sh} | 13 +-
mk/shared/servers.ini | 8 +-
mk/windoze/Installer/MegaGlestInstaller.nsi | 4 +-
mk/windoze/Installer/MegaGlestUpdater.nsi | 6 +-
mk/windoze/Installer/make_installer.sh | 14 +-
mk/windoze/Installer/plugins/AccessControl.txt | 253 ---------------------
servers.ini | 8 +-
setupBuildDeps.sh | 130 ++++++-----
source/g3d_viewer/CMakeLists.txt | 43 ++--
source/g3d_viewer/main.cpp | 2 +-
source/glest_game/CMakeLists.txt | 93 +++++---
source/glest_game/facilities/game_util.cpp | 4 +-
source/glest_game/game/game.cpp | 71 +++---
source/glest_game/game/game.h | 1 +
source/glest_game/gui/gui.cpp | 16 +-
.../glest_game/menu/menu_state_connected_game.cpp | 4 +-
source/glest_game/menu/menu_state_options.cpp | 4 +-
source/glest_game/types/upgrade_type.cpp | 12 +-
source/glest_map_editor/CMakeLists.txt | 44 ++--
source/glest_map_editor/main.cpp | 90 +++++---
source/glest_map_editor/main.h | 6 +
source/glest_map_editor/program.cpp | 20 +-
source/glest_map_editor/program.h | 7 +-
source/shared_lib/CMakeLists.txt | 27 ++-
source/shared_lib/include/map/map_preview.h | 8 +-
source/shared_lib/sources/map/map_preview.cpp | 110 +++++----
source/tests/CMakeLists.txt | 42 ++--
source/version.txt | 13 ++
53 files changed, 1227 insertions(+), 857 deletions(-)
create mode 100644 mk/macosx/.gitignore
delete mode 100644 mk/macosx/PkgInfo
create mode 100755 mk/macosx/build-mg.sh
rename mk/macosx/{Info.plist => bundle_resources/Info.plist.in} (69%)
rename mk/macosx/{ => bundle_resources}/MegaGlest.icns (100%)
create mode 100755 mk/macosx/bundle_resources/MegaGlest.sh
copy mk/{linux => macosx}/glest-dev.ini (100%)
copy mk/{windoze => macosx}/glest.ini (91%)
create mode 100755 mk/macosx/make-binary-archive.sh
create mode 100755 mk/macosx/make-release-archives.sh
copy mk/{linux/start_megaglest_gameserver => macosx/start_headless_gameserver.sh} (80%)
delete mode 100644 mk/windoze/Installer/plugins/AccessControl.txt
create mode 100644 source/version.txt
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/megaglest.git
More information about the Pkg-games-commits
mailing list