From 2eb3183ca495c08212ff425b264b261428f278f0 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 18 Sep 2015 17:52:18 +0200
Subject: [PATCH] [doc] Merge doc/assets-attribution.md into
contrib/debian/copyright
Even though the SVG source files are never used in the QT client,
their authors are mentioned in contrib/debian/copyright due to
simplicity.
---
contrib/debian/copyright | 10 ++++--
doc/assets-attribution.md | 71 +--------------------------------------
2 files changed, 9 insertions(+), 72 deletions(-)
diff --git a/contrib/debian/copyright b/contrib/debian/copyright
index 7bb6fadae..d119bbd1d 100644
--- a/contrib/debian/copyright
+++ b/contrib/debian/copyright
@@ -49,11 +49,13 @@ License: MIT/Expat
Comment: Site: https://github.com/stephenhutchings/typicons.font
Files: src/qt/res/icons/connect*.png
+ src/qt/res/src/connect-*.svg
Copyright: Marco Falke
License: MIT/Expat
Comment: Inspired by Stephan Hutchings Typicons
Files: src/qt/res/icons/tx_mined.png
+ src/qt/res/src/mine.svg
Copyright: Jonas Schnelli
License: MIT/Expat
Comment:
@@ -62,13 +64,17 @@ Files: src/qt/res/icons/clock*.png
src/qt/res/icons/eye_*.png
src/qt/res/icons/verify.png
src/qt/res/icons/tx_in*.png
+ src/qt/res/src/clock_*.svg
+ src/qt/res/src/tx_*.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.*
- src/qt/res/icons/about.png
+Files: src/qt/res/icons/about.png
+ src/qt/res/icons/bitcoin.*
share/pixmaps/bitcoin*
+ src/qt/res/src/bitcoin.svg
Copyright: Bitboy, Jonas Schnelli
License: PUB-DOM
Comment: Site: https://bitcointalk.org/?topic=1756.0
diff --git a/doc/assets-attribution.md b/doc/assets-attribution.md
index 460c1f8e2..2dd930d6a 100644
--- a/doc/assets-attribution.md
+++ b/doc/assets-attribution.md
@@ -1,70 +1 @@
-The following is a list of assets used in the bitcoin source and their proper attribution.
-
-[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
+The list of assets used in the bitcoin source and their attribution can now be found in [contrib/debian/copyright](../contrib/debian/copyright).