[hamradio-commits] [cubicsdr] 05/08: Add copyright and license for external/rs232 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 cubicsdr.

commit 226de93d574ad397574e5e0fa013ba14d51c3f16
Author: Andreas Bombe <aeb at debian.org>
Date:   Mon Aug 21 20:42:28 2017 +0200

    Add copyright and license for external/rs232 to debian/copyright
---
 debian/changelog |  7 +++++++
 debian/copyright | 41 ++++++++++++++++++++++++-----------------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e4f7ff7..27d29af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cubicsdr (0.2.2+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream version
+  * Add copyright and license for external/rs232 to debian/copyright
+
+ -- Andreas Bombe <aeb at debian.org>  Mon, 21 Aug 2017 20:40:40 +0200
+
 cubicsdr (0.2.0+git20170310+dfsg-2) unstable; urgency=medium
 
   * Link to libatomic (Closes: #859616)
diff --git a/debian/copyright b/debian/copyright
index 7b49f00..6329385 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,23 +21,6 @@ License: GPL-2+
 Files: src/util/DataTree.*
 Copyright: 2003 Charles J. Cliffe
 License: Expat
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- .
- 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 AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
 
 Files: external/lodepng/*
 Copyright: 2005-2016 Lode Vandevenne
@@ -61,6 +44,11 @@ License: Zlib
      3. This notice may not be removed or altered from any source
      distribution.
 
+Files: external/rs232/*
+Copyright: 2007-2015 Frédéric Meslin
+ 2013-2015 Florent Touchard
+License: Expat
+
 Files: cmake/Modules/FindRtAudio.cmake
 Copyright: 2015 by Idiap Research Institute
 License: BSD-3-clause
@@ -137,3 +125,22 @@ License: GPL-2+
  .
  On Debian systems, the complete text of the GNU General Public License
  version 2 can be found in /usr/share/common-licenses/GPL-2.
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ 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 AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.

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