mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-09 10:43:19 -05:00
Merge pull request #6667
2eb3183[doc] Merge doc/assets-attribution.md into contrib/debian/copyright (MarcoFalke)9be08b7Update contrib/debian/copyright (MarcoFalke)
This commit is contained in:
Wladimir J. van der Laan
commit
229fb974ab
3 changed files with 58 additions and 154 deletions
2
COPYING
2
COPYING
|
|
@ -1,3 +1,5 @@
|
||||||
|
The MIT License (MIT)
|
||||||
|
|
||||||
Copyright (c) 2009-2015 The Bitcoin Core developers
|
Copyright (c) 2009-2015 The Bitcoin Core developers
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
|
|
||||||
|
|
@ -5,15 +5,11 @@ Upstream-Contact: Satoshi Nakamoto <satoshin@gmx.com>
|
||||||
Source: https://github.com/bitcoin/bitcoin
|
Source: https://github.com/bitcoin/bitcoin
|
||||||
|
|
||||||
Files: *
|
Files: *
|
||||||
Copyright: 2009-2012, Bitcoin Core Developers
|
Copyright: 2009-2015, Bitcoin Core Developers
|
||||||
License: Expat
|
License: MIT/Expat
|
||||||
Comment: The Bitcoin Core Developers encompasses the current developers listed on bitcoin.org,
|
Comment: The Bitcoin Core Developers encompasses the current developers listed on bitcoin.org,
|
||||||
as well as the numerous contributors to the project.
|
as well as the numerous contributors to the project.
|
||||||
|
|
||||||
Files: src/json/*
|
|
||||||
Copyright: 2007-2009, John W. Wilkinson
|
|
||||||
License: Expat
|
|
||||||
|
|
||||||
Files: debian/*
|
Files: debian/*
|
||||||
Copyright: 2010-2011, Jonas Smedegaard <dr@jones.dk>
|
Copyright: 2010-2011, Jonas Smedegaard <dr@jones.dk>
|
||||||
2011, Matt Corallo <matt@bluematt.me>
|
2011, Matt Corallo <matt@bluematt.me>
|
||||||
|
|
@ -23,62 +19,68 @@ Files: debian/manpages/*
|
||||||
Copyright: Micah Anderson <micah@debian.org>
|
Copyright: Micah Anderson <micah@debian.org>
|
||||||
License: GPL-3+
|
License: GPL-3+
|
||||||
|
|
||||||
Files: src/qt/res/icons/clock*.png, src/qt/res/icons/tx*.png,
|
Files: src/qt/res/icons/add.png,
|
||||||
src/qt/res/src/*.svg
|
src/qt/res/icons/address-book.png,
|
||||||
Copyright: Wladimir van der Laan
|
src/qt/res/icons/configure.png,
|
||||||
License: Expat
|
src/qt/res/icons/debugwindow.png,
|
||||||
|
src/qt/res/icons/edit.png,
|
||||||
Files: src/qt/res/icons/address-book.png, src/qt/res/icons/export.png,
|
src/qt/res/icons/editcopy.png,
|
||||||
src/qt/res/icons/history.png, src/qt/res/icons/key.png,
|
src/qt/res/icons/editpaste.png,
|
||||||
src/qt/res/icons/lock_*.png, src/qt/res/icons/overview.png,
|
src/qt/res/icons/export.png,
|
||||||
src/qt/res/icons/receive.png, src/qt/res/icons/send.png,
|
src/qt/res/icons/eye.png,
|
||||||
src/qt/res/icons/synced.png, src/qt/res/icons/filesave.png
|
src/qt/res/icons/filesave.png,
|
||||||
Copyright: David Vignoni (david@icon-king.com)
|
src/qt/res/icons/history.png,
|
||||||
ICON KING - www.icon-king.com
|
src/qt/res/icons/info.png,
|
||||||
License: LGPL
|
src/qt/res/icons/key.png,
|
||||||
Comment: NUVOLA ICON THEME for KDE 3.x
|
src/qt/res/icons/lock_*.png,
|
||||||
Original icons: kaddressbook, klipper_dock, view-list-text,
|
src/qt/res/icons/open.png,
|
||||||
key-password, encrypted/decrypted, go-home, go-down,
|
src/qt/res/icons/overview.png,
|
||||||
go-next, dialog-ok
|
src/qt/res/icons/quit.png,
|
||||||
Site: http://www.icon-king.com/projects/nuvola/
|
src/qt/res/icons/receive.png,
|
||||||
|
src/qt/res/icons/remove.png,
|
||||||
|
src/qt/res/icons/send.png,
|
||||||
|
src/qt/res/icons/synced.png,
|
||||||
|
src/qt/res/icons/transaction*.png,
|
||||||
|
src/qt/res/icons/tx_output.png,
|
||||||
|
src/qt/res/icons/warning.png
|
||||||
|
Copyright: Stephen Hutchings (and more)
|
||||||
|
http://typicons.com
|
||||||
|
License: MIT/Expat
|
||||||
|
Comment: Site: https://github.com/stephenhutchings/typicons.font
|
||||||
|
|
||||||
Files: src/qt/res/icons/connect*.png
|
Files: src/qt/res/icons/connect*.png
|
||||||
Copyright: schollidesign
|
src/qt/res/src/connect-*.svg
|
||||||
License: GPL-3+
|
Copyright: Marco Falke
|
||||||
Comment: Icon Pack: Human-O2
|
License: MIT/Expat
|
||||||
Site: http://findicons.com/icon/93743/blocks_gnome_netstatus_0
|
Comment: Inspired by Stephan Hutchings Typicons
|
||||||
|
|
||||||
Files: src/qt/res/icons/transaction*.png
|
Files: src/qt/res/icons/tx_mined.png
|
||||||
Copyright: md2k7
|
src/qt/res/src/mine.svg
|
||||||
License: Expat
|
Copyright: Jonas Schnelli
|
||||||
Comment: Site: https://bitcointalk.org/index.php?topic=15276.0
|
License: MIT/Expat
|
||||||
|
Comment:
|
||||||
|
|
||||||
Files: src/qt/res/icons/configure.png, src/qt/res/icons/quit.png,
|
Files: src/qt/res/icons/clock*.png
|
||||||
src/qt/res/icons/editcopy.png, src/qt/res/icons/editpaste.png,
|
src/qt/res/icons/eye_*.png
|
||||||
src/qt/res/icons/add.png, src/qt/res/icons/edit.png,
|
src/qt/res/icons/verify.png
|
||||||
src/qt/res/icons/remove.png
|
src/qt/res/icons/tx_in*.png
|
||||||
Copyright: http://www.everaldo.com
|
src/qt/res/src/clock_*.svg
|
||||||
License: LGPL
|
src/qt/res/src/tx_*.svg
|
||||||
Comment: Icon Pack: Crystal SVG
|
src/qt/res/src/verify.svg
|
||||||
|
Copyright: Stephan Hutching, Jonas Schnelli
|
||||||
|
License: MIT/Expat
|
||||||
|
Comment: Modifications of Stephan Hutchings Typicons
|
||||||
|
|
||||||
Files: src/qt/res/icons/bitcoin.png, src/qt/res/icons/toolbar.png
|
Files: src/qt/res/icons/about.png
|
||||||
Copyright: Bitboy (optimized for 16x16 by Wladimir van der Laan)
|
src/qt/res/icons/bitcoin.*
|
||||||
|
share/pixmaps/bitcoin*
|
||||||
|
src/qt/res/src/bitcoin.svg
|
||||||
|
Copyright: Bitboy, Jonas Schnelli
|
||||||
License: PUB-DOM
|
License: PUB-DOM
|
||||||
Comment: Site: https://bitcointalk.org/?topic=1756.0
|
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: MIT/Expat
|
||||||
License: PUB-DOM
|
|
||||||
Copyright: Crobbo (forum)
|
|
||||||
Comment: Site: https://bitcointalk.org/index.php?topic=32273.0
|
|
||||||
|
|
||||||
|
|
||||||
License: Expat
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a
|
Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
copy of this software and associated documentation files (the
|
copy of this software and associated documentation files (the
|
||||||
"Software"), to deal in the Software without restriction, including
|
"Software"), to deal in the Software without restriction, including
|
||||||
|
|
@ -98,20 +100,6 @@ License: Expat
|
||||||
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||||
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
License: ISC
|
|
||||||
Permission to use, copy, modify, and distribute this software for any
|
|
||||||
purpose with or without fee is hereby granted, provided that the above
|
|
||||||
copyright notice and this permission notice appear in all copies.
|
|
||||||
.
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
|
|
||||||
WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
|
|
||||||
WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
|
|
||||||
BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
|
|
||||||
OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
|
|
||||||
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
|
|
||||||
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|
||||||
SOFTWARE.
|
|
||||||
|
|
||||||
License: GPL-2+
|
License: GPL-2+
|
||||||
This program is free software; you can redistribute it and/or modify it
|
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
|
under the terms of the GNU General Public License as published by the
|
||||||
|
|
@ -140,22 +128,5 @@ Comment:
|
||||||
You should have received a copy of the GNU General Public License along
|
You should have received a copy of the GNU General Public License along
|
||||||
with this program. If not, see <http://www.gnu.org/licenses/>.
|
with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
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
|
|
||||||
the Free Software Foundation, either version 3 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.
|
|
||||||
Comment:
|
|
||||||
On Debian systems the GNU Lesser General Public License (LGPL) is
|
|
||||||
located in '/usr/share/common-licenses/LGPL'.
|
|
||||||
.
|
|
||||||
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: PUB-DOM
|
License: PUB-DOM
|
||||||
This work is in the public domain.
|
This work is in the public domain.
|
||||||
|
|
|
||||||
|
|
@ -1,70 +1 @@
|
||||||
The following is a list of assets used in the bitcoin source and their proper attribution.
|
The list of assets used in the bitcoin source and their attribution can now be found in [contrib/debian/copyright](../contrib/debian/copyright).
|
||||||
|
|
||||||
[Typicons/Stephen Hutchings](http://typicons.com)
|
|
||||||
-----------------------
|
|
||||||
|
|
||||||
### Info
|
|
||||||
* Icon Pack: Typicons (http://typicons.com)
|
|
||||||
* Designer: Stephen Hutchings (and more)
|
|
||||||
* License: MIT
|
|
||||||
* Site: [https://github.com/stephenhutchings/typicons.font](https://github.com/stephenhutchings/typicons.font)
|
|
||||||
|
|
||||||
### Assets Used
|
|
||||||
src/qt/res/icons/add.png
|
|
||||||
src/qt/res/icons/address-book.png
|
|
||||||
src/qt/res/icons/configure.png
|
|
||||||
src/qt/res/icons/debugwindow.png
|
|
||||||
src/qt/res/icons/edit.png
|
|
||||||
src/qt/res/icons/editcopy.png
|
|
||||||
src/qt/res/icons/editpaste.png
|
|
||||||
src/qt/res/icons/export.png
|
|
||||||
src/qt/res/icons/eye.png
|
|
||||||
src/qt/res/icons/filesave.png
|
|
||||||
src/qt/res/icons/history.png
|
|
||||||
src/qt/res/icons/info.png
|
|
||||||
src/qt/res/icons/key.png
|
|
||||||
src/qt/res/icons/lock_*.png
|
|
||||||
src/qt/res/icons/open.png
|
|
||||||
src/qt/res/icons/overview.png
|
|
||||||
src/qt/res/icons/quit.png
|
|
||||||
src/qt/res/icons/receive.png
|
|
||||||
src/qt/res/icons/remove.png
|
|
||||||
src/qt/res/icons/send.png
|
|
||||||
src/qt/res/icons/synced.png
|
|
||||||
src/qt/res/icons/transaction*.png
|
|
||||||
src/qt/res/icons/tx_output.png
|
|
||||||
src/qt/res/icons/warning.png
|
|
||||||
|
|
||||||
Other
|
|
||||||
-----------------------
|
|
||||||
|
|
||||||
### Info
|
|
||||||
* Designer: Jonas Schnelli, Bitboy, Stephen Hutchings, Marco Falke
|
|
||||||
* Bitcoin icon: Based on the original bitcoin logo from Bitboy
|
|
||||||
* Network connection icons: Marco Falke, inspired by flow-merge.svg from Stephen Hutchings
|
|
||||||
* Transaction-mined icon: Jonas Schnelli
|
|
||||||
* Other icons are based on Stephan Hutchings Typicons
|
|
||||||
* License: MIT
|
|
||||||
|
|
||||||
### Assets Used
|
|
||||||
src/qt/res/icons/about.png
|
|
||||||
src/qt/res/icons/about_qt.png
|
|
||||||
src/qt/res/icons/bitcoin.icns
|
|
||||||
src/qt/res/icons/bitcoin.ico
|
|
||||||
src/qt/res/icons/bitcoin.png
|
|
||||||
src/qt/res/icons/clock*.png
|
|
||||||
src/qt/res/icons/connect*.png
|
|
||||||
src/qt/res/icons/eye_minus.png
|
|
||||||
src/qt/res/icons/eye_plus.png
|
|
||||||
src/qt/res/icons/verify.png
|
|
||||||
src/qt/res/icons/tx_inout.png
|
|
||||||
src/qt/res/icons/tx_input.png
|
|
||||||
src/qt/res/icons/tx_mined.png
|
|
||||||
src/qt/res/src/bitcoin.svg
|
|
||||||
src/qt/res/src/clock_*.svg
|
|
||||||
src/qt/res/src/connect-*.svg
|
|
||||||
src/qt/res/src/mine.svg
|
|
||||||
src/qt/res/src/qt.svg
|
|
||||||
src/qt/res/src/tx_*.svg
|
|
||||||
src/qt/res/src/transaction0.svg
|
|
||||||
src/qt/res/src/verify.svg
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue