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

sebastic pushed a commit to branch master
in repository libosmium.

commit 33aa710a0eb64f8e59df14cd95e826050a4ae773
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Tue Aug 18 15:29:07 2015 +0200

    Update copyright file, add license & copyright for protozero & utf8.
---
 debian/changelog |  1 +
 debian/copyright | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e4d28e4..f94c529 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libosmium (2.3.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Drop build dependencies on osmpbf & protobuf.
+  * Update copyright file, add license & copyright for protozero & utf8.
 
  -- Bas Couwenberg <sebas...@debian.org>  Tue, 18 Aug 2015 14:09:02 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 08c620f..0946b73 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,7 @@ Source: https://github.com/osmcode/libosmium
 Files: *
 Copyright: 2013-2015, Jochen Topf <joc...@topf.org>
                 2012, Two Blue Cubes Ltd.
+                2006, Nemanja Trifunovic
                 2004, John Maddock
 License: BSL-1.0
 
@@ -14,6 +15,10 @@ 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
@@ -58,6 +63,47 @@ 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

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

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to