[springlobby] 02/03: Merge tag 'upstream/0.255+dfsg'
Markus Koschany
apo at moszumanska.debian.org
Fri Aug 5 19:34:56 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository springlobby.
commit bfcd9725aeec3c2ee2e6d1da242d7ed07028f7a7
Merge: 76fc36a 4598ef8
Author: Markus Koschany <apo at debian.org>
Date: Fri Aug 5 19:16:13 2016 +0200
Merge tag 'upstream/0.255+dfsg'
Upstream version 0.255+dfsg
# gpg: Signature made Fri 05 Aug 2016 19:16:07 CEST using RSA key ID 513B51E4
# gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
# gpg: aka "Markus Koschany <markus at koschany.net>" [ultimate]
# gpg: aka "Markus Koschany <apo at debian.org>" [ultimate]
ChangeLog | 12 +
VERSION | 2 +-
springlobby_config.h | 2 +-
src/CMakeLists.txt | 14 +-
src/battle.cpp | 2 +-
src/chatlog.cpp | 2 +-
src/downloader/CMakeLists.txt | 5 +
src/{lsl => downloader/lib}/.clang-format | 0
src/downloader/lib/.travis.yml | 3 +-
src/{lsl => downloader/lib}/AUTHORS | 0
src/downloader/lib/CMakeLists.txt | 24 +-
src/{lsl => downloader/lib}/COPYING | 0
src/{lsl => downloader/lib}/NEWS | 0
src/downloader/lib/README.md | 27 +
src/{lsl => downloader/lib}/THANKS | 0
src/downloader/lib/src/CMakeLists.txt | 10 +-
src/downloader/lib/src/Downloader/CurlWrapper.cpp | 15 +-
src/downloader/lib/src/Downloader/CurlWrapper.h | 5 +-
src/downloader/lib/src/Downloader/Download.cpp | 78 +-
src/downloader/lib/src/Downloader/Download.h | 66 +-
src/downloader/lib/src/Downloader/DownloadEnum.cpp | 12 +-
src/downloader/lib/src/Downloader/DownloadEnum.h | 39 +-
.../lib/src/Downloader/Http/DownloadData.cpp | 7 +-
.../lib/src/Downloader/Http/DownloadData.h | 8 +-
.../lib/src/Downloader/Http/HttpDownloader.cpp | 467 +++--
.../lib/src/Downloader/Http/HttpDownloader.h | 75 +-
src/downloader/lib/src/Downloader/IDownloader.cpp | 32 +-
src/downloader/lib/src/Downloader/IDownloader.h | 52 +-
src/downloader/lib/src/Downloader/Mirror.cpp | 12 +-
src/downloader/lib/src/Downloader/Mirror.h | 8 +-
.../lib/src/Downloader/Rapid/RapidDownloader.cpp | 151 +-
.../lib/src/Downloader/Rapid/RapidDownloader.h | 58 +-
src/downloader/lib/src/Downloader/Rapid/Repo.cpp | 58 +-
src/downloader/lib/src/Downloader/Rapid/Repo.h | 26 +-
src/downloader/lib/src/Downloader/Rapid/Sdp.cpp | 240 +--
src/downloader/lib/src/Downloader/Rapid/Sdp.h | 96 +-
src/downloader/lib/src/FileSystem/File.cpp | 218 ++-
src/downloader/lib/src/FileSystem/File.h | 116 +-
src/downloader/lib/src/FileSystem/FileData.cpp | 12 +-
src/downloader/lib/src/FileSystem/FileData.h | 4 +-
src/downloader/lib/src/FileSystem/FileSystem.cpp | 351 ++--
src/downloader/lib/src/FileSystem/FileSystem.h | 104 +-
src/downloader/lib/src/FileSystem/HashMD5.cpp | 22 +-
src/downloader/lib/src/FileSystem/HashMD5.h | 5 +-
src/downloader/lib/src/FileSystem/HashSHA1.cpp | 22 +-
src/downloader/lib/src/FileSystem/HashSHA1.h | 6 +-
src/downloader/lib/src/FileSystem/IArchive.h | 114 +-
src/downloader/lib/src/FileSystem/IHash.cpp | 57 +-
src/downloader/lib/src/FileSystem/IHash.h | 76 +-
.../lib/src/FileSystem/SevenZipArchive.cpp | 90 +-
.../lib/src/FileSystem/SevenZipArchive.h | 48 +-
src/downloader/lib/src/FileSystem/ZipArchive.cpp | 27 +-
src/downloader/lib/src/FileSystem/ZipArchive.h | 13 +-
src/downloader/lib/src/Logger.cpp | 92 +-
src/downloader/lib/src/Logger.h | 26 +-
src/downloader/lib/src/Util.cpp | 66 +-
src/downloader/lib/src/Util.h | 22 +-
src/downloader/lib/src/Version.cpp | 4 +-
src/downloader/lib/src/Version.h | 1 -
src/{lsl => downloader/lib/src}/lib/cimg/CImg.h | 0
.../lib/src}/lib/cimg/Licence_CeCILL-C_V1-en.txt | 0
.../lib/src}/lib/cimg/Licence_CeCILL_V2-en.txt | 0
src/downloader/lib/src/lsl/CMakeLists.txt | 50 +
.../lib/src/lsl}/libSpringLobby.rc | 0
.../lib/src/lsl}/lsl/CMakeLists.txt | 0
.../lib/src/lsl}/lsl/battle/battle.cpp | 6 +-
.../lib/src/lsl}/lsl/battle/battle.h | 0
.../lib/src/lsl}/lsl/battle/enum.h | 0
.../lib/src/lsl}/lsl/battle/ibattle.cpp | 0
.../lib/src/lsl}/lsl/battle/ibattle.h | 12 +-
.../lib/src/lsl}/lsl/battle/offline.cpp | 0
.../lib/src/lsl}/lsl/battle/offline.h | 0
.../lib/src/lsl}/lsl/battle/signals.h | 0
.../lib/src/lsl}/lsl/battle/singleplayer.cpp | 0
.../lib/src/lsl}/lsl/battle/singleplayer.h | 0
.../lib/src/lsl}/lsl/battle/tdfcontainer.cpp | 4 +-
.../lib/src/lsl}/lsl/battle/tdfcontainer.h | 3 +-
.../src => downloader/lib/src/lsl}/lsl/channel.cpp | 0
.../src => downloader/lib/src/lsl}/lsl/channel.h | 0
.../lib/src/lsl}/lsl/container/base.cc | 0
.../lib/src/lsl}/lsl/container/base.h | 3 +-
.../lib/src/lsl}/lsl/container/battlelist.cpp | 0
.../lib/src/lsl}/lsl/container/battlelist.h | 0
.../lib/src/lsl}/lsl/container/channellist.cpp | 0
.../lib/src/lsl}/lsl/container/channellist.h | 0
.../lib/src/lsl}/lsl/container/userlist.cpp | 0
.../lib/src/lsl}/lsl/container/userlist.h | 0
.../lib/src/lsl}/lsl/networking/commands.cpp | 3 +-
.../lib/src/lsl}/lsl/networking/commands.h | 27 +-
.../lib/src/lsl}/lsl/networking/enums.h | 0
.../src/lsl}/lsl/networking/function_templates.h | 33 +-
.../lib/src/lsl}/lsl/networking/iserver.cpp | 3 +-
.../lib/src/lsl}/lsl/networking/iserver.h | 6 +-
.../lib/src/lsl}/lsl/networking/socket.cpp | 0
.../lib/src/lsl}/lsl/networking/socket.h | 0
.../lib/src/lsl}/lsl/networking/tasserver.cpp | 0
.../lib/src/lsl}/lsl/networking/tasserver.h | 0
.../lsl}/lsl/networking/tasserverdataformats.cpp | 0
.../src/lsl}/lsl/networking/tasserverdataformats.h | 24 +-
.../lib/src/lsl}/lsl/spring/spring.cpp | 0
.../lib/src/lsl}/lsl/spring/spring.h | 0
.../lib/src/lsl}/lsl/spring/springprocess.cpp | 0
.../lib/src/lsl}/lsl/spring/springprocess.h | 0
.../lib/src/lsl}/lsl/user/common.cpp | 0
.../lib/src/lsl}/lsl/user/common.h | 0
.../lib/src/lsl}/lsl/user/user.cpp | 0
.../src => downloader/lib/src/lsl}/lsl/user/user.h | 0
.../lib/src/lsl}/lsl/user/userdata.cpp | 0
.../lib/src/lsl}/lsl/user/userdata.h | 9 +-
.../lib/src/lsl}/lslextract/CMakeLists.txt | 0
.../lib/src/lsl}/lslextract/index.html | 0
.../lib/src/lsl}/lslextract/lslextract.cpp | 0
.../lib/src/lsl}/lslextract/server/connection.cpp | 4 +-
.../lib/src/lsl}/lslextract/server/connection.h | 0
.../lsl}/lslextract/server/connection_manager.cpp | 0
.../lsl}/lslextract/server/connection_manager.h | 0
.../lib/src/lsl}/lslextract/server/header.h | 3 +-
.../lib/src/lsl}/lslextract/server/mime_types.cpp | 15 +-
.../lib/src/lsl}/lslextract/server/mime_types.h | 0
.../lib/src/lsl}/lslextract/server/reply.cpp | 0
.../lib/src/lsl}/lslextract/server/reply.h | 3 +-
.../lib/src/lsl}/lslextract/server/request.h | 3 +-
.../src/lsl}/lslextract/server/request_handler.cpp | 0
.../src/lsl}/lslextract/server/request_handler.h | 0
.../src/lsl}/lslextract/server/request_parser.cpp | 0
.../src/lsl}/lslextract/server/request_parser.h | 0
.../lib/src/lsl}/lslextract/server/server.cpp | 2 +-
.../lib/src/lsl}/lslextract/server/server.h | 0
.../lib/src/lsl}/lslunitsync/CMakeLists.txt | 8 +-
.../lib/src/lsl}/lslunitsync/c_api.cpp | 8 +-
.../lib/src/lsl}/lslunitsync/c_api.h | 5 +-
.../lib/src/lsl}/lslunitsync/data.h | 12 +-
.../lib/src/lsl}/lslunitsync/enum.h | 0
.../lib/src/lsl}/lslunitsync/image.cpp | 0
.../lib/src/lsl}/lslunitsync/image.h | 0
.../lib/src/lsl}/lslunitsync/loader.cpp | 2 +
.../lib/src/lsl}/lslunitsync/loader.h | 3 +-
.../lib/src/lsl}/lslunitsync/mmoptionmodel.cpp | 0
.../lib/src/lsl}/lslunitsync/mmoptionmodel.h | 21 +-
.../lib/src/lsl}/lslunitsync/mru_cache.h | 0
.../lib/src/lsl}/lslunitsync/optionswrapper.cpp | 0
.../lib/src/lsl}/lslunitsync/optionswrapper.h | 3 +-
.../lib/src/lsl}/lslunitsync/sharedlib.cpp | 0
.../lib/src/lsl}/lslunitsync/sharedlib.h | 0
.../lib/src/lsl}/lslunitsync/signatures.h | 1 +
.../lib/src/lsl}/lslunitsync/springbundle.cpp | 0
.../lib/src/lsl}/lslunitsync/springbundle.h | 0
.../lib/src/lsl}/lslunitsync/unitsync.cpp | 32 +-
.../lib/src/lsl}/lslunitsync/unitsync.h | 4 +-
.../lib/src/lsl}/lslunitsync/unitsync_cache.cpp | 2 -
.../lib/src/lsl}/lslunitsync/unitsync_cache.h | 1 -
.../lib/src/lsl}/lslutils/CMakeLists.txt | 4 +-
.../lib/src/lsl}/lslutils/autopointers.h | 0
.../lib/src/lsl}/lslutils/base64.h | 3 +-
.../lib/src/lsl}/lslutils/config.cpp | 20 +-
.../lib/src/lsl}/lslutils/config.h | 7 +-
.../lib/src/lsl}/lslutils/conversion.cpp | 2 +-
.../lib/src/lsl}/lslutils/conversion.h | 0
.../lib/src/lsl}/lslutils/crc.cpp | 0
.../src => downloader/lib/src/lsl}/lslutils/crc.h | 0
.../lib/src/lsl}/lslutils/debug.h | 24 +-
.../lib/src/lsl}/lslutils/global_interfaces.h | 3 +-
.../lib/src/lsl}/lslutils/globalsmanager.cpp | 0
.../lib/src/lsl}/lslutils/globalsmanager.h | 3 +-
.../lib/src/lsl}/lslutils/logging.h | 0
.../src => downloader/lib/src/lsl}/lslutils/md5.c | 0
.../src => downloader/lib/src/lsl}/lslutils/md5.h | 3 +-
.../lib/src/lsl}/lslutils/misc.cpp | 0
.../src => downloader/lib/src/lsl}/lslutils/misc.h | 3 +-
.../lib/src/lsl}/lslutils/mutexwrapper.h | 0
.../lib/src/lsl}/lslutils/net.cpp | 0
.../src => downloader/lib/src/lsl}/lslutils/net.h | 0
.../lib/src/lsl}/lslutils/thread.cpp | 3 +-
.../lib/src/lsl}/lslutils/thread.h | 0
.../lib/src/lsl}/lslutils/type_forwards.h | 0
src/downloader/lib/src/main.cpp | 166 +-
src/downloader/lib/src/pr-downloader.cpp | 163 +-
src/downloader/lib/src/pr-downloader.h | 24 +-
src/downloader/lib/test/CMakeLists.txt | 62 +-
.../test => downloader/lib/test/lsl}/basic.cpp | 38 +-
.../test => downloader/lib/test/lsl}/commands.h | 33 +-
src/{lsl/test => downloader/lib/test/lsl}/common.h | 3 +-
src/{lsl/test => downloader/lib/test/lsl}/swig.cpp | 9 +-
.../test => downloader/lib/test/lsl}/usync.cpp | 22 +-
src/downloader/lib/test/test.cpp | 11 +
src/downloader/prdownloader.cpp | 11 +-
src/gui/basedataviewctrl.h | 4 +
src/gui/battlelist/battlelisttab.cpp | 2 +-
src/gui/chatpanel.cpp | 44 +-
src/gui/downloaddataviewctrl.cpp | 8 +-
src/gui/hosting/battlemaptab.cpp | 3 +-
src/gui/hosting/battleroomdownloads.cpp | 4 +-
src/gui/hosting/battleroomtab.cpp | 4 +-
src/gui/maindownloadtab.cpp | 21 +-
src/gui/maindownloadtab.h | 28 +-
src/gui/mainwindow.cpp | 5 +-
src/gui/mapselectdialog.cpp | 2 +-
src/gui/notifications/notificationmanager.cpp | 2 +-
src/gui/playback/playbacktab.cpp | 4 +-
src/gui/singleplayertab.cpp | 2 +-
src/gui/taskbar.cpp | 8 +-
src/gui/ui.cpp | 6 +-
src/lsl/.travis.yml | 13 -
src/lsl/CMakeLists.txt | 178 --
src/lsl/README | 27 -
src/lsl/buildbot/Makefile | 25 -
src/lsl/buildbot/buildbot.tac | 11 -
src/lsl/buildbot/create-build-dirs.sh | 22 -
src/lsl/buildbot/master.cfg | 483 -----
src/lsl/cmake/FindJsoncpp.cmake | 26 -
src/lsl/cmake/Toolchain-mingw32.cmake | 25 -
src/lsl/cmake/Toolchain-mingw32_debug.cmake | 22 -
src/lsl/cmake/Toolchain-mingw32_new.cmake | 32 -
src/lsl/cmake/compat_flags.cmake | 64 -
src/lsl/cmake/config.h | 9 -
src/lsl/cmake/package_config.cmake | 45 -
src/lsl/doc/CMakeLists.txt | 18 -
src/lsl/doc/Doxyfile.in | 1513 ---------------
src/lsl/doc/UseDoxygen.cmake | 118 --
src/lsl/lib/jsoncpp/AUTHORS | 1 -
src/lsl/lib/jsoncpp/LICENSE | 55 -
src/lsl/lib/jsoncpp/README.md | 214 --
src/lsl/lib/jsoncpp/include/json/assertions.h | 54 -
src/lsl/lib/jsoncpp/include/json/autolink.h | 25 -
src/lsl/lib/jsoncpp/include/json/config.h | 109 --
src/lsl/lib/jsoncpp/include/json/features.h | 57 -
src/lsl/lib/jsoncpp/include/json/forwards.h | 37 -
src/lsl/lib/jsoncpp/include/json/json.h | 15 -
src/lsl/lib/jsoncpp/include/json/reader.h | 404 ----
src/lsl/lib/jsoncpp/include/json/value.h | 841 --------
src/lsl/lib/jsoncpp/include/json/version.h | 13 -
src/lsl/lib/jsoncpp/include/json/writer.h | 331 ----
src/lsl/lib/jsoncpp/src/lib_json/json_reader.cpp | 2035 --------------------
src/lsl/lib/jsoncpp/src/lib_json/json_tool.h | 87 -
src/lsl/lib/jsoncpp/src/lib_json/json_value.cpp | 1528 ---------------
.../jsoncpp/src/lib_json/json_valueiterator.inl | 162 --
src/lsl/lib/jsoncpp/src/lib_json/json_writer.cpp | 1187 ------------
src/lsl/src/CMakeLists.txt | 21 -
src/lsl/src/lslutils/logging.cpp | 0
src/lsl/test/CMakeLists.txt | 28 -
src/lsl/tools/changelog.sh | 37 -
src/lsl/tools/cppcheck-htmlreport | 303 ---
src/lsl/tools/developer-merge.sh | 18 -
src/lsl/tools/get-revision.sh | 21 -
src/lsl/tools/git2changelog | 372 ----
src/lsl/tools/make_dist.sh | 9 -
src/lsl/tools/regen_config_header.sh | 23 -
src/lsl/tools/stl-symbol-strip.py | 30 -
src/lsl/tools/template.cpp | 1 -
src/lsl/tools/template.h | 21 -
src/lsl/tools/test-tarball.sh | 22 -
src/lsl/tools/transform.sed | 13 -
src/lsl/tools/transform_release_zip.sh | 30 -
src/lsl/tools/upload-macosx-build.sh | 89 -
src/lsl/tools/upload-temp-win-build.sh | 23 -
src/lsl/tools/upload-temp-win-build_debug.sh | 21 -
src/lsl/tools/util.sh | 81 -
src/replaylist.cpp | 13 +-
src/sound/CMakeLists.txt | 2 +-
src/springlobbyapp.cpp | 22 +-
src/sysinfo.cpp | 62 +-
src/sysinfo.h | 1 -
src/tasserver.cpp | 6 +-
src/tests/CMakeLists.txt | 10 +-
src/tests/utils/globalevents.cpp | 18 +-
src/updater/CMakeLists.txt | 2 +-
src/utils/conversion.cpp | 46 +
src/utils/conversion.h | 4 +
src/utils/globalevents.cpp | 27 +-
src/utils/globalevents.h | 11 +-
src/utils/slpaths.cpp | 9 +-
271 files changed, 2543 insertions(+), 12822 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/springlobby.git
More information about the Pkg-games-commits
mailing list