[pkg-fgfs-crew] [simgear] 03/03: Merge branch 'upstream', i.e. sources for 2.12.0.

Markus Wanner markus_wanner-guest at alioth.debian.org
Sat Sep 21 18:53:12 UTC 2013


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 e01b38aab9ec6b44d53bcadfba8b4a4ed9460b9b
Merge: 3484fc6 30e47ba
Author: Markus Wanner <markus at bluegap.ch>
Date:   Sat Sep 21 20:49:53 2013 +0200

    Merge branch 'upstream', i.e. sources for 2.12.0.

 CMakeLists.txt                                     |  107 +-
 Doxyfile                                           |    4 +-
 simgear/CMakeLists.txt                             |    5 +-
 simgear/bucket/newbucket.cxx                       |   20 +-
 simgear/bucket/newbucket.hxx                       |   20 +-
 simgear/canvas/CMakeLists.txt                      |    2 +
 simgear/canvas/Canvas.cxx                          |  159 +-
 simgear/canvas/Canvas.hxx                          |   48 +-
 simgear/canvas/CanvasEvent.cxx                     |    6 +
 simgear/canvas/CanvasEvent.hxx                     |    4 +-
 simgear/canvas/CanvasEventManager.cxx              |  165 +-
 simgear/canvas/CanvasEventManager.hxx              |    4 +-
 simgear/canvas/CanvasEventVisitor.cxx              |   17 +-
 simgear/canvas/CanvasEventVisitor.hxx              |   11 +-
 simgear/canvas/CanvasMgr.cxx                       |    1 +
 simgear/canvas/CanvasObjectPlacement.cxx           |  244 +++
 simgear/canvas/CanvasObjectPlacement.hxx           |   75 +
 simgear/canvas/MouseEvent.hxx                      |   14 +
 simgear/canvas/ODGauge.cxx                         |  150 +-
 simgear/canvas/ODGauge.hxx                         |   28 +-
 simgear/canvas/ShivaVG/include/vg/openvg.h         |    1 +
 simgear/canvas/ShivaVG/src/shContext.c             |    5 +
 simgear/canvas/elements/CMakeLists.txt             |    9 +-
 simgear/canvas/elements/CanvasElement.cxx          |  297 +++-
 simgear/canvas/elements/CanvasElement.hxx          |  420 ++++-
 simgear/canvas/elements/CanvasGroup.cxx            |  293 ++--
 simgear/canvas/elements/CanvasGroup.hxx            |   53 +-
 simgear/canvas/elements/CanvasImage.cxx            |  413 ++++-
 simgear/canvas/elements/CanvasImage.hxx            |   44 +-
 simgear/canvas/elements/CanvasMap.cxx              |   15 +-
 simgear/canvas/elements/CanvasMap.hxx              |    3 +
 simgear/canvas/elements/CanvasPath.cxx             |   92 +-
 simgear/canvas/elements/CanvasPath.hxx             |   31 +-
 simgear/canvas/elements/CanvasText.cxx             |  138 +-
 simgear/canvas/elements/CanvasText.hxx             |    3 +
 .../elements/detail/add_segment_variadic.hxx       |   21 +
 simgear/compiler.h                                 |    2 +-
 simgear/constants.h                                |   35 +
 simgear/debug/BufferedLogCallback.cxx              |  101 ++
 simgear/debug/BufferedLogCallback.hxx              |   79 +
 simgear/debug/CMakeLists.txt                       |    4 +-
 simgear/debug/logstream.cxx                        |  344 +++-
 simgear/debug/logstream.hxx                        |  297 +---
 simgear/io/CMakeLists.txt                          |   20 +-
 simgear/io/DAVMultiStatus.cxx                      |  375 +++++
 simgear/io/DAVMultiStatus.hxx                      |  141 ++
 simgear/io/HTTPClient.cxx                          |  134 +-
 simgear/io/HTTPClient.hxx                          |    8 +
 simgear/io/HTTPRequest.cxx                         |   10 +-
 simgear/io/HTTPRequest.hxx                         |    5 +-
 simgear/io/SVNDirectory.cxx                        |  368 +++++
 simgear/io/SVNDirectory.hxx                        |  112 ++
 simgear/io/SVNReportParser.cxx                     |  582 +++++++
 simgear/io/SVNReportParser.hxx                     |   57 +
 simgear/io/SVNRepository.cxx                       |  414 +++++
 simgear/io/SVNRepository.hxx                       |   76 +
 simgear/io/http_svn.cxx                            |   49 +
 simgear/io/sg_netChannel.cxx                       |  218 +--
 simgear/io/sg_netChannel.hxx                       |   25 +-
 simgear/io/sg_netChat.cxx                          |   32 +-
 simgear/io/sg_netChat.hxx                          |   11 +-
 simgear/io/sg_serial.hxx                           |    8 +-
 simgear/io/sg_socket_udp.cxx                       |   13 +-
 simgear/io/test_HTTP.cxx                           |   17 +-
 simgear/math/CMakeLists.txt                        |    6 +-
 simgear/math/SGMisc.hxx                            |   33 +
 simgear/math/SGRect.hxx                            |   49 +
 simgear/math/interpolater.hxx                      |    4 +-
 simgear/misc/CMakeLists.txt                        |   25 +-
 simgear/misc/CSSBorder.cxx                         |  166 ++
 simgear/misc/CSSBorder.hxx                         |   71 +
 simgear/misc/CSSBorder_test.cxx                    |  111 ++
 simgear/misc/make_new.hxx                          |   52 +
 simgear/misc/sg_dir.cxx                            |   90 +-
 simgear/misc/sg_dir.hxx                            |   11 +
 simgear/misc/sg_path.cxx                           |  124 +-
 simgear/misc/sg_path.hxx                           |   27 +
 simgear/misc/sgstream.cxx                          |   13 +-
 simgear/misc/sgstream_test.cxx                     |   51 +
 simgear/misc/strutils.cxx                          |  196 ++-
 simgear/misc/strutils.hxx                          |   32 +
 simgear/misc/strutils_test.cxx                     |    4 +-
 simgear/misc/tabbed_values.cxx                     |    3 +-
 simgear/misc/tabbed_values.hxx                     |    2 -
 simgear/misc/test_macros.hxx                       |   19 +
 simgear/nasal/code.c                               |   14 +-
 simgear/nasal/cppbind/CMakeLists.txt               |   21 +-
 simgear/nasal/cppbind/Ghost.hxx                    |  419 +++--
 simgear/nasal/cppbind/NasalCallContext.hxx         |  136 ++
 simgear/nasal/cppbind/NasalString.cxx              |  186 +++
 simgear/nasal/cppbind/NasalString.hxx              |   81 +
 simgear/nasal/cppbind/cppbind_test.cxx             |  142 +-
 .../from_nasal_helper.cxx}                         |   44 +-
 .../from_nasal_helper.hxx}                         |   45 +-
 simgear/nasal/cppbind/detail/functor_templates.hxx |  104 ++
 .../nasal/cppbind/{ => detail}/nasal_traits.hxx    |    0
 simgear/nasal/cppbind/detail/to_nasal_helper.cxx   |  112 ++
 simgear/nasal/cppbind/detail/to_nasal_helper.hxx   |  172 ++
 simgear/nasal/cppbind/from_nasal.hxx               |   20 +-
 simgear/nasal/cppbind/to_nasal.cxx                 |   63 -
 simgear/nasal/cppbind/to_nasal.hxx                 |  113 +-
 simgear/nasal/data.h                               |   10 +-
 simgear/nasal/gc.c                                 |    7 +
 simgear/nasal/lib.c                                |   28 +
 simgear/nasal/mathlib.c                            |   73 +
 simgear/nasal/misc.c                               |   18 +
 simgear/nasal/nasal.h                              |   42 +-
 simgear/nasal/string.c                             |   24 +
 simgear/nasal/vector.c                             |   21 +
 simgear/package/CMakeLists.txt                     |   28 +
 simgear/package/Catalog.cxx                        |  319 ++++
 simgear/package/Catalog.hxx                        |  125 ++
 simgear/package/Delegate.hxx                       |   75 +
 simgear/package/Install.cxx                        |  337 ++++
 simgear/package/Install.hxx                        |   93 ++
 simgear/package/Package.cxx                        |  202 +++
 simgear/package/Package.hxx                        |  119 ++
 simgear/package/Root.cxx                           |  339 ++++
 simgear/package/Root.hxx                           |  128 ++
 simgear/package/ioapi.c                            |  178 ++
 simgear/package/ioapi.h                            |   80 +
 simgear/package/ioapi_mem.c                        |  221 +++
 simgear/package/md5.c                              |  266 +++
 simgear/package/md5.h                              |   68 +
 simgear/package/pkgutil.cxx                        |  198 +++
 simgear/package/unzip.c                            | 1701 ++++++++++++++++++++
 simgear/package/unzip.h                            |  360 +++++
 simgear/props/CMakeLists.txt                       |   24 +-
 simgear/props/PropertyBasedElement.cxx             |   19 +
 simgear/props/PropertyBasedElement.hxx             |   34 +
 simgear/props/PropertyBasedMgr.cxx                 |    8 +
 simgear/props/PropertyInterpolationMgr.cxx         |  255 +++
 simgear/props/PropertyInterpolationMgr.hxx         |  147 ++
 simgear/props/PropertyInterpolator.cxx             |  104 ++
 simgear/props/PropertyInterpolator.hxx             |  101 ++
 simgear/props/condition.cxx                        |   66 +-
 simgear/props/condition.hxx                        |    2 +
 simgear/props/easing_functions.cxx                 |  231 +++
 .../CanvasText.hxx => props/easing_functions.hxx}  |   45 +-
 simgear/props/easing_functions_test.cxx            |   54 +
 simgear/props/propertyObject.cxx                   |   12 +-
 simgear/props/propertyObject.hxx                   |   16 +-
 simgear/props/propertyObject_test.cxx              |    1 +
 simgear/props/props.cxx                            |   47 +
 simgear/props/props.hxx                            |   43 +
 simgear/props/props_test.cxx                       |   10 +-
 simgear/scene/material/CMakeLists.txt              |   10 +
 simgear/scene/material/Effect.cxx                  |   63 +-
 simgear/scene/material/EffectGeode.cxx             |   20 +-
 simgear/scene/material/Technique.cxx               |    8 +-
 simgear/scene/material/mat.cxx                     |    2 +
 simgear/scene/material/mat.hxx                     |    4 +
 simgear/scene/material/parseBlendFunc.cxx          |   98 ++
 simgear/scene/material/parseBlendFunc.hxx          |   52 +
 simgear/scene/material/parseBlendFunc_test.cxx     |   63 +
 simgear/scene/model/CMakeLists.txt                 |   12 +
 simgear/scene/model/SGLightAnimation.cxx           |    6 +-
 simgear/scene/model/SGMaterialAnimation.hxx        |    2 +-
 simgear/scene/model/SGPickAnimation.cxx            |  833 ++++++++++
 simgear/scene/model/SGPickAnimation.hxx            |  121 ++
 simgear/scene/model/SGReaderWriterXML.cxx          |   68 +-
 simgear/scene/model/SGText.cxx                     |   11 +
 simgear/scene/model/SGTrackToAnimation.cxx         |  372 +++++
 simgear/scene/model/SGTrackToAnimation.hxx         |   52 +
 simgear/scene/model/animation.cxx                  |  478 ++----
 simgear/scene/model/animation.hxx                  |   83 +-
 simgear/scene/model/animation_test.cxx             |   69 +
 simgear/scene/model/modellib.hxx                   |    1 +
 simgear/scene/sky/sky.cxx                          |    2 +-
 simgear/scene/tgdb/BucketBox.hxx                   |  119 +-
 simgear/scene/tgdb/CMakeLists.txt                  |    3 +-
 simgear/scene/tgdb/ReaderWriterSPT.cxx             |  194 ++-
 simgear/scene/tgdb/ReaderWriterSPT.hxx             |   12 +-
 simgear/scene/tgdb/ReaderWriterSTG.cxx             |  168 +-
 simgear/scene/tgdb/SGBuildingBin.cxx               |   13 +-
 simgear/scene/tgdb/SGBuildingBin.hxx               |   29 +-
 simgear/scene/tgdb/SGOceanTile.cxx                 |    1 +
 simgear/scene/tgdb/SGTexturedTriangleBin.hxx       |    1 +
 simgear/scene/tgdb/TreeBin.cxx                     |    4 +-
 simgear/scene/tgdb/obj.cxx                         |    9 +-
 simgear/scene/tgdb/pt_lights.cxx                   |    6 +-
 simgear/scene/tsync/terrasync.cxx                  |   79 +-
 simgear/scene/tsync/terrasync.hxx                  |    7 +
 simgear/scene/util/CMakeLists.txt                  |   12 +-
 simgear/scene/util/ColorInterpolator.cxx           |   74 +
 .../util/ColorInterpolator.hxx}                    |   49 +-
 simgear/scene/util/SGPickCallback.hxx              |   60 +-
 simgear/scene/util/parse_color.cxx                 |   35 +-
 simgear/scene/util/parse_color_test.cxx            |   41 +-
 simgear/simgear_config_cmake.h.in                  |    2 +
 simgear/sound/CMakeLists.txt                       |   10 +-
 simgear/sound/sample_group.cxx                     |    4 +
 simgear/sound/sample_queue.hxx                     |    1 -
 simgear/structure/CMakeLists.txt                   |   16 +-
 simgear/structure/SGBinding.cxx                    |   87 +-
 simgear/structure/SGBinding.hxx                    |   40 +-
 simgear/structure/SGExpression.cxx                 |    4 +-
 simgear/structure/SGExpression.hxx                 |   41 +-
 simgear/structure/SGSharedPtr.hxx                  |   47 +
 simgear/structure/SGWeakReferenced.hxx             |   11 +
 simgear/structure/StateMachine.cxx                 |  493 ++++++
 simgear/structure/StateMachine.hxx                 |  177 ++
 simgear/structure/commands.cxx                     |    9 +-
 simgear/structure/commands.hxx                     |   78 +-
 simgear/structure/event_mgr.cxx                    |    3 +-
 simgear/structure/expression_test.cxx              |  110 ++
 simgear/structure/state_machine_test.cxx           |  244 +++
 simgear/structure/subsystem_mgr.cxx                |   30 +-
 simgear/xml/easyxml.cxx                            |   18 +-
 simgear/xml/easyxml.hxx                            |   18 +
 version                                            |    2 +-
 211 files changed, 18076 insertions(+), 2214 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