From 71d0bbc6665eca298bb2d93db4f58827b4e7f19a Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Tue, 7 Mar 2017 19:14:59 +0000 Subject: [PATCH] License updates for removal of src/qt. Signed-off-by: Daira Hopwood --- COPYING | 10 ++--- contrib/debian/copyright | 89 +--------------------------------------- 2 files changed, 6 insertions(+), 93 deletions(-) diff --git a/COPYING b/COPYING index 62038b6ba..6e3e20d32 100644 --- a/COPYING +++ b/COPYING @@ -20,12 +20,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -The MIT software license (http://www.opensource.org/licenses/mit-license.php) -above applies to the code directly included in this source distribution, with -the exception of certain files under the 'src/qt/' and 'scripts/img/' directories -which are distributed under the LGPL or GPL licenses. Dependencies downloaded -as part of the build process may be covered by other open source licenses. -For further details see 'contrib/DEBIAN/copyright'. +The [MIT software license](http://www.opensource.org/licenses/mit-license.php) +above applies to the code directly included in this source distribution. +Dependencies downloaded as part of the build process may be covered by other +open-source licenses. For further details see 'contrib/debian/copyright'. This product includes software developed by the OpenSSL Project for use in the diff --git a/contrib/debian/copyright b/contrib/debian/copyright index 67cb3d67f..8c5df0ea6 100644 --- a/contrib/debian/copyright +++ b/contrib/debian/copyright @@ -4,67 +4,13 @@ Upstream-Contact: Zcash Company Source: https://github.com/zcash/zcash Files: * -Copyright: 2016, The Zcash developers - 2009-2015, Bitcoin Core developers +Copyright: 2016-2017, The Zcash developers + 2009-2017, Bitcoin Core developers License: Expat Comment: The Bitcoin Core developers encompasses the current developers listed on bitcoin.org, as well as the numerous contributors to the project. The Zcash developers are listed at https://z.cash/team.html. -Files: src/qt/res/icons/clock*.png, src/qt/res/icons/tx*.png, - src/qt/res/src/*.svg -Copyright: Wladimir van der Laan -License: Expat - -Files: src/qt/res/icons/address-book.png, src/qt/res/icons/export.png, - src/qt/res/icons/history.png, src/qt/res/icons/key.png, - src/qt/res/icons/lock_*.png, src/qt/res/icons/overview.png, - src/qt/res/icons/receive.png, src/qt/res/icons/send.png, - src/qt/res/icons/synced.png, src/qt/res/icons/filesave.png -Copyright: David Vignoni (david@icon-king.com) - ICON KING - www.icon-king.com -License: LGPL -Comment: NUVOLA ICON THEME for KDE 3.x - Original icons: kaddressbook, klipper_dock, view-list-text, - key-password, encrypted/decrypted, go-home, go-down, - go-next, dialog-ok - Site: http://www.icon-king.com/projects/nuvola/ - -Files: src/qt/res/icons/connect*.png -Copyright: schollidesign -License: GPL-3+ -Comment: Icon Pack: Human-O2 - Site: http://findicons.com/icon/93743/blocks_gnome_netstatus_0 - -Files: src/qt/res/icons/transaction*.png -Copyright: md2k7 -License: Expat -Comment: Site: https://bitcointalk.org/index.php?topic=15276.0 - -Files: src/qt/res/icons/configure.png, src/qt/res/icons/quit.png, - src/qt/res/icons/editcopy.png, src/qt/res/icons/editpaste.png, - src/qt/res/icons/add.png, src/qt/res/icons/edit.png, - src/qt/res/icons/remove.png -Copyright: http://www.everaldo.com -License: LGPL -Comment: Icon Pack: Crystal SVG - -Files: src/qt/res/icons/bitcoin.png, src/qt/res/icons/toolbar.png -Copyright: Bitboy (optimized for 16x16 by Wladimir van der Laan) -License: PUB-DOM -Comment: Site: https://bitcointalk.org/?topic=1756.0 - -Files: scripts/img/reload.xcf, src/qt/res/movies/*.png -Copyright: Everaldo (Everaldo Coelho) -License: GPL-3+ -Comment: Icon Pack: Kids - Site: http://findicons.com/icon/17102/reload?id=17102 - -Files: src/qt/res/images/splash2.jpg -License: PUB-DOM -Copyright: Crobbo (forum) -Comment: Site: https://bitcointalk.org/index.php?topic=32273.0 - Files: depends/sources/libsodium-*.tar.gz Copyright: 2013-2016 Frank Denis License: ISC @@ -1102,34 +1048,6 @@ License: ISC ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -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, 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. -Comment: - On Debian systems the GNU General Public License (GPL) version 2 is - located in '/usr/share/common-licenses/GPL-2'. - . - You should have received a copy of the GNU General Public License along - with this program. If not, see . - -License: GPL-3+ - Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU General Public License, Version 3 or any - later version published by the Free Software Foundation. -Comment: - On Debian systems the GNU General Public License (GPL) version 3 is - located in '/usr/share/common-licenses/GPL-3'. - . - You should have received a copy of the GNU General Public License along - with this program. If not, see . - License: LGPL 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 @@ -1147,9 +1065,6 @@ Comment: You should have received a copy of the GNU General Public License along with this program. If not, see . -License: PUB-DOM - This work is in the public domain. - License: LGPL-with-ZeroMQ-exception GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007