[osmium] 16/16: 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 osmium.

commit 1e45ac6675fcda4eddbd95471ebf455a81155f7f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jun 9 02:15:46 2014 +0200

    Update copyright file.
---
 debian/changelog |  1 +
 debian/copyright | 30 +++---------------------------
 2 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bd43459..bc9288c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ osmium (0.0~20140410-d1d56bedb3-1) UNRELEASED; urgency=medium
   * Drop obsolete patches, refresh remaining patches.
   * Append CPPFLAGS to CXXFLAGS for hardening flags.
   * Don't run tests twice.
+  * Update copyright file.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sun, 08 Jun 2014 19:07:28 +0200
 
diff --git a/debian/copyright b/debian/copyright
index e11f141..2e9f44d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,10 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: Osmium
+Upstream-Contact: Jochen Topf <jochen at topf.org>
 Source: https://github.com/joto/osmium
 
 Files: *
-Copyright: © 2011, Jochen Topf <jochen at topf.org>
+Copyright: © 2011-2013, Jochen Topf <jochen at topf.org>
 License: GPL-3.0+ or LGPL-3.0+
 
 Files: debian/*
@@ -14,10 +16,6 @@ Copyright: © 2001-2002, Vivid Solutions Inc.
  © 2005-2006, Refractions Research Inc.
 License: LGPL-3.0+
 
-Files: osmium/utils/timer.h
-Copyright: ©, Ken Wilder
-License: BSD-3
-
 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
@@ -52,25 +50,3 @@ License: LGPL-3.0+
  On Debian systems, the complete text of the GNU Lesser General
  Public License version 3 can be found in "/usr/share/common-licenses/LGPL-3".
 
-License: BSD-3
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-     * Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-     * 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.
-     * Neither the name of the <organization> 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 <copyright holder> ``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 <copyright holder> 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.

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