[SCM] osgearth branch, master, updated. debian/1.4.1-1-77-g8ebb0ac

Bas Couwenberg sebastic at xs4all.nl
Wed Sep 18 19:45:43 UTC 2013 

The following commit has been merged in the master branch:
commit badba5c6346c0b053dc9772bb99ae31234f64e2d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Sep 18 18:05:15 2013 +0200

    Group copyright files paragraph with same years and holders.

diff --git a/debian/copyright b/debian/copyright
index 9440435..5e0ef8f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,6 +4,49 @@ Upstream-Contact: Glenn Waldron
 Source: http://osgearth.org/
 License: LGPL-3
 
+Files: src/applications/osgearth_kml/osgearth_kml.cpp
+ src/osgEarthDrivers/cache_sqlite3/Sqlite3Cache.cpp
+ src/osgEarthDrivers/engine_droam/AMRGeometry.cpp
+ src/osgEarthDrivers/engine_droam/AMRShaders.h
+ src/osgEarthDrivers/engine_droam/CubeManifold.cpp
+ src/osgEarthDrivers/engine_droam/Diamond.cpp
+ src/osgEarthDrivers/engine_droam/DRoamNode.cpp
+ src/osgEarthDrivers/engine_droam/Manifold.cpp
+ src/osgEarthDrivers/engine_droam/MeshManager.cpp
+ src/osgEarthDrivers/engine_droam/Plugin.cpp
+ src/osgEarthDrivers/engine_osgterrain/CustomTerrain.cpp
+ src/osgEarthDrivers/engine_osgterrain/CustomTile.cpp
+ src/osgEarthDrivers/engine_osgterrain/Terrain.cpp
+ src/osgEarthDrivers/engine_seamless/SeamlessEngineNode.cpp
+ src/osgEarthDrivers/mbtiles/ReaderWriterMBTiles.cpp
+ src/osgEarthDrivers/model_feature_label/FeatureLabelModelSource.cpp
+ src/osgEarthDrivers/wms/Capabilities.cpp
+ src/osgEarthFeatures/MarkerFactory.cpp
+ src/osgEarthQt/Actions.cpp
+ src/osgEarthSymbology/GeometryExtrudeSymbolizer.cpp
+ src/osgEarthSymbology/GeometrySymbol.cpp
+ src/osgEarthSymbology/GeometrySymbolizer.cpp
+ src/osgEarthSymbology/MarkerSymbolizer.cpp
+ src/osgEarthSymbology/ModelSymbolizer.cpp
+ src/osgEarthSymbology/Registry.cpp
+ src/osgEarthUtil/NearFarGroup.cpp
+Copyright: 2008-2010, Pelican Mapping
+License: LGPL-2+
+
+Files: src/osgEarthDrivers/engine_mp/LODFactorCallback.cpp
+ src/osgEarthDrivers/engine_osgterrain/LODFactorCallback.cpp
+ src/osgEarthDrivers/engine_quadtree/LODFactorCallback.cpp
+Copyright: 2008-2011, Pelican Mapping
+License: LGPL-2+
+
+Files: src/applications/osgearth_viewerIOS/osgEarthViewerIOS/osgearth_viewerIOS.cpp
+ src/osgEarth/ClampingBinTechnique.cpp
+ src/osgEarthDrivers/engine_quadtree/CustomPagedLOD.cpp
+ src/osgEarth/MapNodeObserver.cpp
+ src/osgEarth/Math.cpp
+Copyright: 2008-2012, Pelican Mapping
+License: LGPL-2+
+
 Files: src/applications/osgearth_annotation/osgearth_annotation.cpp
  src/applications/osgearth_backfill/osgearth_backfill.cpp
  src/applications/osgearth_boundarygen/BoundaryUtil.cpp
@@ -23,7 +66,6 @@ Files: src/applications/osgearth_annotation/osgearth_annotation.cpp
  src/applications/osgearth_features/osgearth_features.cpp
  src/applications/osgearth_graticule/osgearth_graticule.cpp
  src/applications/osgearth_imageoverlay/osgearth_imageoverlay.cpp
- src/applications/osgearth_kml/osgearth_kml.cpp
  src/applications/osgearth_los/osgearth_los.cpp
  src/applications/osgearth_manip/osgearth_manip.cpp
  src/applications/osgearth_map/osgearth_map.cpp
@@ -54,14 +96,12 @@ Files: src/applications/osgearth_annotation/osgearth_annotation.cpp
  src/applications/osgearth_version/osgearth_version.cpp
  src/applications/osgearth_verticalscale/osgearth_verticalscale.cpp
  src/applications/osgearth_viewer/osgearth_viewer.cpp
- src/applications/osgearth_viewerIOS/osgEarthViewerIOS/osgearth_viewerIOS.cpp
  src/osgEarth/Bounds.cpp
  src/osgEarth/Cache.cpp
  src/osgEarth/CachePolicy.cpp
  src/osgEarth/CacheSeed.cpp
  src/osgEarth/Capabilities.cpp
  src/osgEarth/ClampableNode.cpp
- src/osgEarth/ClampingBinTechnique.cpp
  src/osgEarth/ClampingTechnique.cpp
  src/osgEarth/ColorFilter.cpp
  src/osgEarth/CompositeTileSource.cpp
@@ -98,13 +138,11 @@ Files: src/applications/osgearth_annotation/osgearth_annotation.cpp
  src/osgEarth/MapFrame.cpp
  src/osgEarth/MapInfo.cpp
  src/osgEarth/MapNode.cpp
- src/osgEarth/MapNodeObserver.cpp
  src/osgEarth/MapNodeOptions.cpp
  src/osgEarth/MapOptions.cpp
  src/osgEarth/MaskLayer.cpp
  src/osgEarth/MaskNode.cpp
  src/osgEarth/MaskSource.cpp
- src/osgEarth/Math.cpp
  src/osgEarth/MemCache.cpp
  src/osgEarth/MimeTypes.cpp
  src/osgEarth/ModelLayer.cpp
@@ -175,24 +213,14 @@ Files: src/applications/osgearth_annotation/osgearth_annotation.cpp
  src/osgEarthDrivers/arcgis/ReaderWriterArcGIS.cpp
  src/osgEarthDrivers/arcgis_map_cache/ReaderWriterArcGISMapCache.cpp
  src/osgEarthDrivers/cache_filesystem/FileSystemCache.cpp
- src/osgEarthDrivers/cache_sqlite3/Sqlite3Cache.cpp
  src/osgEarthDrivers/debug/DebugTileSource.cpp
  src/osgEarthDrivers/earth/EarthFileSerializer1.cpp
  src/osgEarthDrivers/earth/EarthFileSerializer2.cpp
  src/osgEarthDrivers/earth/ReaderWriterOsgEarth.cpp
  src/osgEarthDrivers/engine_byo/BYOTerrainEngineDriver.cpp
  src/osgEarthDrivers/engine_byo/BYOTerrainEngineNode.cpp
- src/osgEarthDrivers/engine_droam/AMRGeometry.cpp
- src/osgEarthDrivers/engine_droam/AMRShaders.h
- src/osgEarthDrivers/engine_droam/CubeManifold.cpp
- src/osgEarthDrivers/engine_droam/DRoamNode.cpp
- src/osgEarthDrivers/engine_droam/Diamond.cpp
- src/osgEarthDrivers/engine_droam/Manifold.cpp
- src/osgEarthDrivers/engine_droam/MeshManager.cpp
- src/osgEarthDrivers/engine_droam/Plugin.cpp
  src/osgEarthDrivers/engine_mp/CustomPagedLOD.cpp
  src/osgEarthDrivers/engine_mp/KeyNodeFactory.cpp
- src/osgEarthDrivers/engine_mp/LODFactorCallback.cpp
  src/osgEarthDrivers/engine_mp/MPGeometry.cpp
  src/osgEarthDrivers/engine_mp/MPTerrainEngineDriver.cpp
  src/osgEarthDrivers/engine_mp/MPTerrainEngineNode.cpp
@@ -202,10 +230,7 @@ Files: src/applications/osgearth_annotation/osgearth_annotation.cpp
  src/osgEarthDrivers/engine_mp/TileModelFactory.cpp
  src/osgEarthDrivers/engine_mp/TileNode.cpp
  src/osgEarthDrivers/engine_mp/TileNodeRegistry.cpp
- src/osgEarthDrivers/engine_osgterrain/CustomTerrain.cpp
- src/osgEarthDrivers/engine_osgterrain/CustomTile.cpp
  src/osgEarthDrivers/engine_osgterrain/KeyNodeFactory.cpp
- src/osgEarthDrivers/engine_osgterrain/LODFactorCallback.cpp
  src/osgEarthDrivers/engine_osgterrain/MultiPassTerrainTechnique.cpp
  src/osgEarthDrivers/engine_osgterrain/OSGTerrainEngineNode.cpp
  src/osgEarthDrivers/engine_osgterrain/OSGTileFactory.cpp
@@ -215,13 +240,10 @@ Files: src/applications/osgearth_annotation/osgearth_annotation.cpp
  src/osgEarthDrivers/engine_osgterrain/SinglePassTerrainTechnique.cpp
  src/osgEarthDrivers/engine_osgterrain/StreamingTerrainNode.cpp
  src/osgEarthDrivers/engine_osgterrain/StreamingTile.cpp
- src/osgEarthDrivers/engine_osgterrain/Terrain.cpp
  src/osgEarthDrivers/engine_osgterrain/TerrainNode.cpp
  src/osgEarthDrivers/engine_osgterrain/Tile.cpp
  src/osgEarthDrivers/engine_osgterrain/TileBuilder.cpp
- src/osgEarthDrivers/engine_quadtree/CustomPagedLOD.cpp
  src/osgEarthDrivers/engine_quadtree/KeyNodeFactory.cpp
- src/osgEarthDrivers/engine_quadtree/LODFactorCallback.cpp
  src/osgEarthDrivers/engine_quadtree/QuadTreeTerrainEngineDriver.cpp
  src/osgEarthDrivers/engine_quadtree/QuadTreeTerrainEngineNode.cpp
  src/osgEarthDrivers/engine_quadtree/SerialKeyNodeFactory.cpp
@@ -230,7 +252,6 @@ Files: src/applications/osgearth_annotation/osgearth_annotation.cpp
  src/osgEarthDrivers/engine_quadtree/TileModelFactory.cpp
  src/osgEarthDrivers/engine_quadtree/TileNode.cpp
  src/osgEarthDrivers/engine_quadtree/TileNodeRegistry.cpp
- src/osgEarthDrivers/engine_seamless/SeamlessEngineNode.cpp
  src/osgEarthDrivers/feature_ogr/FeatureCursorOGR.cpp
  src/osgEarthDrivers/feature_ogr/FeatureSourceOGR.cpp
  src/osgEarthDrivers/feature_tfs/FeatureSourceTFS.cpp
@@ -268,9 +289,7 @@ Files: src/applications/osgearth_annotation/osgearth_annotation.cpp
  src/osgEarthDrivers/label_annotation/AnnotationLabelSource.cpp
  src/osgEarthDrivers/label_overlay/OverlayLabelSource.cpp
  src/osgEarthDrivers/mask_feature/FeatureMaskSource.cpp
- src/osgEarthDrivers/mbtiles/ReaderWriterMBTiles.cpp
  src/osgEarthDrivers/model_feature_geom/FeatureGeomModelSource.cpp
- src/osgEarthDrivers/model_feature_label/FeatureLabelModelSource.cpp
  src/osgEarthDrivers/model_feature_stencil/FeatureStencilModelSource.cpp
  src/osgEarthDrivers/model_simple/SimpleModelSource.cpp
  src/osgEarthDrivers/ocean_surface/ElevationProxyImageLayer.cpp
@@ -295,7 +314,6 @@ Files: src/applications/osgearth_annotation/osgearth_annotation.cpp
  src/osgEarthDrivers/wcs/ReaderWriterWCS.cpp
  src/osgEarthDrivers/wcs/WCS11Source.cpp
  src/osgEarthDrivers/wcs/WCS11Source.h
- src/osgEarthDrivers/wms/Capabilities.cpp
  src/osgEarthDrivers/wms/ReaderWriterWMS.cpp
  src/osgEarthDrivers/wms/TileService.cpp
  src/osgEarthDrivers/xyz/ReaderWriterXYZ.cpp
@@ -324,7 +342,6 @@ Files: src/applications/osgearth_annotation/osgearth_annotation.cpp
  src/osgEarthFeatures/GeometryCompiler.cpp
  src/osgEarthFeatures/GeometryUtils.cpp
  src/osgEarthFeatures/LabelSource.cpp
- src/osgEarthFeatures/MarkerFactory.cpp
  src/osgEarthFeatures/MeshClamper.cpp
  src/osgEarthFeatures/OgrUtils.cpp
  src/osgEarthFeatures/OptimizerHints.cpp
@@ -339,7 +356,6 @@ Files: src/applications/osgearth_annotation/osgearth_annotation.cpp
  src/osgEarthFeatures/TextSymbolizer.cpp
  src/osgEarthFeatures/TransformFilter.cpp
  src/osgEarthFeatures/VirtualFeatureSource.cpp
- src/osgEarthQt/Actions.cpp
  src/osgEarthQt/AnnotationDialogs.cpp
  src/osgEarthQt/AnnotationListWidget.cpp
  src/osgEarthQt/AnnotationToolbar.cpp
@@ -362,11 +378,8 @@ Files: src/applications/osgearth_annotation/osgearth_annotation.cpp
  src/osgEarthSymbology/Fill.cpp
  src/osgEarthSymbology/GEOS.cpp
  src/osgEarthSymbology/Geometry.cpp
- src/osgEarthSymbology/GeometryExtrudeSymbolizer.cpp
  src/osgEarthSymbology/GeometryFactory.cpp
  src/osgEarthSymbology/GeometryRasterizer.cpp
- src/osgEarthSymbology/GeometrySymbol.cpp
- src/osgEarthSymbology/GeometrySymbolizer.cpp
  src/osgEarthSymbology/IconResource.cpp
  src/osgEarthSymbology/IconSymbol.cpp
  src/osgEarthSymbology/InstanceResource.cpp
@@ -374,16 +387,13 @@ Files: src/applications/osgearth_annotation/osgearth_annotation.cpp
  src/osgEarthSymbology/LineSymbol.cpp
  src/osgEarthSymbology/MarkerResource.cpp
  src/osgEarthSymbology/MarkerSymbol.cpp
- src/osgEarthSymbology/MarkerSymbolizer.cpp
  src/osgEarthSymbology/MeshConsolidator.cpp
  src/osgEarthSymbology/MeshSubdivider.cpp
  src/osgEarthSymbology/ModelResource.cpp
  src/osgEarthSymbology/ModelSymbol.cpp
- src/osgEarthSymbology/ModelSymbolizer.cpp
  src/osgEarthSymbology/PointSymbol.cpp
  src/osgEarthSymbology/PolygonSymbol.cpp
  src/osgEarthSymbology/Query.cpp
- src/osgEarthSymbology/Registry.cpp
  src/osgEarthSymbology/RenderSymbol.cpp
  src/osgEarthSymbology/Resource.cpp
  src/osgEarthSymbology/ResourceCache.cpp
@@ -418,7 +428,6 @@ Files: src/applications/osgearth_annotation/osgearth_annotation.cpp
  src/osgEarthUtil/MGRSGraticule.cpp
  src/osgEarthUtil/MeasureTool.cpp
  src/osgEarthUtil/MouseCoordsTool.cpp
- src/osgEarthUtil/NearFarGroup.cpp
  src/osgEarthUtil/PolyhedralLineOfSight.cpp
  src/osgEarthUtil/RGBColorFilter.cpp
  src/osgEarthUtil/RadialLineOfSight.cpp
@@ -434,21 +443,11 @@ Files: src/applications/osgearth_annotation/osgearth_annotation.cpp
  src/osgEarthUtil/UTMGraticule.cpp
  src/osgEarthUtil/WFS.cpp
  src/osgEarthUtil/WMS.cpp
-Copyright: 2008-2010, Pelican Mapping
-  2008-2011, Pelican Mapping
-  2008-2012, Pelican Mapping
-  2008-2013, Pelican Mapping
+Copyright: 2008-2013, Pelican Mapping
 License: LGPL-2+
 
 Files: src/osgEarth/Mercator.cpp
  src/osgEarthDrivers/engine_droam/GeodeticManifold.cpp
- src/osgEarthDrivers/engine_seamless/Euler.cpp
- src/osgEarthDrivers/engine_seamless/GeoPatch.cpp
- src/osgEarthDrivers/engine_seamless/Patch.cpp
- src/osgEarthDrivers/engine_seamless/PatchGroup.cpp
- src/osgEarthDrivers/engine_seamless/PatchSet.cpp
- src/osgEarthDrivers/engine_seamless/Projected.cpp
- src/osgEarthDrivers/engine_seamless/QSC.cpp
  src/osgEarthDrivers/engine_seamless/SeamlessPlugin.cpp
  src/osgEarthDrivers/model_feature_stencil/StencilUtils.cpp
  src/osgEarthDrivers/model_feature_stencil/StencilUtils.h
@@ -459,7 +458,16 @@ Files: src/osgEarth/Mercator.cpp
  src/osgEarthSymbology/FeatureDataSetAdapter.cpp
  src/osgEarthSymbology/GeometryInput.cpp
 Copyright: 2008-2009, Pelican Ventures, Inc
-  2010, Pelican Ventures, Inc
+License: LGPL-2+
+
+Files: src/osgEarthDrivers/engine_seamless/Euler.cpp
+ src/osgEarthDrivers/engine_seamless/GeoPatch.cpp
+ src/osgEarthDrivers/engine_seamless/Patch.cpp
+ src/osgEarthDrivers/engine_seamless/PatchGroup.cpp
+ src/osgEarthDrivers/engine_seamless/PatchSet.cpp
+ src/osgEarthDrivers/engine_seamless/Projected.cpp
+ src/osgEarthDrivers/engine_seamless/QSC.cpp
+Copyright: 2010, Pelican Ventures, Inc
 License: LGPL-2+
 
 Files: src/applications/osgearth_viewerIOS/osgEarthViewerIOS/AppDelegate.h
@@ -502,27 +510,36 @@ Files: docs/source/conf.py
 Copyright: = 2013, Pelican Mapping
 License: LGPL-2+
 
-Files: src/applications/osgearth_viewerIOS/osgEarthViewerIOS/MultiTouchManipulator/EarthMultiTouchManipulator.cpp
- src/applications/osgearth_viewerIOS/osgEarthViewerIOS/MultiTouchManipulator/EarthMultiTouchManipulator.h
- src/applications/osgearth_viewerIOS/osgEarthViewerIOS/ShaderGen/GLES2ShaderGenVisitor.cpp
+Files: src/applications/osgearth_viewerIOS/osgEarthViewerIOS/ShaderGen/GLES2ShaderGenVisitor.cpp
  src/applications/osgearth_viewerIOS/osgEarthViewerIOS/ShaderGen/GLES2ShaderGenVisitor.h
 Copyright: 1998-2009, Robert Osfield
-  1998-2010, Robert Osfield
+License: OSGPL
+
+Files: src/applications/osgearth_viewerIOS/osgEarthViewerIOS/MultiTouchManipulator/EarthMultiTouchManipulator.cpp
+ src/applications/osgearth_viewerIOS/osgEarthViewerIOS/MultiTouchManipulator/EarthMultiTouchManipulator.h
+Copyright: 1998-2010, Robert Osfield
 License: OSGPL
 
 Files: src/osgEarth/Notify.cpp
 Copyright: 1998-2006, Robert Osfield
-  2008-2013, Pelican Mapping
+ 2008-2013, Pelican Mapping
 License: OSGPL and LGPL-2+
 
-Files: src/osgEarth/tinystr.cpp
- src/osgEarth/tinystr.h
- src/osgEarth/tinyxml.cpp
+Files: src/osgEarth/tinyxmlparser.cpp
+Copyright: 2000-2002, Lee Thomason (www.grinninglizard.com)
+License: zlib
+
+Files: src/osgEarth/tinyxml.cpp
  src/osgEarth/tinyxml.h
  src/osgEarth/tinyxmlerror.cpp
- src/osgEarth/tinyxmlparser.cpp
-Copyright: 2000-2002, Lee Thomason (www.grinninglizard.com)
-  2000-2006, Lee Thomason (www.grinninglizard.com)
+Copyright: 2000-2006, Lee Thomason (www.grinninglizard.com)
+License: zlib
+
+Files: src/osgEarth/tinystr.cpp
+ src/osgEarth/tinystr.h
+Copyright: 2002-2003, Yves Berquin
+ 2002-2007, Lee Thomason (www.grinninglizard.com)
+ 2005, Tyge Løvset
 License: zlib
 
 Files: src/osgEarthSymbology/AGG.h

-- 
osgEarth terrain rendering toolkit

More information about the Pkg-grass-devel mailing list