From aa1ed9265fa5f142f091d5317587fb13a519ec6a Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Sun, 20 Nov 2011 16:32:16 -0500 Subject: update debian copyright file for MIT icon relicensing --- contrib/debian/copyright | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/contrib/debian/copyright b/contrib/debian/copyright index 2da1461984..166bab6da3 100644 --- a/contrib/debian/copyright +++ b/contrib/debian/copyright @@ -31,7 +31,7 @@ License: GPL-3+ Files: src/qt/res/icons/clock*.png, src/qt/res/icons/tx*.png, src/qt/res/src/*.svg Copyright: Wladimir van der Laan -License: CC-BY-3 +License: MIT 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, @@ -146,13 +146,6 @@ Comment: You should have received a copy of the GNU General Public License along with this program. If not, see . -License: CC-BY-3 - This work is licensed under a Creative Commons Attribution 3.0 Unported - License. -Comment: - You can get a full copy of the license at - . - 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 @@ -170,5 +163,24 @@ Comment: You should have received a copy of the GNU General Public License along with this program. If not, see . +License: MIT + 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. + License: PUB-DOM This work is in the public domain. -- cgit v1.2.3