Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.1 FATAL_ERROR)

 if(COMMAND cmake_policy)
    # Works around warnings libraries linked against that don't
@@ -26,8 +26,8 @@ SET_PROPERTY( GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMake Targets" )
 PROJECT(OSGEARTH)

 SET(OSGEARTH_MAJOR_VERSION 2)
-SET(OSGEARTH_MINOR_VERSION 9)
-SET(OSGEARTH_PATCH_VERSION 0)
+SET(OSGEARTH_MINOR_VERSION 10)
+SET(OSGEARTH_PATCH_VERSION 1)
 SET(OSGEARTH_SOVERSION     0)

 SET(OSGEARTH_PLUGIN_PREFIX "")
@@ -224,6 +224,10 @@ SET(CMAKE_MINSIZEREL_POSTFIX "s" CACHE STRING "add a postfix, usually empty on w

 INCLUDE(OsgEarthMacroUtils)

+# Detect C++11 compiler support and set a variable.
+INCLUDE(CXX11)
+check_for_cxx11_compiler(CXX11_AVAILABLE)
+
 DETECT_OSG_VERSION()

 IF (NOT OPENSCENEGRAPH_VERSION)

--- a/CMakeModules/CXX11.cmake
+++ b/CMakeModules/CXX11.cmake
+# Copyright (c) 2013 Nathan Osman
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+# Determines whether or not the compiler supports C++11
+
+# Adapted from:
+# https://github.com/nathan-osman/CXX11-CMake-Macros
+#
+# Pass:
+#   msvc 14+
+#   g++ 4.9.0+
+#   clang 3.4+
+#
+# Earlier versions of these compilers might support C++11 but the purposes
+# of osgEarth we are using these minimum requirements.
+
+macro(check_for_cxx11_compiler _VAR)
+    set(${_VAR})
+    if((MSVC AND NOT ${MSVC_VERSION} VERSION_LESS 1900) OR
+       (CMAKE_COMPILER_IS_GNUCXX AND NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 4.9.0) OR
+       (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 3.4))
+        set(${_VAR} 1)
+
+        message(STATUS "Checking for C++11 compiler - available")
+
+        # enable C++11 compilation if available
+        set(CMAKE_CXX_STANDARD 11)
+        add_definitions(-DOSGEARTH_CXX11)
+
+        # is GCC < 5, use the old ABI for binary compatibility
+        if (CMAKE_COMPILER_IS_GNUCXX AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 5.0)
+            add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
+        endif()
+    else()
+        message(STATUS "Checking for C++11 compiler - unavailable")
+    endif()
+endmacro()
--- a/README.md
+++ b/README.md
 [![Build Status](https://travis-ci.org/gwaldron/osgearth.svg?branch=master)](https://travis-ci.org/gwaldron/osgearth)
 [![Coverity Status](https://scan.coverity.com/projects/9251/badge.svg)](https://scan.coverity.com/projects/gwaldron-osgearth)

-osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-Copyright 2015 Pelican Mapping
+osgEarth - Geospatial SDK for OpenSceneGraph
+Copyright 2018 Pelican Mapping

 http://osgearth.org


--- a/debian/changelog
+++ b/debian/changelog
-osgearth (2.10.0+dfsg-2) UNRELEASED; urgency=medium
+osgearth (2.10.1+dfsg-1~exp1) experimental; urgency=medium

+  * New upstream release.
  * Bump Standards-Version to 4.3.0, no changes.
+  * Update copyright file, changes:
+    - Update copyright years for Pelican Mapping
+    - Add license & copyright for gltf sources
+  * Refresh patches.
+  * Add lintian overrides for file-references-package-build-path.
+  * Update symbols for amd64.

- -- Bas Couwenberg <sebastic@debian.org>  Tue, 25 Dec 2018 22:48:09 +0100
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 19 Apr 2019 21:27:39 +0200

 osgearth (2.10.0+dfsg-1) unstable; urgency=medium


--- a/debian/copyright
+++ b/debian/copyright
@@ -115,7 +115,7 @@ Files-Excluded: data/2s19_ru_desert.tga
 License: LGPL-3+

 Files: *
-Copyright: 2008-2018, Pelican Mapping
+Copyright: 2008-2019, Pelican Mapping
                2012, Thomas Hogarth
           2008-2010, Pelican Ventures, Inc
 License: LGPL-2+
@@ -159,6 +159,20 @@ Copyright: 2006, Id Software, Inc.
           2007, Electronic Visualization Laboratory, University of Illinois at Chicago
 License: LGPL-2.1+

+Files: src/osgEarthDrivers/gltf/json.hpp
+Copyright: 2013-2017, Niels Lohmann <http://nlohmann.me>
+License: Expat
+
+Files: src/osgEarthDrivers/gltf/stb_image.h
+ src/osgEarthDrivers/gltf/stb_image_write.h
+Copyright: Disclaimed
+License: public-domain
+ no warranty implied; use at your own risk
+
+Files: src/osgEarthDrivers/gltf/tiny_gltf.h
+Copyright:  2015-2018, Syoyo Fujita, Aurélien Chatelain and many contributors.
+License: Expat
+
 Files: src/osgEarthDrivers/kml/rapidxml.hpp
 src/osgEarthDrivers/kml/rapidxml_ext.hpp
 src/osgEarthDrivers/kml/rapidxml_iterators.hpp

--- a/debian/libosgearth5.symbols
+++ b/debian/libosgearth5.symbols
--- a/debian/libosgearthannotation5.symbols
+++ b/debian/libosgearthannotation5.symbols
-# SymbolsHelper-Confirmed: 2.10.0 amd64 arm64 armel armhf i386 m68k mips mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc64 x32
+# SymbolsHelper-Confirmed: 2.10.1 amd64
 libosgEarthAnnotation.so.5 #PACKAGE# #MINVER#
 * Build-Depends-Package: libosgearth-dev
 _ZN15DraggerCallback17onPositionChangedEPKN8osgEarth10Annotation7DraggerERKNS0_8GeoPointE@Base 2.7.0
@@ -321,6 +321,7 @@ libosgEarthAnnotation.so.5 #PACKAGE# #MINVER#
 _ZN8osgEarth10Annotation15AddPointHandlerD1Ev@Base 2.4.0
 _ZN8osgEarth10Annotation15AnnotationLayer11deserializeEv@Base 2.9.0
 _ZN8osgEarth10Annotation15AnnotationLayer4initEv@Base 2.9.0
+ _ZN8osgEarth10Annotation15AnnotationLayer8addChildEPNS0_14AnnotationNodeE@Base 2.10.1
 _ZN8osgEarth10Annotation15AnnotationLayerC1ERKNS0_22AnnotationLayerOptionsE@Base 2.9.0
 _ZN8osgEarth10Annotation15AnnotationLayerC1Ev@Base 2.9.0
 _ZN8osgEarth10Annotation15AnnotationLayerC2ERKNS0_22AnnotationLayerOptionsE@Base 2.9.0
@@ -567,6 +568,11 @@ libosgEarthAnnotation.so.5 #PACKAGE# #MINVER#
 (optional=templinst)_ZN8osgEarth12PluginLoaderINS_10Annotation15AnnotationLayerENS_5LayerEED0Ev@Base 2.9.0
 (optional=templinst)_ZN8osgEarth12PluginLoaderINS_10Annotation15AnnotationLayerENS_5LayerEED1Ev@Base 2.9.0
 (optional=templinst)_ZN8osgEarth12PluginLoaderINS_10Annotation15AnnotationLayerENS_5LayerEED2Ev@Base 2.9.0
+ _ZN8osgEarth13ShaderOptions7SamplerD1Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptions7SamplerD2Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptionsD0Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptionsD1Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptionsD2Ev@Base 2.10.1
 _ZN8osgEarth15GeometryClamperD1Ev@Base 2.8~rc1
 _ZN8osgEarth15TerrainCallback11onTileAddedERKNS_7TileKeyEPN3osg4NodeERNS_22TerrainCallbackContextE@Base 2.6.0
 _ZN8osgEarth15TerrainCallbackD0Ev@Base 2.4.0
@@ -599,13 +605,10 @@ libosgEarthAnnotation.so.5 #PACKAGE# #MINVER#
 _ZN8osgEarth5Layer10addedToMapEPKNS_3MapE@Base 2.9.0
 _ZN8osgEarth5Layer14removedFromMapEPKNS_3MapE@Base 2.9.0
 _ZN8osgEarth5Layer18getSequenceControlEv@Base 2.9.0
- _ZN8osgEarth5Layer19setTerrainResourcesEPNS_16TerrainResourcesE@Base 2.9.0
 _ZN8osgEarth5Units7convertERKS0_S2_dRd@Base 2.9.0
- _ZN8osgEarth5UnitsC1ERKS0_@Base 2.8~rc1
- _ZN8osgEarth5UnitsC2ERKS0_@Base 2.8~rc1
 _ZN8osgEarth5UnitsD1Ev@Base 2.4.0
 _ZN8osgEarth5UnitsD2Ev@Base 2.4.0
- (optional=templinst)_ZN8osgEarth6Config3addIjEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6Config3setINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvRKS7_RKT_@Base 2.10.1
 (optional=templinst)_ZN8osgEarth6Config3setIdEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.10.0
 _ZN8osgEarth6Config6removeERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.0
 _ZN8osgEarth6ConfigC1ERKS0_@Base 2.4.0
@@ -629,6 +632,9 @@ libosgEarthAnnotation.so.5 #PACKAGE# #MINVER#
 (optional=templinst)_ZN8osgEarth8optionalINS_12ShaderPolicyEED0Ev@Base 2.4.0
 (optional=templinst)_ZN8osgEarth8optionalINS_12ShaderPolicyEED1Ev@Base 2.4.0
 (optional=templinst)_ZN8osgEarth8optionalINS_12ShaderPolicyEED2Ev@Base 2.4.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_13ShaderOptionsEED0Ev@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth8optionalINS_13ShaderOptionsEED1Ev@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth8optionalINS_13ShaderOptionsEED2Ev@Base 2.10.1
 (optional=templinst)_ZN8osgEarth8optionalINS_16GeoInterpolationEED0Ev@Base 2.4.0
 (optional=templinst)_ZN8osgEarth8optionalINS_16GeoInterpolationEED1Ev@Base 2.4.0
 (optional=templinst)_ZN8osgEarth8optionalINS_16GeoInterpolationEED2Ev@Base 2.4.0
@@ -994,6 +1000,13 @@ libosgEarthAnnotation.so.5 #PACKAGE# #MINVER#
 (optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sparc64)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.4.0
 (optional=templinst|arch=alpha amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_@Base 2.9.0
 (optional=templinst)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7SamplerESaIS2_EED1Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7SamplerESaIS2_EED2Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7SamplerESaIS2_EEaSERKS4_@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7UniformESaIS2_EED1Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7UniformESaIS2_EED2Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7UniformESaIS2_EEaSERKS4_@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth3URIESaIS1_EEaSERKS3_@Base 2.10.1
 (optional=templinst)_ZNSt6vectorIPN3osg4NodeESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
 (optional=templinst)_ZNSt6vectorISt4pairIN8osgEarth9Symbology16StringExpression2OpENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEESaISB_EEaSERKSD_@Base 2.7.0
 (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEjESaIS7_EEaSERKS9_@Base 2.7.0
@@ -1007,12 +1020,17 @@ libosgEarthAnnotation.so.5 #PACKAGE# #MINVER#
 (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base 2.7.0
 (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev@Base 2.7.0
 (optional=templinst|arch=hurd-i386)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EE9push_backERKS2_@Base 2.9.0
+ (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC1ERKS4_@Base 2.10.1
+ (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC2ERKS4_@Base 2.10.1
+ (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEaSERKS4_@Base 2.10.1
 (optional=templinst)_ZNSt8_Rb_treeIN7osgUtil22LineSegmentIntersector12IntersectionES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.7.0
 (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeIN8osgEarth10Annotation12ImageOverlay12ControlPointESt4pairIKS3_N3osg7ref_ptrINS1_7DraggerEEEESt10_Select1stISA_ESt4lessIS3_ESaISA_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISA_ERS5_@Base 2.7.0
 (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth10Annotation12ImageOverlay12ControlPointESt4pairIKS3_N3osg7ref_ptrINS1_7DraggerEEEESt10_Select1stISA_ESt4lessIS3_ESaISA_EE8_M_eraseEPSt13_Rb_tree_nodeISA_E@Base 2.7.0
 (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth20PrimitiveIntersector12IntersectionES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.7.0
 (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE7_M_copyINSI_11_Alloc_nodeEEEPSt13_Rb_tree_nodeISC_EPKSM_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE7_M_copyINSI_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeISC_EPKSM_PSt18_Rb_tree_node_baseRT_@Base 2.10.1
 (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE8_M_eraseEPSt13_Rb_tree_nodeISC_E@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EEaSERKSI_@Base 2.10.1
 (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth10Annotation14TrackNodeFieldEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE7_M_copyINSH_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeISB_EPKSL_PSt18_Rb_tree_node_baseRT_@Base 2.10.0
 (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth10Annotation14TrackNodeFieldEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE8_M_eraseEPSt13_Rb_tree_nodeISB_E@Base 2.10.0
 (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth10Annotation14TrackNodeFieldEESt10_Select1stISB_ESt4lessIS5_ESaISB_EEaSERKSH_@Base 2.10.0
@@ -1107,6 +1125,7 @@ libosgEarthAnnotation.so.5 #PACKAGE# #MINVER#
 _ZTIN8osgEarth8optionalIN3osg7Texture10FilterModeEEE@Base 2.4.0
 _ZTIN8osgEarth8optionalINS_11CachePolicyEEE@Base 2.9.0
 _ZTIN8osgEarth8optionalINS_12ShaderPolicyEEE@Base 2.4.0
+ _ZTIN8osgEarth8optionalINS_13ShaderOptionsEEE@Base 2.10.1
 _ZTIN8osgEarth8optionalINS_16GeoInterpolationEEE@Base 2.4.0
 _ZTIN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEEE@Base 2.10.0
 _ZTIN8osgEarth8optionalINS_3URIEEE@Base 2.4.0
@@ -1206,6 +1225,7 @@ libosgEarthAnnotation.so.5 #PACKAGE# #MINVER#
 _ZTSN8osgEarth8optionalIN3osg7Texture10FilterModeEEE@Base 2.4.0
 _ZTSN8osgEarth8optionalINS_11CachePolicyEEE@Base 2.9.0
 _ZTSN8osgEarth8optionalINS_12ShaderPolicyEEE@Base 2.4.0
+ _ZTSN8osgEarth8optionalINS_13ShaderOptionsEEE@Base 2.10.1
 _ZTSN8osgEarth8optionalINS_16GeoInterpolationEEE@Base 2.4.0
 _ZTSN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEEE@Base 2.10.0
 _ZTSN8osgEarth8optionalINS_3URIEEE@Base 2.4.0
@@ -1303,6 +1323,7 @@ libosgEarthAnnotation.so.5 #PACKAGE# #MINVER#
 _ZTVN8osgEarth8optionalIN3osg7Texture10FilterModeEEE@Base 2.4.0
 _ZTVN8osgEarth8optionalINS_11CachePolicyEEE@Base 2.9.0
 _ZTVN8osgEarth8optionalINS_12ShaderPolicyEEE@Base 2.4.0
+ _ZTVN8osgEarth8optionalINS_13ShaderOptionsEEE@Base 2.10.1
 _ZTVN8osgEarth8optionalINS_16GeoInterpolationEEE@Base 2.4.0
 _ZTVN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEEE@Base 2.10.0
 _ZTVN8osgEarth8optionalINS_3URIEEE@Base 2.4.0

--- a/debian/libosgearthfeatures5.lintian-overrides
+++ b/debian/libosgearthfeatures5.lintian-overrides
+# Uses __FILE__ macro
+file-references-package-build-path *
+
--- a/debian/libosgearthfeatures5.symbols
+++ b/debian/libosgearthfeatures5.symbols
--- a/debian/libosgearthsplat5.symbols
+++ b/debian/libosgearthsplat5.symbols
--- a/debian/libosgearthsymbology5.symbols
+++ b/debian/libosgearthsymbology5.symbols
-# SymbolsHelper-Confirmed: 2.10.0 amd64 arm64 armel armhf i386 m68k mips mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc64 x32
+# SymbolsHelper-Confirmed: 2.10.1 amd64
 libosgEarthSymbology.so.5 #PACKAGE# #MINVER#
 * Build-Depends-Package: libosgearth-dev
 _ZN3agg10rasterizer15s_default_gammaE@Base 2.4.0
@@ -561,20 +561,17 @@ libosgEarthSymbology.so.5 #PACKAGE# #MINVER#
 _ZN8osgEarth5UnitsC2ERKS0_@Base 2.9.0
 _ZN8osgEarth5UnitsD1Ev@Base 2.4.0
 _ZN8osgEarth5UnitsD2Ev@Base 2.4.0
- (arch=!amd64 !arm64 !x32)_ZN8osgEarth5UnitsaSERKS0_@Base 2.10.0
+ (arch=!arm64 !x32)_ZN8osgEarth5UnitsaSERKS0_@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth6Config3setINS_9Symbology16StringExpressionEEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.10.1
 (optional=templinst)_ZN8osgEarth6Config3setINS_9Symbology17NumericExpressionEEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.10.0
- (optional=templinst)_ZN8osgEarth6Config3setINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvRKS7_RKNS_8optionalIT_EE@Base 2.10.0
 (optional=templinst)_ZN8osgEarth6Config3setINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvRKS7_RKT_@Base 2.10.0
 (optional=templinst)_ZN8osgEarth6Config3setIS0_EEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.10.0
- (optional=templinst)_ZN8osgEarth6Config3setIbEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.10.0
- (optional=templinst)_ZN8osgEarth6Config3setIdEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.10.0
 (optional=templinst)_ZN8osgEarth6Config3setIfEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.10.0
- (optional=templinst)_ZN8osgEarth6Config3setIjEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.10.0
 _ZN8osgEarth6Config6removeERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.9.0
- _ZN8osgEarth6ConfigC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.10.0
 _ZN8osgEarth6ConfigC1ERKS0_@Base 2.4.0
- _ZN8osgEarth6ConfigC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6ConfigC1INSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEERKS7_RKT_@Base 2.10.1
 _ZN8osgEarth6ConfigC2ERKS0_@Base 2.4.0
+ (optional=templinst)_ZN8osgEarth6ConfigC2INSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEERKS7_RKT_@Base 2.10.1
 _ZN8osgEarth7TileKeyD0Ev@Base 2.4.0
 _ZN8osgEarth7TileKeyD1Ev@Base 2.4.0
 _ZN8osgEarth7TileKeyD2Ev@Base 2.4.0
@@ -1566,8 +1563,8 @@ libosgEarthSymbology.so.5 #PACKAGE# #MINVER#
 (optional=templinst)_ZNK8osgEarth6Config3getIN7osgText4Text12BackdropTypeES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.10.0
 (optional=templinst)_ZNK8osgEarth6Config3getIN7osgText4Text22BackdropImplementationES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.10.0
 (optional=templinst)_ZNK8osgEarth6Config3getINS_3URIEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.10.0
- (optional=templinst|arch=!amd64 !arm64 !x32)_ZNK8osgEarth6Config3getINS_9Symbology10IconSymbol9AlignmentES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.10.0
- (optional=templinst|arch=!amd64 !arm64 !x32)_ZNK8osgEarth6Config3getINS_9Symbology10TextSymbol6LayoutES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.10.0
+ (optional=templinst|arch=!arm64 !x32)_ZNK8osgEarth6Config3getINS_9Symbology10IconSymbol9AlignmentES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.10.0
+ (optional=templinst|arch=!arm64 !x32)_ZNK8osgEarth6Config3getINS_9Symbology10TextSymbol6LayoutES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.10.0
 (optional=templinst)_ZNK8osgEarth6Config3getINS_9Symbology10TextSymbol8EncodingES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.10.0
 (optional=templinst)_ZNK8osgEarth6Config3getINS_9Symbology10TextSymbol9AlignmentES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.10.0
 (optional=templinst)_ZNK8osgEarth6Config3getINS_9Symbology17NumericExpressionEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.10.0
@@ -1864,7 +1861,6 @@ libosgEarthSymbology.so.5 #PACKAGE# #MINVER#
 (optional=templinst|subst)_ZNSt6vectorIN3osg6Vec3ubESaIS1_EE7reserveE{size_t}@Base 2.9.0
 (optional=templinst|subst)_ZNSt6vectorIN3osg6Vec3uiESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.9.0
 (optional=templinst|arch=armel armhf hurd-i386 powerpc powerpcspe)_ZNSt6vectorIN3osg6Vec3uiESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
- (optional=templinst|subst)_ZNSt6vectorIN3osg6Vec3uiESaIS1_EE7reserveE{size_t}@Base 2.9.0
 (optional=templinst|subst)_ZNSt6vectorIN3osg6Vec3usESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.9.0
 (optional=templinst|subst)_ZNSt6vectorIN3osg6Vec3usESaIS1_EE7reserveE{size_t}@Base 2.9.0
 (optional=templinst|subst)_ZNSt6vectorIN3osg6Vec4ubESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.9.0
@@ -1916,9 +1912,8 @@ libosgEarthSymbology.so.5 #PACKAGE# #MINVER#
 (optional=templinst)_ZNSt6vectorISt4pairIN8osgEarth9Symbology16StringExpression2OpENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEESaISB_EED1Ev@Base 2.7.0
 (optional=templinst)_ZNSt6vectorISt4pairIN8osgEarth9Symbology16StringExpression2OpENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEESaISB_EED2Ev@Base 2.7.0
 (optional=templinst)_ZNSt6vectorISt4pairIN8osgEarth9Symbology16StringExpression2OpENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEESaISB_EEaSERKSD_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 i386 m68k mips64el ppc64 ppc64el s390x sparc64 x32)_ZNSt6vectorISt4pairIN8osgEarth9Symbology17NumericExpression2OpEdESaIS5_EE12emplace_backIJS5_EEEvDpOT_@Base 2.8~rc1
 (optional=templinst)_ZNSt6vectorISt4pairIN8osgEarth9Symbology17NumericExpression2OpEdESaIS5_EE17_M_realloc_insertIJRKS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=armel armhf mips mipsel powerpc powerpcspe)_ZNSt6vectorISt4pairIN8osgEarth9Symbology17NumericExpression2OpEdESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.10.0
+ (optional=templinst|arch=amd64 armel armhf mips mipsel powerpc powerpcspe)_ZNSt6vectorISt4pairIN8osgEarth9Symbology17NumericExpression2OpEdESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.10.0
 (optional=templinst)_ZNSt6vectorISt4pairIN8osgEarth9Symbology17NumericExpression2OpEdESaIS5_EEaSERKS7_@Base 2.4.0
 (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEjESaIS7_EE17_M_realloc_insertIJS7_EEEvN9__gnu_cxx17__normal_iteratorIPS7_S9_EEDpOT_@Base 2.9.0
 (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEjESaIS7_EED1Ev@Base 2.7.0
@@ -1960,6 +1955,8 @@ libosgEarthSymbology.so.5 #PACKAGE# #MINVER#
 (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base 2.7.0
 (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev@Base 2.7.0
 (optional=templinst|arch=hurd-i386)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EE9push_backERKS2_@Base 2.9.0
+ (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC1ERKS4_@Base 2.10.1
+ (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC2ERKS4_@Base 2.10.1
 (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEaSERKS4_@Base 2.9.0
 (optional=templinst)_ZNSt8_Rb_treeIN3osg5Vec3fESt4pairIKS1_jESt10_Select1stIS4_ESt4lessIS1_ESaIS4_EE24_M_get_insert_unique_posERS3_@Base 2.4.0
 (optional=templinst)_ZNSt8_Rb_treeIN3osg5Vec3fESt4pairIKS1_jESt10_Select1stIS4_ESt4lessIS1_ESaIS4_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS4_ERS3_@Base 2.9.0
@@ -1972,6 +1969,7 @@ libosgEarthSymbology.so.5 #PACKAGE# #MINVER#
 (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology12SkinResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESP_IJEEEEESt17_Rb_tree_iteratorISE_ESt23_Rb_tree_const_iteratorISE_EDpOT_@Base 2.9.0
 (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology12SkinResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
 (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology12SkinResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISE_ERS7_@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology12SkinResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE5eraseERS7_@Base 2.10.1
 (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology12SkinResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE8_M_eraseEPSt13_Rb_tree_nodeISE_E@Base 2.7.0
 (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology15ResourceLibraryEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESP_IJEEEEESt17_Rb_tree_iteratorISE_ESt23_Rb_tree_const_iteratorISE_EDpOT_@Base 2.9.0
 (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology15ResourceLibraryEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
@@ -1981,6 +1979,7 @@ libosgEarthSymbology.so.5 #PACKAGE# #MINVER#
 (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology16InstanceResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESP_IJEEEEESt17_Rb_tree_iteratorISE_ESt23_Rb_tree_const_iteratorISE_EDpOT_@Base 2.9.0
 (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology16InstanceResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
 (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology16InstanceResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISE_ERS7_@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology16InstanceResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE5eraseERS7_@Base 2.10.1
 (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology16InstanceResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE8_M_eraseEPSt13_Rb_tree_nodeISE_E@Base 2.7.0
 (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESN_IJEEEEESt17_Rb_tree_iteratorISC_ESt23_Rb_tree_const_iteratorISC_EDpOT_@Base 2.9.0
 (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE24_M_get_insert_unique_posERS7_@Base 2.7.0

--- a/debian/libosgearthutil5.symbols
+++ b/debian/libosgearthutil5.symbols
--- a/debian/openscenegraph-plugin-osgearth.lintian-overrides
+++ b/debian/openscenegraph-plugin-osgearth.lintian-overrides
@@ -5,3 +5,6 @@ hardening-no-fortify-functions usr/lib/osgPlugins-*/osgdb_template.so
 # False positive for American English
 spelling-error-in-binary usr/lib/osgPlugins-*/* Cancelation Cancellation

+# Uses __FILE__ macro
+file-references-package-build-path *
+
--- a/debian/patches/soversion.patch
+++ b/debian/patches/soversion.patch
@@ -5,8 +5,8 @@ Author: Pirmin Kalberer <pka@sourcepole.ch>
 +++ b/CMakeLists.txt
 @@ -28,7 +28,7 @@ PROJECT(OSGEARTH)
 SET(OSGEARTH_MAJOR_VERSION 2)
- SET(OSGEARTH_MINOR_VERSION 9)
- SET(OSGEARTH_PATCH_VERSION 0)
+ SET(OSGEARTH_MINOR_VERSION 10)
+ SET(OSGEARTH_PATCH_VERSION 1)
 -SET(OSGEARTH_SOVERSION     0)
 +SET(OSGEARTH_SOVERSION     5)
 

--- a/debian/patches/spelling-errors.patch
+++ b/debian/patches/spelling-errors.patch
@@ -4,7 +4,7 @@ Author: Bas Couwenberg <sebastic@debian.org>

 --- a/src/osgEarth/SpatialReference.cpp
 +++ b/src/osgEarth/SpatialReference.cpp
-@@ -393,7 +393,7 @@ SpatialReference::~SpatialReference()
+@@ -400,7 +400,7 @@ SpatialReference::~SpatialReference()
         }
         else
         {

--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -41,16 +41,16 @@ master_doc = 'index'

 # General information about the project.
 project = u'osgEarth'
-copyright = u'2013, Pelican Mapping'
+copyright = u'2018, Pelican Mapping'

 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '2.4'
+version = '2.10'
 # The full version, including alpha/beta/rc tags.
-release = '2.4'
+release = '2.10'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

--- a/docs/source/developer/utilities.rst
+++ b/docs/source/developer/utilities.rst
@@ -6,47 +6,6 @@ with the map. None of these are strictly necessary for using osgEarth, but they
 make it easier to perform some common operations.


-DataScanner
-----------
-
-The ``DataScanner`` will recursively search a directory tree on the local filesystem
-for files that it can load as ``ImageLayer`` objects. It is a quick and easy way to 
-load a full directory of images as layers.
-
-**NOTE** that only the *MP Terrain Engine* supports an unlimited number of image layers,
-so it is wise to use that engine in conjunction with the DataScanner.
-
-Use DataScanner like this::
-
-    DataScanner scanner;
-    ImageLayerVector imageLayers;
-    scanner.findImageLayers( rootFolder, extensions, imageLayers );
-    
-You can then add the image layes to your ``Map`` object.
-
-The ``extensions`` parameter lets you filter files by extension. For example, pass in 
-"tif,ecw" to only consider files with those extensions. Separate multiple extensions
-with a comma.
-
-
-DetailTexture
-------------
-
-``DetailTexture`` is a terrain controller that will apply a non-geospatial texture
-across the terrain. This is an old trick that you can use to generate "noise" that makes
-a low resolution terrain appear more detailed::
-
-    DetailTexture* detail = new DetailTexture();
-    detail->setImage( osgDB::readImageFile("mytexture.jpg") );
-    detail->setIntensity( 0.5f );
-    detail->setImageUnit( 4 );
-    mapnode->getTerrainEngine()->addEffect( detail );
-
-Try the example. Zoom in fairly close to the terrain to see the effect::
-
-    osgearth_detailtex readymap.earth
-
-
 Logarithmic Depth Buffer
 ------------------------


--- a/docs/source/faq.rst
+++ b/docs/source/faq.rst
@@ -51,12 +51,20 @@ I loaded a model, but it has no texture/lighting/etc. in osgEarth. Why?
    like sky lighting.


-My Annotations (FeatureNode, etc.) are not rendering. Why?
-..........................................................
+Lines or Annotations (FeatureNode, etc.) are not rendering. Why?
+................................................................

-    Best practice is to place an Annotation node (FeatureNodes, PlaceNodes, etc.)
-    as a descendant of the MapNode in your scene graph. You can also add them
-    to an AnnotationLayer and add that layer to the Map.
+    Lines render using a shader that requires some initial state to be set.
+    You can apply this state to your top-level camera (or anywhere else 
+    above the geometry) like so:
+    
+        #include <osgEarth/GLUtils>
+        ...
+        GLUtils::setGlobalDefaults(camera->getOrCreateStateSet());
+
+    For Annotations (FeatureNodes, PlaceNodes, etc.) best practice is to place
+    an Annotation node as a descendant of the MapNode in your scene graph.
+    You can also add them to an AnnotationLayer and add that layer to the Map.

    Annotations need access to the MapNode in order to render properly. If you 
    cannot place them under the MapNode, you will have to manually install a few

--- a/docs/source/releasenotes.rst
+++ b/docs/source/releasenotes.rst
 Release Notes
 =============

-Version 2.10 (TBD 2018)
+Version 2.10.1 (April 2019)
+---------------------------
+* Bug fix and performance release based on the 2.10 branch.
+
+Version 2.10 (November 2018)
 ----------------------------
 * REX terrain engine promoted to default. Old MP engine is now in legacy support mode.
 * Removed the osgEarthQt nodekit from the SDK, along with all Qt examples

--- a/src/applications/CMakeLists.txt
+++ b/src/applications/CMakeLists.txt
@@ -44,6 +44,7 @@ ADD_SUBDIRECTORY(osgearth_atlas)
 ADD_SUBDIRECTORY(osgearth_conv)
 ADD_SUBDIRECTORY(osgearth_3pv)
 ADD_SUBDIRECTORY(osgearth_featureinfo)
+#ADD_SUBDIRECTORY(osgearth_featuretiler)

 IF(BUILD_OSGEARTH_EXAMPLES)
    SET(TARGET_DEFAULT_LABEL_PREFIX "Sample")
@@ -95,6 +96,7 @@ IF(BUILD_OSGEARTH_EXAMPLES)
    ADD_SUBDIRECTORY(osgearth_magnify)
    ADD_SUBDIRECTORY(osgearth_eci)
    ADD_SUBDIRECTORY(osgearth_windows)
+    #ADD_SUBDIRECTORY(osgearth_3dtiles)

    IF(SILVERLINING_FOUND)
        ADD_SUBDIRECTORY(osgearth_silverlining)