[7kaa] 03/03: Updated version 2.14.7+dfsg from 'upstream/2.14.7+dfsg'

Bertrand Marc bmarc at moszumanska.debian.org
Wed Jul 26 12:16:02 UTC 2017


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

bmarc pushed a commit to branch master
in repository 7kaa.

commit 6baa8091e4d3248b9ee5abd75ca85a9c63167bae
Merge: 937abbd 70f5500
Author: Bertrand Marc <bmarc at debian.org>
Date:   Wed Jul 26 14:14:40 2017 +0200

    Updated version 2.14.7+dfsg from 'upstream/2.14.7+dfsg'
    
    with Debian dir 41496c2a1f4a000e942ad0d26c7cd4d190d67a76

 .gitignore                                       |   3 +-
 COPYING                                          |  42 +-
 Makefile.am                                      |   3 +
 README                                           |  26 +-
 configure.ac                                     |  96 ++-
 data/resource/std.set                            | Bin 597888 -> 597888 bytes
 doc/translat.csv                                 | 154 ----
 include/GAMEDEF.h                                |  32 +-
 include/Makefile.am                              |   5 +-
 include/OF_WAR.h                                 |   2 +
 include/OGAME.h                                  |   3 +-
 include/OGETA.h                                  |   7 +-
 include/OGFILE.h                                 |   4 +-
 include/OHELP.h                                  |   2 +-
 include/OMOUSE.h                                 |   2 -
 include/OMUSIC.h                                 |   1 +
 include/ONATION.h                                |  18 +-
 include/ONATIONB.h                               |   2 +-
 include/OTOWN.h                                  |  12 +-
 include/OUNIT.h                                  |   2 +-
 include/OVGA.h                                   |   2 -
 include/OWORLD.h                                 |   2 +-
 include/{mem_input_stream.h => WebService.h}     |  40 +-
 include/audio_base.h                             |   6 +-
 include/mem_input_stream.h                       |   6 +-
 include/mouse_none.h                             | 210 -----
 include/multiplayer.h                            |  18 +
 include/openal_audio.h                           |   6 +-
 include/{OVGA.h => platform.h}                   |  23 +-
 include/surface.h                                |   2 -
 include/surface_none.h                           |  63 --
 include/version.h                                |   4 +-
 include/vga_none.h                               |  66 --
 m4/ax_cxx_compile_stdcxx.m4                      | 982 +++++++++++++++++++++++
 m4/ax_cxx_compile_stdcxx_11.m4                   |  39 +
 packaging/mkbundle                               |   2 +-
 packaging/windows/install.nsi                    |  18 +-
 po/POTFILES.in                                   | 118 +--
 po/de.po                                         |   4 +-
 po/es.po                                         |   4 +-
 po/fr.po                                         |   4 +-
 src/{client => }/7k.ico                          | Bin
 src/{client => }/AM.cpp                          |  10 +-
 src/Makefile.am                                  | 323 +++++++-
 src/{client => }/OAI_ACT.cpp                     |   0
 src/{client => }/OAI_ACT2.cpp                    |  10 -
 src/{client => }/OAI_ATTK.cpp                    |   0
 src/{client => }/OAI_BUIL.cpp                    |   0
 src/{client => }/OAI_CAP2.cpp                    |   4 +-
 src/{client => }/OAI_CAPT.cpp                    | 110 ++-
 src/{client => }/OAI_DEFE.cpp                    |   0
 src/{client => }/OAI_DIPL.cpp                    |   0
 src/{client => }/OAI_ECO.cpp                     |   0
 src/{client => }/OAI_GRAN.cpp                    |   4 +-
 src/{client => }/OAI_INFO.cpp                    |   0
 src/{client => }/OAI_MAIN.cpp                    |   0
 src/{client => }/OAI_MAR2.cpp                    |   0
 src/{client => }/OAI_MAR3.cpp                    |   4 +-
 src/{client => }/OAI_MARI.cpp                    |   0
 src/{client => }/OAI_MILI.cpp                    |   0
 src/{client => }/OAI_MONS.cpp                    |   0
 src/{client => }/OAI_QUER.cpp                    |   0
 src/{client => }/OAI_SEEK.cpp                    |   0
 src/{client => }/OAI_SPY.cpp                     |   3 +-
 src/{client => }/OAI_TALK.cpp                    |   0
 src/{client => }/OAI_TOWN.cpp                    |   2 +-
 src/{client => }/OAI_TRAD.cpp                    |   0
 src/{client => }/OAI_UNIT.cpp                    |   0
 src/{client => }/OANLINE.cpp                     |   0
 src/{client => }/OBATTLE.cpp                     |   2 +-
 src/{client => }/OBLOB.cpp                       |   0
 src/{client => }/OBOX.cpp                        |   0
 src/{client => }/OBULLET.cpp                     |   0
 src/{client => }/OBULLETA.cpp                    |   0
 src/{client => }/OBUTT3D.cpp                     |   0
 src/{client => }/OBUTTCUS.cpp                    |   0
 src/{client => }/OBUTTON.cpp                     |   0
 src/{client => }/OB_FLAME.cpp                    |   0
 src/{client => }/OB_HOMIN.cpp                    |   0
 src/{client => }/OB_PROJ.cpp                     |   0
 src/{video/common => }/OCOLTBL.cpp               |   0
 src/{common => }/OCONFIG.cpp                     |   0
 src/{client => }/OCRC_STO.cpp                    |   0
 src/{common => }/ODATE.cpp                       |   0
 src/{file => }/ODB.cpp                           |   2 +-
 src/{file => }/ODIR.cpp                          |   0
 src/{client => }/ODYNARR.cpp                     |   0
 src/{client => }/ODYNARRB.cpp                    |   0
 src/{client => }/OEFFECT.cpp                     |   0
 src/{multiplayer/common => }/OERRCTRL.cpp        |   0
 src/{common => }/OERROR.cpp                      |  17 +-
 src/{client => }/OEXPMASK.cpp                    |   0
 src/{file => }/OFILE.cpp                         |   2 +-
 src/{client => }/OFILETXT.cpp                    |   0
 src/{client => }/OFIRM.cpp                       |   5 +-
 src/{client => }/OFIRM2.cpp                      |   2 +-
 src/{client => }/OFIRMA.cpp                      |   0
 src/{client => }/OFIRMAI.cpp                     |   0
 src/{client => }/OFIRMDIE.cpp                    |   0
 src/{client => }/OFIRMDRW.cpp                    |   0
 src/{client => }/OFIRMIF.cpp                     |   5 +-
 src/{client => }/OFIRMIF2.cpp                    |   0
 src/{client => }/OFIRMIF3.cpp                    |   0
 src/{client => }/OFIRMRES.cpp                    |   0
 src/{client => }/OFLAME.cpp                      |   0
 src/{client => }/OFONT.cpp                       |   2 +
 src/{client => }/OF_BASE.cpp                     |   0
 src/{client => }/OF_BASE2.cpp                    |   0
 src/{client => }/OF_CAMP.cpp                     |   0
 src/{client => }/OF_CAMP2.cpp                    |   2 +-
 src/{client => }/OF_FACT.cpp                     |   0
 src/{client => }/OF_FACT2.cpp                    |   0
 src/{client => }/OF_HARB.cpp                     |   6 +-
 src/{client => }/OF_HARB2.cpp                    |   0
 src/{client => }/OF_INN.cpp                      |   2 +-
 src/{client => }/OF_INN2.cpp                     |   0
 src/{client => }/OF_MARK.cpp                     |   2 +-
 src/{client => }/OF_MARK2.cpp                    |  11 +-
 src/{client => }/OF_MINE.cpp                     |   0
 src/{client => }/OF_MINE2.cpp                    |   0
 src/{client => }/OF_MONS.cpp                     |  61 +-
 src/{client => }/OF_RESE.cpp                     |   0
 src/{client => }/OF_RESE2.cpp                    |   0
 src/{client => }/OF_WAR.cpp                      |  19 +-
 src/{client => }/OF_WAR2.cpp                     |   0
 src/{client => }/OGAMCRED.cpp                    |   0
 src/{client => }/OGAME.cpp                       |   0
 src/{client => }/OGAMEMP.cpp                     | 337 +++++++-
 src/{client => }/OGAMENCY.cpp                    |   0
 src/{client => }/OGAMEND.cpp                     |   0
 src/{client => }/OGAMESET.cpp                    |   0
 src/{client => }/OGAMHALL.cpp                    |   0
 src/{client => }/OGAMMAIN.cpp                    |   0
 src/{client => }/OGAMMENU.cpp                    |  14 +-
 src/{client => }/OGAMSCE2.cpp                    |   0
 src/{client => }/OGAMSCEN.cpp                    |   0
 src/{client => }/OGAMSING.cpp                    |   0
 src/{client => }/OGENHILL.cpp                    |   0
 src/{client => }/OGENMAP.cpp                     |   0
 src/{client => }/OGETA.cpp                       |  58 +-
 src/{client => }/OGFILE.cpp                      |   0
 src/{client => }/OGFILE2.cpp                     |   0
 src/{client => }/OGFILE3.cpp                     |   0
 src/{client => }/OGFILEA.cpp                     |  31 +-
 src/{client => }/OGF_V1.cpp                      |   0
 src/{client => }/OGODRES.cpp                     |   2 +-
 src/{client => }/OGRPSEL.cpp                     |   0
 src/{client => }/OHELP.cpp                       |   0
 src/{client => }/OHILLRES.cpp                    |   0
 src/{client => }/OIMGRES.cpp                     |   0
 src/{client => }/OINFO.cpp                       |   0
 src/{client => }/OINGMENU.cpp                    |   0
 src/{client => }/OLIGHTN.cpp                     |   0
 src/{client => }/OLIGHTN2.cpp                    |   0
 src/{client => }/OLOG.cpp                        |   0
 src/{client => }/OLONGLOG.cpp                    |   0
 src/{client => }/OLZW.cpp                        |   0
 src/{client => }/OMATRIX.cpp                     |   0
 src/{common => }/OMEM.cpp                        |   0
 src/{common => }/OMISC.cpp                       |  29 +-
 src/{client => }/OMONSRES.cpp                    |   0
 src/{input/sdl => }/OMOUSE.cpp                   |   0
 src/{client => }/OMOUSECR.cpp                    |   0
 src/{client => }/OMP_CRC.cpp                     |   0
 src/{client => }/OMUSIC.cpp                      |   3 +-
 src/{client => }/ONATIONA.cpp                    |   0
 src/{client => }/ONATIONB.cpp                    |  24 +-
 src/{client => }/ONEWS.cpp                       |   0
 src/{client => }/ONEWS2.cpp                      |   0
 src/{client => }/ONEWSENG.cpp                    |   0
 src/{client => }/ONEWSFRE.cpp                    |   0
 src/{client => }/ONEWSGER.cpp                    |   0
 src/{client => }/ONEWSSPA.cpp                    |   0
 src/{client => }/OOPTMENU.cpp                    |  10 +-
 src/{client => }/OPLANT.cpp                      |   0
 src/{client => }/OPLASMA.cpp                     |   0
 src/{client => }/OPOWER.cpp                      |   0
 src/{client => }/ORACERES.cpp                    |   0
 src/{client => }/ORAIN1.cpp                      |   0
 src/{client => }/ORAIN2.cpp                      |   0
 src/{client => }/ORAIN3.cpp                      |   0
 src/{client => }/ORAWRES.cpp                     |   0
 src/{client => }/OREBEL.cpp                      |   2 +-
 src/{client => }/OREGION.cpp                     |   0
 src/{client => }/OREGIONS.cpp                    |   0
 src/{multiplayer/common => }/OREMOTE.cpp         |   0
 src/{multiplayer/common => }/OREMOTE2.cpp        |   0
 src/{multiplayer/common => }/OREMOTEM.cpp        |   0
 src/{multiplayer/common => }/OREMOTEQ.cpp        |   0
 src/{file => }/ORES.cpp                          |   0
 src/{file => }/ORESDB.cpp                        |   0
 src/{file => }/ORESX.cpp                         |   0
 src/{client => }/OROCK.cpp                       |   0
 src/{client => }/OROCKRES.cpp                    |   0
 src/{client => }/OR_AI.cpp                       |   0
 src/{client => }/OR_ECO.cpp                      |   0
 src/{client => }/OR_MIL.cpp                      |   0
 src/{client => }/OR_NAT.cpp                      |   0
 src/{client => }/OR_NEWS.cpp                     |   0
 src/{client => }/OR_RANK.cpp                     |   0
 src/{client => }/OR_SPY.cpp                      |   0
 src/{client => }/OR_TECH.cpp                     |   0
 src/{client => }/OR_TOWN.cpp                     |   0
 src/{client => }/OR_TRADE.cpp                    |   0
 src/{client => }/OSCROLL.cpp                     |   0
 src/{client => }/OSE.cpp                         |   0
 src/{client => }/OSERES.cpp                      |   0
 src/{client => }/OSFRMRES.cpp                    |   2 +-
 src/{client => }/OSITE.cpp                       |   0
 src/{client => }/OSITEDRW.cpp                    |   2 +-
 src/{client => }/OSKILL.cpp                      |   0
 src/{client => }/OSLIDCUS.cpp                    |   0
 src/{client => }/OSNOW1.cpp                      |   0
 src/{client => }/OSNOW2.cpp                      |   0
 src/{client => }/OSNOWG.cpp                      |   0
 src/{client => }/OSNOWRES.cpp                    |   0
 src/{client => }/OSPATH.cpp                      |   0
 src/{client => }/OSPATHBT.cpp                    |   0
 src/{client => }/OSPREDBG.cpp                    |   0
 src/{client => }/OSPREOFF.cpp                    |   0
 src/{client => }/OSPRESMO.cpp                    |   0
 src/{client => }/OSPREUSE.cpp                    |   0
 src/{client => }/OSPRITE.cpp                     |   0
 src/{client => }/OSPRITE2.cpp                    |   0
 src/{client => }/OSPRITEA.cpp                    |   0
 src/{client => }/OSPRTRES.cpp                    |   0
 src/{client => }/OSPY.cpp                        |   0
 src/{client => }/OSPY2.cpp                       |   0
 src/{client => }/OSPYA.cpp                       |   0
 src/{common => }/OSTR.cpp                        |   0
 src/{client => }/OSYS.cpp                        |   7 +-
 src/{client => }/OSYS2.cpp                       |   0
 src/{client => }/OSYS3.cpp                       |   0
 src/{client => }/OTALKENG.cpp                    |   0
 src/{client => }/OTALKFRE.cpp                    |   0
 src/{client => }/OTALKGER.cpp                    |   0
 src/{client => }/OTALKMSG.cpp                    |   0
 src/{client => }/OTALKRES.cpp                    |   0
 src/{client => }/OTALKSPA.cpp                    |   0
 src/{client => }/OTECHRES.cpp                    |   0
 src/{client => }/OTERRAIN.cpp                    |   4 +-
 src/{client => }/OTORNADO.cpp                    |   0
 src/{client => }/OTOWN.cpp                       |  26 +-
 src/{client => }/OTOWNA.cpp                      |   0
 src/{client => }/OTOWNAI.cpp                     |  16 +-
 src/{client => }/OTOWNBLD.cpp                    |   0
 src/{client => }/OTOWNDRW.cpp                    |   0
 src/{client => }/OTOWNIF.cpp                     |  40 +-
 src/{client => }/OTOWNIND.cpp                    |   2 +-
 src/{client => }/OTOWNRES.cpp                    |   0
 src/{client => }/OTRANSL.cpp                     |   0
 src/{client => }/OTUTOR.cpp                      |   0
 src/{client => }/OTUTOR2.cpp                     |   0
 src/{client => }/OTownNetwork.cpp                |  14 +-
 src/{client => }/OUNIT.cpp                       |   7 +-
 src/{client => }/OUNIT2.cpp                      |   0
 src/{client => }/OUNITA.cpp                      |   0
 src/{client => }/OUNITAAC.cpp                    |   0
 src/{client => }/OUNITAAT.cpp                    |   7 +
 src/{client => }/OUNITAC.cpp                     |   7 +-
 src/{client => }/OUNITAI.cpp                     |   2 +-
 src/{client => }/OUNITAM.cpp                     |   0
 src/{client => }/OUNITAMT.cpp                    |   0
 src/{client => }/OUNITAT.cpp                     |  27 +-
 src/{client => }/OUNITAT2.cpp                    |   0
 src/{client => }/OUNITAT3.cpp                    |   0
 src/{client => }/OUNITATB.cpp                    |   0
 src/{client => }/OUNITD.cpp                      |   0
 src/{client => }/OUNITDRW.cpp                    |   0
 src/{client => }/OUNITHB.cpp                     |   0
 src/{client => }/OUNITI.cpp                      |   0
 src/{client => }/OUNITIF.cpp                     |   0
 src/{client => }/OUNITIND.cpp                    |   0
 src/{client => }/OUNITM.cpp                      |   2 +
 src/{client => }/OUNITRES.cpp                    |   4 +-
 src/{client => }/OUNITS.cpp                      |   4 +
 src/{client => }/OU_CARA.cpp                     |   0
 src/{client => }/OU_CARA2.cpp                    |   0
 src/{client => }/OU_CARAS.cpp                    |   4 +
 src/{client => }/OU_CARAT.cpp                    |   2 +
 src/{client => }/OU_CART.cpp                     |   0
 src/{client => }/OU_GOD.cpp                      |  17 +-
 src/{client => }/OU_GOD2.cpp                     |   0
 src/{client => }/OU_MARI.cpp                     |   0
 src/{client => }/OU_MARI2.cpp                    |   0
 src/{client => }/OU_MARIF.cpp                    |   2 +-
 src/{client => }/OU_MARIS.cpp                    |   0
 src/{client => }/OU_MARIT.cpp                    |   0
 src/{client => }/OU_MONS.cpp                     |   0
 src/{client => }/OU_VEHI.cpp                     |   2 +-
 src/{client => }/OVBROWIF.cpp                    |   0
 src/{client => }/OVBROWSE.cpp                    |   0
 src/{video/common => }/OVGABUF.cpp               |   0
 src/{video/common => }/OVGABUF2.cpp              |   0
 src/{video/common => }/OVGALOCK.cpp              |   0
 src/{client => }/OVIDEO.cpp                      |   0
 src/{client => }/OVOLUME.cpp                     |   0
 src/{client => }/OVQUEUE.cpp                     |   0
 src/{client => }/OWALLRES.cpp                    |   0
 src/{client => }/OWARPT.cpp                      |   0
 src/{client => }/OWEATHER.cpp                    |   0
 src/{client => }/OWORLD.cpp                      |  10 +-
 src/{client => }/OWORLD_M.cpp                    |   0
 src/{client => }/OWORLD_Z.cpp                    |   0
 src/{client => }/OW_FIRE.cpp                     |   0
 src/{client => }/OW_PLANT.cpp                    |   0
 src/{client => }/OW_ROCK.cpp                     |   0
 src/{client => }/OW_SOUND.cpp                    |   0
 src/{client => }/OW_WALL.cpp                     |   0
 src/audio/Makefile.am                            |   5 -
 src/client/Makefile.am                           | 296 -------
 src/common/Makefile.am                           |  10 -
 src/curl/Makefile.am                             |   2 +
 src/curl/WebService.cpp                          | 112 +++
 src/{common => }/dbglog.cpp                      |   0
 src/enet/Makefile.am                             |   2 +
 src/{multiplayer/common => enet}/multiplayer.cpp |  99 ++-
 src/file/Makefile.am                             |  16 -
 src/{file => }/file_input_stream.cpp             |   0
 src/{file => }/file_output_stream.cpp            |   0
 src/{file => }/file_reader.cpp                   |   0
 src/{file => }/file_util.cpp                     |   0
 src/{file => }/file_writer.cpp                   |   0
 src/{client => }/ico.rc                          |   0
 src/imgfun/generic/I_EREMAP.cpp                  |   5 +-
 src/input/Makefile.am                            |   9 -
 src/input/none/Makefile.am                       |   2 -
 src/input/none/OMOUSE.cpp                        | 407 ----------
 src/input/sdl/Makefile.am                        |   3 -
 src/{file => }/input_stream.cpp                  |   0
 src/{file => }/mem_input_stream.cpp              |   4 +-
 src/multiplayer/Makefile.am                      |   1 -
 src/multiplayer/common/Makefile.am               |   8 -
 src/{audio => }/openal/Makefile.am               |   0
 src/{audio => }/openal/openal_audio.cpp          |   9 +-
 src/{audio => }/openal/wav_stream.cpp            |   2 +-
 src/{file => }/output_stream.cpp                 |   0
 src/platform/Makefile.am                         |   2 +
 src/platform/windows.cpp                         |  73 ++
 src/{multiplayer/common => }/player_desc.cpp     |   0
 src/{video/sdl => }/surface_sdl.cpp              |   4 +-
 src/{video/sdl => }/vga_sdl.cpp                  |   7 +-
 src/{video/common => }/vgautil.cpp               |   0
 src/{video/common => }/vgautil2.cpp              |   0
 src/video/Makefile.am                            |   9 -
 src/video/common/Makefile.am                     |   8 -
 src/video/none/Makefile.am                       |   2 -
 src/video/none/surface_none.cpp                  | 118 ---
 src/video/none/vga_none.cpp                      | 150 ----
 src/video/sdl/Makefile.am                        |   3 -
 350 files changed, 2638 insertions(+), 2095 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/7kaa.git



More information about the Pkg-games-commits mailing list