[osmium-tool] 06/06: Update copyright file, add license & copyright for catch.hpp.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Tue Aug 18 14:00:32 UTC 2015


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

sebastic pushed a commit to branch master
in repository osmium-tool.

commit e8e651c5be05b4fc75aa70b2bf9debd9b207e205
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Aug 18 15:59:51 2015 +0200

    Update copyright file, add license & copyright for catch.hpp.
---
 debian/changelog |  1 +
 debian/copyright | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5053530..d9bb076 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ osmium-tool (1.2.0-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Drop build dependencies on osmpbf & protobuf.
   * Bump minimum required libosmium2-dev to 2.3.0.
+  * Update copyright file, add license & copyright for catch.hpp.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 18 Aug 2015 15:53:08 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 6bb82ca..2090cc0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,6 +16,10 @@ Files: include/rapidjson/msinttypes/inttypes.h
 Copyright: 2006-2013, Alexander Chemeris
 License: BSD-3-Clause
 
+Files: test/include/catch.hpp
+Copyright: 2012, Two Blue Cubes Ltd
+License: BSL-1.0
+
 Files: debian/*
 Copyright: © 2015, Bas Couwenberg <sebastic at debian.org>
 License: GPL-2+
@@ -79,6 +83,31 @@ License: BSD-3-Clause
  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+License: BSL-1.0
+ Boost Software License - Version 1.0 - August 17th, 2003
+ .
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+ .
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+ .
+ 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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE 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"),

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



More information about the Pkg-grass-devel mailing list