[pkg-fgfs-crew] [simgear] 01/03: Merge branch 'upstream', i.e. sources of something pre 3.0.0.

Markus Wanner markus_wanner-guest at moszumanska.debian.org
Wed Jan 22 21:56:08 UTC 2014


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

markus_wanner-guest pushed a commit to branch master
in repository simgear.

commit ff8a5edfd06c1e21368a41138c538e2dd696d046
Merge: e2f7dcd 61fa1e9
Author: Markus Wanner <markus at bluegap.ch>
Date:   Wed Jan 22 22:39:21 2014 +0100

    Merge branch 'upstream', i.e. sources of something pre 3.0.0.

 3rdparty/CMakeLists.txt                            |   4 +
 3rdparty/expat/CMakeLists.txt                      |  33 +
 {simgear/xml => 3rdparty/expat}/Expat.COPYING      |   0
 {simgear/xml => 3rdparty/expat}/ascii.h            |   0
 {simgear/xml => 3rdparty/expat}/asciitab.h         |   0
 .../xml => 3rdparty/expat}/expat_config_cmake.in   |   0
 {simgear/xml => 3rdparty/expat}/hashtable.c        |   0
 {simgear/xml => 3rdparty/expat}/hashtable.h        |   0
 {simgear/xml => 3rdparty/expat}/iasciitab.h        |   0
 {simgear/xml => 3rdparty/expat}/internal.h         |   0
 {simgear/xml => 3rdparty/expat}/latin1tab.h        |   0
 {simgear/xml => 3rdparty/expat}/nametab.h          |   0
 simgear/xml/expat.h => 3rdparty/expat/sg_expat.h   |   2 +-
 .../expat/sg_expat_external.h                      |   0
 {simgear/xml => 3rdparty/expat}/utf8tab.h          |   0
 {simgear/xml => 3rdparty/expat}/xmldef.h           |   0
 {simgear/xml => 3rdparty/expat}/xmlparse.c         |   2 +-
 {simgear/xml => 3rdparty/expat}/xmlparse.h         |   0
 {simgear/xml => 3rdparty/expat}/xmlrole.c          |   2 +-
 {simgear/xml => 3rdparty/expat}/xmlrole.h          |   0
 {simgear/xml => 3rdparty/expat}/xmltok.c           |   2 +-
 {simgear/xml => 3rdparty/expat}/xmltok.h           |   0
 {simgear/xml => 3rdparty/expat}/xmltok_impl.c      |   0
 {simgear/xml => 3rdparty/expat}/xmltok_impl.h      |   0
 {simgear/xml => 3rdparty/expat}/xmltok_ns.c        |   0
 CMakeLists.txt                                     | 144 ++--
 CMakeModules/FindSvnClient.cmake                   |  83 --
 simgear/CMakeLists.txt                             |  61 +-
 simgear/bucket/newbucket.cxx                       |   2 +-
 simgear/canvas/CMakeLists.txt                      |   2 -
 simgear/canvas/Canvas.cxx                          |  57 +-
 simgear/canvas/Canvas.hxx                          |  20 +-
 simgear/canvas/CanvasEventListener.cxx             |  70 --
 simgear/canvas/CanvasEventManager.cxx              |   1 +
 simgear/canvas/CanvasMgr.cxx                       |   7 +-
 simgear/canvas/CanvasMgr.hxx                       |   8 +-
 simgear/canvas/CanvasSystemAdapter.hxx             |  24 -
 simgear/canvas/ODGauge.cxx                         |  15 +-
 simgear/canvas/ODGauge.hxx                         |   4 -
 simgear/canvas/canvas_fwd.hxx                      |   3 +-
 simgear/canvas/elements/CanvasElement.cxx          | 161 +++-
 simgear/canvas/elements/CanvasElement.hxx          |  52 +-
 simgear/canvas/elements/CanvasImage.cxx            |   2 +-
 simgear/canvas/elements/CanvasMap.cxx              |   2 +
 simgear/canvas/elements/CanvasText.cxx             |   2 +-
 simgear/debug/BufferedLogCallback.cxx              |   7 +-
 simgear/debug/logstream.cxx                        | 131 ++-
 simgear/debug/logstream.hxx                        |  18 +
 simgear/environment/metar.cxx                      |   2 +-
 simgear/environment/precipitation.hxx              |   1 -
 simgear/io/CMakeLists.txt                          |   6 +
 simgear/io/DAVMultiStatus.cxx                      |  35 +-
 simgear/io/DAVMultiStatus.hxx                      |   2 +
 simgear/io/HTTPClient.cxx                          | 690 ++++++++-------
 simgear/io/HTTPClient.hxx                          |  95 +-
 simgear/io/HTTPContentDecode.cxx                   | 269 ++++++
 simgear/io/HTTPContentDecode.hxx                   |  72 ++
 simgear/io/HTTPFileRequest.cxx                     |  91 ++
 .../HTTPFileRequest.hxx}                           |  42 +-
 simgear/io/HTTPMemoryRequest.cxx                   |  55 ++
 .../HTTPMemoryRequest.hxx}                         |  44 +-
 simgear/io/HTTPRequest.cxx                         | 358 +++++---
 simgear/io/HTTPRequest.hxx                         | 160 +++-
 simgear/io/SVNDirectory.cxx                        |  43 +-
 simgear/io/SVNDirectory.hxx                        |   6 +-
 simgear/io/SVNReportParser.cxx                     | 104 ++-
 simgear/io/SVNRepository.cxx                       | 134 ++-
 simgear/io/SVNRepository.hxx                       |   4 +-
 simgear/io/http_svn.cxx                            |   6 +-
 simgear/io/httpget.cxx                             |  29 +-
 simgear/io/raw_socket.cxx                          |  27 +-
 simgear/io/sg_binobj.cxx                           |   4 +-
 simgear/io/sg_netChannel.hxx                       |   2 +
 simgear/io/sg_netChat.hxx                          |   2 +
 simgear/io/sg_socket_udp.cxx                       |  10 +-
 simgear/io/test_HTTP.cxx                           |  49 +-
 simgear/misc/CMakeLists.txt                        |   1 +
 simgear/misc/ListDiff.hxx                          |  85 ++
 simgear/misc/path_test.cxx                         |  45 +-
 simgear/misc/sg_path.cxx                           | 239 ++++--
 simgear/misc/sg_path.hxx                           |  42 +-
 simgear/misc/strutils.cxx                          | 133 ++-
 simgear/misc/strutils.hxx                          |  32 +-
 simgear/nasal/code.c                               |  72 ++
 simgear/nasal/code.h                               |   4 +
 simgear/nasal/codegen.c                            |   5 +-
 simgear/nasal/cppbind/CMakeLists.txt               |   3 +
 simgear/nasal/cppbind/Ghost.hxx                    |  92 +-
 simgear/nasal/cppbind/NasalHash.hxx                |  15 +
 simgear/nasal/cppbind/NasalObjectHolder.cxx        |  51 ++
 simgear/nasal/cppbind/NasalObjectHolder.hxx        |  69 ++
 simgear/nasal/cppbind/cppbind_test.cxx             |  74 +-
 .../detail/from_nasal_function_templates.hxx       |  85 ++
 simgear/nasal/cppbind/detail/from_nasal_helper.hxx |  56 +-
 simgear/nasal/cppbind/detail/to_nasal_helper.hxx   |  10 +
 simgear/nasal/data.h                               |   2 +-
 simgear/nasal/gc.c                                 |  10 +
 simgear/nasal/lex.c                                |   3 +-
 simgear/nasal/mathlib.c                            |  75 +-
 simgear/nasal/nasal.h                              |  37 +
 simgear/package/Catalog.cxx                        |   7 +-
 simgear/package/Install.cxx                        |  12 +-
 simgear/package/md5.c                              |   8 +-
 simgear/package/md5.h                              |   8 +-
 simgear/props/PropertyBasedMgr.cxx                 |   3 +-
 simgear/props/props.cxx                            |  15 +
 simgear/props/props.hxx                            |  75 +-
 simgear/props/props_io.cxx                         | 196 +++--
 simgear/props/props_io.hxx                         |   3 +
 simgear/props/tiedpropertylist.hxx                 |   6 +-
 simgear/scene/material/CMakeLists.txt              |   2 -
 simgear/scene/material/Effect.cxx                  |  25 +-
 simgear/scene/material/Effect.hxx                  |   2 +
 simgear/scene/material/EffectBuilder.hxx           |   4 +-
 simgear/scene/material/GLPredicate.cxx             |  28 -
 simgear/scene/material/GLPredicate.hxx             |  25 -
 simgear/scene/material/Technique.cxx               |   8 +-
 simgear/scene/material/TextureBuilder.cxx          |  59 +-
 simgear/scene/material/makeEffect.cxx              |   6 +
 simgear/scene/material/mat.cxx                     |   6 +-
 simgear/scene/material/matlib.cxx                  |  45 +-
 simgear/scene/material/matlib.hxx                  |  31 +-
 simgear/scene/model/SGText.cxx                     |  16 +-
 simgear/scene/model/SGTrackToAnimation.cxx         | 134 ++-
 simgear/scene/model/modellib.cxx                   |   5 +
 simgear/scene/model/modellib.hxx                   |   2 +
 simgear/scene/model/particles.cxx                  |  28 +-
 simgear/scene/model/placement.cxx                  |  42 +-
 simgear/scene/model/placement.hxx                  |  12 +-
 simgear/scene/sky/CloudShaderGeometry.cxx          |   2 +-
 simgear/scene/sky/cloudfield.cxx                   |   2 +-
 simgear/scene/sky/sky.cxx                          |  30 +-
 simgear/scene/sky/sky.hxx                          |  28 +-
 simgear/scene/tgdb/ReaderWriterSTG.cxx             |   2 +-
 simgear/scene/tgdb/SGBuildingBin.cxx               | 374 ++++----
 simgear/scene/tgdb/SGBuildingBin.hxx               | 124 +--
 simgear/scene/tgdb/SGOceanTile.cxx                 |   2 +-
 simgear/scene/tgdb/apt_signs.cxx                   |  24 +-
 simgear/scene/tgdb/obj.cxx                         | 869 ++++++++++---------
 simgear/scene/tsync/terrasync.cxx                  | 952 +++++++++++----------
 simgear/scene/tsync/terrasync.hxx                  |  51 +-
 simgear/scene/util/CMakeLists.txt                  |   2 +
 simgear/scene/util/DeletionManager.cxx             |   5 +
 simgear/scene/util/DeletionManager.hxx             |   1 +
 .../util/OsgDebug.cxx}                             |  51 +-
 .../util/OsgDebug.hxx}                             |  36 +-
 simgear/screen/screen-dump.cxx                     |  50 --
 simgear/screen/screen-dump.hxx                     |  15 -
 simgear/simgear_config.h-msvc90                    | 163 ----
 simgear/simgear_config_cmake.h.in                  |   5 -
 simgear/sound/openal_test2.cxx                     |   3 +-
 simgear/structure/CMakeLists.txt                   |   1 +
 simgear/structure/SGBinding.cxx                    |  16 +
 simgear/structure/SGBinding.hxx                    |  13 +
 simgear/structure/commands.cxx                     |  74 +-
 simgear/structure/commands.hxx                     |  20 +-
 simgear/structure/event_mgr.cxx                    |  42 +-
 simgear/structure/event_mgr.hxx                    |   9 +-
 simgear/structure/expression_test.cxx              |   4 +-
 simgear/structure/map.hxx                          |  69 ++
 simgear/structure/subsystem_mgr.cxx                |  26 +-
 simgear/structure/subsystem_mgr.hxx                |  11 +-
 simgear/threads/SGQueue.hxx                        |   5 +
 simgear/timing/lowleveltime.cxx                    |  21 +
 simgear/timing/lowleveltime.h                      |   5 +
 simgear/timing/sg_time.cxx                         |  41 +-
 simgear/xml/CMakeLists.txt                         |  24 -
 simgear/xml/easyxml.cxx                            |  26 +-
 simgear/xml/easyxml.hxx                            |  90 +-
 version                                            |   2 +-
 170 files changed, 5442 insertions(+), 3164 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/simgear.git



More information about the pkg-fgfs-crew mailing list