[springlobby] branch master updated (8f0c160 -> b38b116)

Markus Koschany apo at moszumanska.debian.org
Tue Apr 19 08:34:11 UTC 2016


This is an automated email from the git hooks/post-receive script.

apo pushed a change to branch master
in repository springlobby.

      from  8f0c160   Build with all hardening flags.
       new  fd69a77   New changelog entry
       new  55ea8e0   Imported Upstream version 0.245+dfsg
       new  e4508f2   Merge tag 'upstream/0.245+dfsg'
       new  919fa8d   Drop FindJsoncpp.patch. Fixed upstream.
       new  b38b116   Update changelog

The 5 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                                          |  7 ++++
 VERSION                                            |  2 +-
 debian/changelog                                   |  7 ++++
 debian/patches/FindJsoncpp.patch                   | 36 -----------------
 debian/patches/series                              |  1 -
 springlobby_config.h                               |  2 +-
 src/CMakeLists.txt                                 |  2 -
 src/downloader/lib/.travis.yml                     | 10 ++---
 src/downloader/lib/CMakeLists.txt                  | 18 +++++++--
 src/downloader/lib/src/CMakeLists.txt              |  4 +-
 src/gui/hosting/battlemaptab.cpp                   |  2 +-
 src/gui/hosting/battlemaptab.h                     | 18 ++++-----
 src/gui/hosting/battleroomtab.cpp                  |  4 +-
 src/gui/hosting/battleroomtab.h                    | 47 ++++++++++++----------
 src/gui/hosting/ibattlemaptab.cpp                  | 17 --------
 src/gui/hosting/ibattlemaptab.h                    | 30 --------------
 src/gui/hosting/ibattleroomtab.cpp                 | 17 --------
 src/gui/hosting/ibattleroomtab.h                   | 47 ----------------------
 src/gui/hosting/mainjoinbattletab.cpp              | 12 +++---
 src/gui/hosting/mainjoinbattletab.h                | 12 +++---
 src/gui/hosting/votepanel.cpp                      |  3 +-
 src/gui/mainwindow.cpp                             | 11 ++++-
 src/gui/mainwindow.h                               |  2 +-
 src/gui/ui.cpp                                     |  8 ++--
 src/lsl/.travis.yml                                | 14 ++-----
 src/lsl/CMakeLists.txt                             | 19 +++++++--
 .../lib => lsl}/cmake/FindJsoncpp.cmake            |  0
 src/lsl/src/lslextract/CMakeLists.txt              |  5 +--
 src/lsl/src/lslextract/server/request_handler.cpp  |  2 +-
 src/lsl/src/lslunitsync/CMakeLists.txt             |  4 +-
 src/lsl/src/lslunitsync/c_api.cpp                  |  4 +-
 src/lsl/src/lslunitsync/image.cpp                  | 38 ++++++++++++-----
 src/lsl/src/lslunitsync/sharedlib.cpp              |  4 +-
 src/lsl/test/CMakeLists.txt                        |  2 +-
 src/lsl/test/basic.cpp                             |  2 +
 src/serverevents.cpp                               |  4 ++
 src/useractions.cpp                                |  2 +-
 37 files changed, 165 insertions(+), 254 deletions(-)
 delete mode 100644 debian/patches/FindJsoncpp.patch
 delete mode 100644 debian/patches/series
 delete mode 100644 src/gui/hosting/ibattlemaptab.cpp
 delete mode 100644 src/gui/hosting/ibattlemaptab.h
 delete mode 100644 src/gui/hosting/ibattleroomtab.cpp
 delete mode 100644 src/gui/hosting/ibattleroomtab.h
 copy src/{downloader/lib => lsl}/cmake/FindJsoncpp.cmake (100%)

-- 
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