[hamradio-commits] [soapyosmo] 07/08: Add new files and new copyright years to debian/copyright

[Andreas E. Bombe]

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

aeb pushed a commit to branch master
in repository soapyosmo.

commit c50eace4f9b58b1c3565f183060726bd4bb2d247
Author: Andreas Bombe <aeb at debian.org>
Date:   Sat Aug 12 15:23:22 2017 -0400

    Add new files and new copyright years to debian/copyright
---
 debian/changelog |  1 +
 debian/copyright | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 73c28cd..0a15857 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ soapyosmo (0.2.5-1) UNRELEASED; urgency=medium
     to 0.6
   * Build-Depend on versioned libsoapysdr0.6-dev instead of libsoapysdr-dev
   * Bump Standards-Version to 4.0.1, no changes required
+  * Add new files and new copyright years to debian/copyright
 
  -- Andreas Bombe <aeb at debian.org>  Sun, 06 Aug 2017 17:58:36 -0400
 
diff --git a/debian/copyright b/debian/copyright
index 5262245..2746bfe 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,8 +2,8 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: soapyosmo
 Source: https://github.com/pothosware/SoapyOsmo/wiki
 Comment: This source package contains a copy of the gr-osmosdr source and most
- of the copyright entries below are likewise a copy of the copyright file of
- the Debian gr-osmosdr package.
+ of the copyright entries below are likewise originally a copy of the copyright
+ file of the Debian gr-osmosdr package.
 
 Files: .gitignore .travis.yml CMakeLists.txt Changelog.txt README.md debian/*
  update_gr_osmosdr.sh
@@ -16,7 +16,7 @@ Copyright: 2004,2007-2014 Free Software Foundation, Inc.
 License: GPL-3+
 
 Files: GrOsmoSDRInterface.hpp GrOsmoSDRRegister.in.cpp
-Copyright: 2014-2015 Free Software Foundation, Inc.
+Copyright: 2014-2017 Free Software Foundation, Inc.
 License: GPL-3+
 
 Files: COPYING gr-osmosdr/COPYING
@@ -45,7 +45,7 @@ Files: gr-osmosdr/include/osmosdr/pimpl.h
 Copyright: 2010-2013 Ettus Research LLC
 License: GPL-3+
 
-FIles: gr-osmosdr/lib/bladerf/bladerf_common.cc
+Files: gr-osmosdr/lib/bladerf/bladerf_common.cc
  gr-osmosdr/lib/bladerf/bladerf_common.h
  gr-osmosdr/lib/bladerf/bladerf_sink_c.cc
  gr-osmosdr/lib/bladerf/bladerf_sink_c.h
@@ -55,8 +55,59 @@ Copyright: 2013 Nuand LLC
  2013 Dimitri Stolnikov <horiz0n at gmx.net>
 License: GPL-3+
 
+Files: gr-osmosdr/lib/freesrp/*
+Copyright: 2015 Lukas Lao Beyer
+ 2013 Dimitri Stolnikov <horiz0n at gmx.net>
+License: GPL-3+
+
+Files: gr-osmosdr/lib/freesrp/readerwriterqueue/*
+Copyright: 2013-2015, Cameron Desrochers
+ 2013 Dimitri Stolnikov <horiz0n at gmx.net>
+ 2015 Jeff Preshing
+Comment: Most of the code in this directory is under the simplified BSD, but
+ atomicops.h embeds a semaphore implementation by Jeff Preshing under the zlib
+ license at the end.
+License: Simplified-BSD-and-zlib
+ All rights reserved.
+ .
+ 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 HOLDER 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.
+ .
+ .
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgement in the product documentation would be
+    appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
 Files: gr-osmosdr/lib/soapy/*
-Copyright: 2015 Josh Blum <josh at joshknows.com>
+Copyright: 2015-2017 Josh Blum <josh at joshknows.com>
  2013 Dimitri Stolnikov <horiz0n at gmx.net>
 License: GPL-3+
 

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