Commit e9669b57 authored by Bas Couwenberg's avatar Bas Couwenberg

Update copyright file.

Changes:
- Update copyright years for Jochen Topf
- Drop John Maddock from copyright holders
- Drop license & copyright for protozero
parent 765dd032
......@@ -7,6 +7,10 @@ libosmium (2.14.0-1) UNRELEASED; urgency=medium
* Don't use libjs-jquery for Doxygen docs.
* Bump Standards-Version to 4.1.3, no changes.
* Update Vcs-* URLs for Salsa.
* Update copyright file, changes:
- Update copyright years for Jochen Topf
- Drop John Maddock from copyright holders
- Drop license & copyright for protozero
-- Bas Couwenberg <sebastic@debian.org> Sat, 31 Mar 2018 21:13:46 +0200
......
......@@ -4,10 +4,9 @@ Upstream-Contact: Osmium Developers (http://osmcode.org/contact)
Source: https://github.com/osmcode/libosmium
Files: *
Copyright: 2013-2017, Jochen Topf <jochen@topf.org>
Copyright: 2013-2018, Jochen Topf <jochen@topf.org>
2012, Two Blue Cubes Ltd.
2006, Nemanja Trifunovic
2004, John Maddock
License: BSL-1.0
Files: examples/osmium_convert.cpp
......@@ -15,10 +14,6 @@ Copyright: disclaimed
License: public-domain
The code in this example file is released into the Public Domain.
Files: include/protozero/*
Copyright: Mapbox
License: BSD-2-Clause and Apache-2.0
Files: test/include/win_mkstemp.hpp
Copyright: disclaimed
License: public-domain
......@@ -63,47 +58,6 @@ License: BSL-1.0
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
License: BSD-2-Clause
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.
.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
License: Apache-2.0
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
.
http://www.apache.org/licenses/LICENSE-2.0
.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
.
See the License for the specific language governing permissions and
limitations under the License.
.
On Debian systems, the complete text of the Apache License version 2
an be found in the `/usr/share/common-licenses/Apache-2.0' file.
License: GPL-2+
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment