[python-pyproj] 16/34: Update copyright file using copyright-format 1.0.

Sun Mar 1 03:37:01 UTC 2015

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

sebastic pushed a commit to branch master
in repository python-pyproj.

commit 64c1552a3d1f113ffc1f4bfd2c3939758d6b5094
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Apr 6 17:45:59 2014 +0200

    Update copyright file using copyright-format 1.0.
---
 debian/changelog |  1 +
 debian/copyright | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 87 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e84b137..55d542c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ python-pyproj (1.9.3-1) UNRELEASED; urgency=medium
   * Set pybuild name to pyproj.
   * Remove pyversion file and add X-Python*-Version to control file.
   * Drop doc-base registration for README.html, no longer included.
+  * Update copyright file using copyright-format 1.0.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sun, 06 Apr 2014 14:23:45 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 8d92b99..9b12011 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,11 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: pyproj
+Upstream-Contact: Jeffrey Whitaker <jeffrey.s.whitaker at noaa.gov>
+Source: http://code.google.com/p/pyproj/downloads/list
+
+Files: lib/pyproj/__init__.py
+Copyright: © 2006, Jeffrey Whitaker
+License: MIT-short
 
 Files: src/nad_init.c
  src/pj_apply_gridshift.c
@@ -26,6 +32,17 @@ Files: src/pj_initcache.c
  src/pj_mutex.c
 Copyright: © 2009, Frank Warmerdam <warmerdam at pobox.com>
 License: MIT
+ 
+Files: src/pj_ctx.c
+ src/pj_log.c
+ src/pj_apply_vgridshift.c
+Copyright: © 2010, Frank Warmerdam <warmerdam at pobox.com>
+License: MIT
+
+Files: src/pj_gc_reader.c
+ src/pj_gridcatalog.c
+Copyright: © 2012, Frank Warmerdam <warmerdam at pobox.com>
+License: MIT
 
 Files: src/PJ_aea.c
  src/PJ_aeqd.c
@@ -42,35 +59,59 @@ License: MIT
 
 Files: src/PJ_geos.c
 Copyright: © 2004, Gerald I. Evenden
+ © 2012, Martin Raspaud
 License: MIT
 
-Files: src/proj_mdist.c
+Files: src/PJ_omerc.c
+ src/proj_mdist.c
  src/proj_rouss.c
 Copyright: © 2003, 2006, Gerald I. Evenden
 License: MIT
 
+Files: src/proj_etmerc.c
+Comment: The code in this file is largly based upon procedures:
+ .
+ Written by: Knud Poder and Karsten Engsager
+ .
+ Based on math from: R.Koenig and K.H. Weise, "Mathematische
+ Grundlagen der hoeheren Geodaesie und Kartographie,
+ Springer-Verlag, Berlin/Goettingen" Heidelberg, 1951.
+ .
+ Modified and used here by permission of Reference Networks
+ Division, Kort og Matrikelstyrelsen (KMS), Copenhagen, Denmark
+Copyright: © 2008, Gerald I. Evenden
+License: MIT
+
 Files: src/pj_init.c
  src/pj_open_lib.c
 Copyright: © 1995, Gerald Evenden
  © 2002, Frank Warmerdam <warmerdam at pobox.com>
 License: MIT
 
-Files: src/PJ_krovak.c
-Copyright: ©2001, Thomas Flemming <tf at ttqv.com>
+Files: src/PJ_healpix.c
+ src/PJ_krovak.c
+Copyright: © 2001, Thomas Flemming <tf at ttqv.com>
+License: MIT
+
+Files: src/PJ_isea.c
+Copyright: disclaimed
+License: public-domain
+ This code was entirely written by Nathan Wagner
+ and is in the public domain.
+
+Files: src/geodesic.c
+Copyright: © 2012, Charles Karney <charles at karney.com>
 License: MIT
 
 Files: debian/*
 Copyright: © 2009, David Paleino <dapal at debian.org>
-License: GPL-3+
-X-Comment: On Debian GNU systems, the full text of the GNU General Public
- License v3+ can be found in `/usr/share/common-licenses/GPL-3', while
- the latest version can be found in `/usr/share/common-licenses/GPL'.
+License: GPL-3.0+
 
 Files: *
 Copyright: © 2006-2009, Jeffrey Whitaker <jeffrey.s.whitaker at noaa.gov>
-License: MIT
+License: MIT-short
 
-License: MIT
+License: MIT-short
  Permission to use, copy, modify, and distribute this software
  and its documentation for any purpose and without fee is hereby
  granted, provided that the above copyright notice appear in all
@@ -83,3 +124,38 @@ License: MIT
  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+License: MIT
+ 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.
+
+License: GPL-3.0+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ On Debian systems, the full text of the GNU General Public License
+ version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
+

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

