[savi] 10/16: Update copyright file using copyright-format 1.0.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository savi.

commit 140d3b454194a92a20ddac531eb0a8626121e8df
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 30 17:35:51 2016 +0200

    Update copyright file using copyright-format 1.0.
---
 debian/changelog |  1 +
 debian/copyright | 61 ++++++++++++++++++++++++++++++++++----------------------
 2 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 99bd859..5e2c0ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ savi (1.5.0-1) UNRELEASED; urgency=medium
   * Update watch file to handle common issues.
   * Add upstream metadata.
   * Add gbp.conf to use pristine-tar by default.
+  * Update copyright file using copyright-format 1.0.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 30 Sep 2016 16:56:33 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 2c53c47..1efc4f9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,17 +1,20 @@
-Format: http://dep.debian.net/deps/dep5
-Upstream-Name: savi
-Source: http://savi.sourceforge.net/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: SaVi
+Upstream-Contact: Lloyd Wood <lloydwood at users.sourceforge.net>
+Source: http://personal.ee.surrey.ac.uk/Personal/L.Wood/software/SaVi/src/releases/
 
 Files: *
-Copyright: 
- 1. ADDITIONAL COPYRIGHT FOR THE SAVI 1.2, 1.3 and 1.4 RELEASES
- ==============================================================
+Copyright: 2001-2016, Lloyd Wood
+                1997, The Geometry Center
+Comment: From the COPYRIGHT file:
+ 1. ADDITIONAL COPYRIGHT FOR THE SaVi 1.2, 1.3, 1.4 AND 1.5 RELEASES
+ ===================================================================
  .
  Enhancements to and modifications of SaVi 1.0, expressed in the
- SaVi 1.2, 1.3 and 1.4 releases, are:
+ SaVi 1.2, 1.3, 1.4 and 1.5 releases, are:
  .
- Copyright (c) 2001, 2002, 2003, 2004, 2005,
- 2006, 2007, 2008, 2009, 2010, 2011 Lloyd Wood.
+ Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+ 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Lloyd Wood.
  .
  Lloyd Wood maintains SaVi, and welcomes bug reports and fixes from
  users.  Contact Lloyd at: lloydwood at users.sourceforge.net.
@@ -19,27 +22,36 @@ Copyright:
  SaVi continues to be provided "as is", and no warranty or guarantee of
  fitness for use is expressed or implied.
  .
- Use of SaVi images should credit SaVi. A suggested reference is:
- L. Wood, P. Worfolk et al., SaVi - Satellite constellation
- Visualisation software, http://savi.sf.net/, 2011.
+ Use of SaVi images must credit SaVi. Suggested references are:
  .
- 2. ORIGINAL COPYRIGHT FOR SAVI 1.0
+ - L. Wood, SaVi: satellite constellation visualization,
+   First Annual CCSR Research Symposium (CRS 2011),
+   Centre for Communication Systems Research, 30 June 2011.
+   http://arxiv.org/abs/1204.3265
+ .
+ - L. Wood, P. Worfolk et al., SaVi - Satellite constellation
+   Visualisation software, http://savi.sf.net/, 2016.
+ .
+ .
+ .
+ 2. ORIGINAL COPYRIGHT FOR SaVi 1.0
  ==================================
  .
-            SaVi
  .
- by Robert Thurman (thurman at geom.umn.edu) and
- Patrick Worfolk (worfolk at alum.mit.edu).
+                                 SaVi
+ .
+             by Robert Thurman (thurman at geom.umn.edu) and
+                Patrick Worfolk (worfolk at alum.mit.edu).
  .
  .
- .	  Copyright (c) 1997
+ 			  Copyright (c) 1997
  .
- The National Science and Technology Research Center for
- Computation and Visualization of Geometric Structures
- .	(The Geometry Center)
- .      University of Minnesota
+        The National Science and Technology Research Center for
+ 	Computation and Visualization of Geometric Structures
+ 			(The Geometry Center)
+ 		       University of Minnesota
  .
- .     email: savi at geom.umn.edu
+ 		      email: savi at geom.umn.edu
 License: BSD-4-clause
  This software is copyrighted as noted above.  It is free software and
  may be obtained by emailing savi at geom.umn.edu or contacting the
@@ -70,8 +82,8 @@ License: BSD-4-clause
  presentation, we request that you credit the Geometry Center with a
  notice such as the following:
  .
-  Figures 1, 2, and 5-300 were generated with SaVi, software written
-  at the Geometry Center, University of Minnesota.
+   Figures 1, 2, and 5-300 were generated with SaVi, software written
+   at the Geometry Center, University of Minnesota.
 
 Files: debian/*
 Copyright: 2011 YunQiang Su <wzssyqa at gmail.com>
@@ -91,3 +103,4 @@ License: GPL-2+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+

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