[osgearth] 02/04: Update copyright file.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository osgearth.

commit e960137a52c911cff18c614f780b43838a5c8b82
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon May 25 20:07:19 2015 +0200

    Update copyright file.
    
    Changes:
    - Add email address for Upstream-Contact
    - Group copyright statements by license
    - Fix LGPL version 3 or later shortname
    - Add license header to copyright comment
---
 debian/changelog |  5 +++++
 debian/copyright | 50 +++++++++++++++++++++++++++++++-------------------
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4909fc3..0496efb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 osgearth (2.6.0+dfsg-1~exp3) UNRELEASED; urgency=medium
 
   * Add patch to fix "undefined reference to symbol 'XInitThreads'" FTBFS.
+  * Update copyright file, changes:
+    - Add email address for Upstream-Contact
+    - Group copyright statements by license
+    - Fix LGPL version 3 or later shortname
+    - Add license header to copyright comment
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 25 May 2015 17:38:14 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 94b3e2a..10e414a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,32 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: osgEarth
-Upstream-Contact: Glenn Waldron
+Upstream-Contact: Glenn Waldron <gwaldron at gmail.com>
 Source: https://github.com/gwaldron/osgearth/releases
 Comment: Several data files with unknown licenses are removed to create
  the +dfsg version.
+ .
+ osgEarth is licensed under the LGPL-3+ as documented in the LICENSE.txt file.
+ The LICENSE.txt file contains the following header followed by the full text
+ of LGPL-3+ license:
+ .
+  OSGEARTH SOFTWARE LICENSE
+ .
+  The osgEarth library and included programs are provided under the terms
+  of the GNU Library General Public License (LGPL - included below) with the
+  following exceptions and stipulations:
+ .
+  1. Static linking of applications and modules to the osgEarth library does NOT
+     constitute a derivative work and does not require the author to provide source
+     code for the application or module.
+ .
+  2. If you link the application or module to a modified version of the osgEarth
+     library, then the modifications to osgEarth must be provided under the terms of
+     the LGPL.
+ .
+  3. The text herein comprises the definitive licensing information for the osgEarth
+     library, and supercedes any licensing text found in osgEarth source files,
+     header files, or documentation.
+ .
 Files-Excluded: data/2s19_ru_desert.tga
  data/2s19_ru_desert.tga.attr
  data/2s19_ru_dmg_desert.tga
@@ -111,23 +134,12 @@ Files-Excluded: data/2s19_ru_desert.tga
  data/world.prj
  data/world.shp
  data/world.shx
-License: LGPL-3
+License: LGPL-3+
 
 Files: *
 Copyright: 2008-2014, Pelican Mapping
- 2008-2010, Pelican Ventures, Inc
-License: LGPL-2+
-
-Files: src/applications/osgearth_viewerIOS/osgEarthViewerIOS/AppDelegate.h
- src/applications/osgearth_viewerIOS/osgEarthViewerIOS/AppDelegate.m
- src/applications/osgearth_viewerIOS/osgEarthViewerIOS/ShaderGen/ShaderGenScene.h
- src/applications/osgearth_viewerIOS/osgEarthViewerIOS/StartViewerController.h
- src/applications/osgearth_viewerIOS/osgEarthViewerIOS/StartViewerController.m
- src/applications/osgearth_viewerIOS/osgEarthViewerIOS/ViewController.h
- src/applications/osgearth_viewerIOS/osgEarthViewerIOS/ViewController.m
- src/applications/osgearth_viewerIOS/osgEarthViewerIOS/main.m
- src/applications/osgearth_viewerIOS/osgEarthViewerIOS/osgPlugins.h
-Copyright: 2012, Thomas Hogarth
+                2012, Thomas Hogarth
+           2008-2010, Pelican Ventures, Inc
 License: LGPL-2+
 
 Files: src/applications/osgearth_viewerIOS/osgEarthViewerIOS/ShaderGen/GLES2ShaderGenVisitor.cpp
@@ -139,7 +151,7 @@ License: OSGPL
 
 Files: src/osgEarth/Notify.cpp
 Copyright: 1998-2006, Robert Osfield
- 2008-2014, Pelican Mapping
+           2008-2014, Pelican Mapping
 License: OSGPL and LGPL-2+
 
 Files: src/osgEarth/tinyxml.cpp
@@ -152,8 +164,8 @@ 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
+           2002-2007, Lee Thomason (www.grinninglizard.com)
+                2005, Tyge Løvset
 License: zlib
 
 Files: src/osgEarthSymbology/AGG.h
@@ -169,7 +181,7 @@ Files: debian/*
 Copyright: 2009, Pirmin Kalberer <pi_deb at sourcepole.ch>
 License: LGPL-2+
 
-License: LGPL-3
+License: LGPL-3+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License as published by
  the Free Software Foundation; either version 3 of the License, or

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osgearth.git