[osm2pgsql] 08/09: Update copyright file.

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch master
in repository osm2pgsql.

commit 23d5e06468448d2f3759db03f6255725cd7cf43c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Dec 10 20:10:22 2014 +0100

    Update copyright file.
    
    Changes:
    - Add Upstream-Name header
    - Update Files sections for C++ files
    - Update Source URL to match watch file URL
    - Fix geos-fallback license, GEOS uses LGPL-2.1+ not LGPL-3+
    - Add Copyright & License for win_fsync.h
---
 debian/changelog |  6 ++++++
 debian/copyright | 54 +++++++++++++++++++++++++++++++-----------------------
 2 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f9d4f1c..a4cd273 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,12 @@ osm2pgsql (0.87.0-1) UNRELEASED; urgency=medium
   * Enable verbose test output.
   * Ignore test failures, some tests require a configured postgres
     database.
+  * Update copyright file, changes:
+    - Add Upstream-Name header
+    - Update Files sections for C++ files
+    - Update Source URL to match watch file URL
+    - Fix geos-fallback license, GEOS uses LGPL-2.1+ not LGPL-3+
+    - Add Copyright & License for win_fsync.h
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Wed, 10 Dec 2014 11:54:21 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 2e31943..c11a18c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,34 +1,43 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: osm2pgsql
 Upstream-Contact: Kai Krueger <kakrueger at gmail.com>
-Source: https://github.com/openstreetmap/osm2pgsql/tags
+Source: https://github.com/openstreetmap/osm2pgsql/releases
 
 Files: *
 Copyright: © 2007-2008, Artem Pavlenko <artem at mapnik.org>
  © 2006-2008, Jon Burgess <jburgess777 at googlemail.com>
-License: GPL-2+
-
-Files: debian/*
-Copyright: © 2007-2009, Andreas Putzo <andreas at putzo.net>
- © 2010-2012, David Paleino <dapal at debian.org>
+Comment: osm2pgsql was written by Jon Burgess, Artem Pavlenko,
+ Martijn van Oosterhout, Sarah Hoffman, Kai Krueger, Frederik Ramm,
+ Brian Quinion and other OpenStreetMap project members.
 License: GPL-2+
 
 Files: geos-fallback/*
 Copyright: © 2006, Refractions Research Inc.
-License: LGPL-3+
+License: LGPL-2.1+
 
-Files: rb.c
+Files: rb.cpp
+ rb.hpp
 Copyright: © 1998-2002, 2004, Free Software Foundation, Inc.
 License: GPL-2+
 
-Files: sprompt.c
+Files: sprompt.cpp
 Copyright: © 1994, The Regents of the University of California
  © 1996-2006, PostgreSQL Global Development Group
 License: other
 
-Files: wildcmp.c
+Files: wildcmp.cpp
 Copyright: © 2002, Jim Kent
 License: GPL-2+
 
+Files: win_fsync.h
+Copyright: 2008-2014, Free Software Foundation, Inc.
+License: LGPL-2.1+
+
+Files: debian/*
+Copyright: © 2007-2009, Andreas Putzo <andreas at putzo.net>
+ © 2010-2012, David Paleino <dapal at debian.org>
+License: GPL-2+
+
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -64,19 +73,18 @@ License: other
  ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO
  PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
-License: LGPL-3+
- This package 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
- (at your option) any later version.
+License: LGPL-2.1+
+ This library 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 2.1 of the License, or (at your option) any later version.
  .
- This package is distributed in the hope that it will be useful,
+ This library 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.
- .
- You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
  .
- On Debian systems, the complete text of the GNU Lesser General Public License
- version 3 or later can be found in `/usr/share/common-licenses/LGPL-3'.
+ On Debian systems, the full text of the GNU Lesser General Public
+ License version 2.1 can be found in the file
+ `/usr/share/common-licenses/LGPL-2.1'.
+

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