[cleanup] Update contrib/debian/copyright #6667

pull MarcoFalke wants to merge 2 commits into bitcoin:master from MarcoFalke:MarcoFalke-2015-copyrightFix changing 3 files +60 −156

MarcoFalke commented at 1:53 PM on September 13, 2015: member

Splitting this from the other cleanup PR so it can be merged on it's own.
in contrib/debian/copyright:None in 1629a34dd0 outdated
```
  92 | +Files: src/qt/res/icons/connect*.png, src/qt/res/src/connect-*.svg
  93 | +Copyright: Marco Falke
  94 | +License: MIT
  95 | +Comment: Inspired by Stephan Hutchings Typicons
  96 | +
  97 | +Files: src/qt/res/icons/tx_mined.png
```
jonasschnelli commented at 1:55 PM on September 13, 2015:

here we should add src/qt/res/src/mine.svg

MarcoFalke commented at 4:02 PM on September 13, 2015:

What is the scope of debian/copyright? Used for debian bitcoin repos? Which folders should be included in debian/copyright? Actually there is missing more than just mine.svg (c.f. https://github.com/bitcoin/bitcoin/blob/88f856a9e78a1440d9fdd8f9d5aa3cd034d66bf9/doc/assets-attribution.md#other ) Is it required to duplicate those files?

MarcoFalke commented at 5:03 PM on September 14, 2015:

ping @TheBlueMatt to clarify the scope?

TheBlueMatt commented at 5:07 PM on September 14, 2015:

It should include the copyright of anything which is installed, I guess? If the license does not effect the binaries or the files installed directly (https://github.com/bitcoin/bitcoin/blob/master/contrib/debian/bitcoin-qt.install), then it can be skipped I suppose.
jonasschnelli commented at 1:56 PM on September 13, 2015: contributor

ACK (see point above).
fanquake commented at 2:36 AM on September 14, 2015: member

ACK
TheBlueMatt commented at 4:15 PM on September 14, 2015: member

MIT != Expat. They are not interchangeable.
jonasschnelli commented at 4:20 PM on September 14, 2015: contributor

Good point. I think we should remove the whole "Expat" mentioning L70-L72. Everything has moved to MIT.
TheBlueMatt commented at 4:24 PM on September 14, 2015: member

Oops, sorry. I had two of the MIT's confused. We are all Expat, afaik (MIT is ambiguous).
MarcoFalke commented at 5:02 PM on September 14, 2015: member

MIT == Expat == content of ./COPYING

Though, I could change to Expat, if that is wanted.
TheBlueMatt commented at 5:04 PM on September 14, 2015: member

@MarcoFalke Expat is one of several MIT licenses, so it is probably best to be clear which one you are specifying.
MarcoFalke force-pushed on Sep 15, 2015
Update contrib/debian/copyright 9be08b7fe2
MarcoFalke force-pushed on Sep 15, 2015
MarcoFalke commented at 9:05 AM on September 16, 2015: member
Force pushed those changes:
- Don't mention the source SVGs
- Call it "MIT/Expat"
wallclockbuilder commented at 9:39 AM on September 16, 2015: none

ACK
laanwj commented at 4:00 AM on September 18, 2015: member

Not happy with the duplication, maybe we should simply move to debian's copyright file format and remove our own assets-attribution.md. That said, ACK
MarcoFalke commented at 9:06 AM on September 18, 2015: member

+1. Added a commit to merge doc/assets-attribution.md into contrib/debian/copyright.
laanwj commented at 3:05 PM on September 18, 2015: member

@MarcoFalke Looks good to me - though I think replacing the contents of assets-attrribution with a link to the debian copyright file would be even better. contrib/debian is not the most straightforward place to look for people that are suddenly missing the file.
laanwj added the label Docs and Output on Sep 18, 2015
MarcoFalke force-pushed on Sep 18, 2015

[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.

2eb3183ca4

MarcoFalke force-pushed on Sep 18, 2015
MarcoFalke commented at 4:48 PM on September 20, 2015: member

@laanwj Done.
laanwj merged this on Sep 21, 2015
laanwj closed this on Sep 21, 2015
laanwj referenced this in commit 229fb974ab on Sep 21, 2015
MarcoFalke deleted the branch on Sep 21, 2015
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels

Linked (view graph)