aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2011-11-20 16:32:16 -0500
committerLuke Dashjr <luke-jr+git@utopios.org>2011-11-20 16:32:16 -0500
commitaa1ed9265fa5f142f091d5317587fb13a519ec6a (patch)
tree22ab541dcc133717acef259bdd14e5952155d8f4 /contrib
parent459d3fb77bd0d754eb7545965723464b1f2ec0d0 (diff)
update debian copyright file for MIT icon relicensing
Diffstat (limited to 'contrib')
-rw-r--r--contrib/debian/copyright28
1 files 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 <http://www.gnu.org/licenses/>.
-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
- <http://creativecommons.org/licenses/by/3.0/>.
-
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 <http://www.gnu.org/licenses/>.
+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.