[SCM] libgeo-proj4-perl branch, master, updated. debian/1.03-1-13-gfd31867

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit e8055b0bf6373d7de6e9d0a3ead23b6633731bfd
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jan 4 13:52:38 2014 +0100

    Update copyright file, use copyright-format 1.0 final.

diff --git a/debian/changelog b/debian/changelog
index 081dc6a..62a14e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ libgeo-proj4-perl (1.04-1) UNRELEASED; urgency=low
   * Add myself to Uploaders.
   * Bump debhelper compatibility to 9.
   * Use metacpan.org instead of search.cpan.org.
+  * Update to copyright-format 1.0 final.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sat, 04 Jan 2014 13:42:43 +0100
 
diff --git a/debian/copyright b/debian/copyright
index da66e3f..6170f77 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,20 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Geo-Proj4
+Upstream-Contact: Mark Overmeer <mark at overmeer.net>
 Source: https://metacpan.org/release/Geo-Proj4
 
 Files: *
-Copyright: © 2004-2009, Mark Overmeer <geo at overmeer.net>
+Copyright: © 2004-2012, Mark Overmeer <geo at overmeer.net>
 License: Artistic or GPL-1+
 
+Files: examples/use_epsg.pl
+Copyright: 2007, Michael R. Davis
+License: MIT or BSD or Artistic or GPL-1+
+
+Files: src/4.8.0/projects.h
+Copyright: 2000, Frank Warmerdam
+License: MIT
+
 Files: debian/*
 Copyright: © 2011, David Paleino <dapal at debian.org>
 License: Artistic or GPL-1+
@@ -24,3 +34,48 @@ License: GPL-1+
  .
  On Debian systems, the complete text of version 1 of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL-1'.
+
+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: BSD
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+

-- 
Proj4 library for carthographic projections