[hamradio-commits] [cubicsdr] 06/11: Adapt debian/copyright to upstream clarifications in source

[Andreas E. Bombe]

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

aeb pushed a commit to branch master
in repository cubicsdr.

commit ef0633006064d15d413b8dacc91ef60676718779
Author: Andreas Bombe <aeb at debian.org>
Date:   Tue Mar 14 20:56:25 2017 +0100

    Adapt debian/copyright to upstream clarifications in source
---
 debian/copyright | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 75473e7..c28765a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,27 +11,9 @@ Files-Excluded: external/msvc
                 external/wglext
 
 Files: *
-Copyright: 2013-2014 Charles J. Cliffe
-Comment:
- The source files do not contain a copyright header, although a LICENSE
- file with the GPL-2 is included. As to whether it is GPL-2 or GPL-2+,
- the author said "I'll make sure to clarify that it's GPL v2 or later
- and put the appropriate information in the source headings." in
- https://github.com/cjcliffe/CubicSDR/issues/463.
+Copyright: Charles J. Cliffe
 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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ SPDX-License-Identifier: GPL-2.0+
  .
  On Debian systems, the complete text of the GNU GPL version 2 can be
  found in '/usr/share/common-licenses/GPL-2'.
@@ -79,6 +61,11 @@ License: Zlib
      3. This notice may not be removed or altered from any source
      distribution.
 
+Files: cmake/Modules/FindRtAudio.cmake
+Copyright: 2015 by Idiap Research Institute
+License: BSD-3-clause
+ Licensed under 3-clause BSD.
+
 Files: font/*.png
 Copyright: 2003 Bitstream, Inc.
 Comment:

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