new var DIST_CONTRIB adds useful things for packagers from contrib #8568
Conversation
|
This reminds me, we should move the manpages from contrib/debian to a more general directory, and make |
|
Indeed this would make sense. I looked into how other projects handle the manpages. So I got inspired by how gnome does it: https://git.gnome.org/browse/gnome-shell/tree/Makefile.am But I wasn't sure about the license of the debian manpages, only one is MIT the others are GPL. A positive side effect of all of this is that those manpages now also end up in the tarball that gets created by If you think this is the correct way of doing it and you can clarify if the debian manpages can be included because of the GPL license, we could use this for 7626. |
|
Full diff can be seen here: master...nomnombtc:man_automake Looks good to me, concept ACK. The man page licensing issue came up before: #1040 (comment) . I don't have an answer there. I do not know what the licensing rules are for documentation, but I'd feel better to have them under the same license as Bitcoin Core itself. We could ask the authors if they agree with re-licensing. Good idea to auto-generate the man pages! that will prevent them from being eternally out of date. The installation step looks ok to me.
|
|
I don't understand why licensing is an issue with auto generated man pages through |
|
Concept ACK |
As I understood it's a problem with the current manpages in contrib/debian, not the proposed auto-generated ones. |
|
Ok, but we would just delete the current manpages in contrib/debian and (maybe) replace them with the autogenerated ones? GPL doesn't forbid deleting. |
|
Sure, if there is nothing in those man pages that we want to keep, then we can save ourselves the work of trying to get them re-licensed. That's a valid option. |
Makefile.am
Outdated
|
|
||
| DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md) | ||
| DIST_CONTRIB = $(wildcard $(top_srcdir)/contrib/*.bash-completion) \ | ||
| $(top_srcdir)/contrib/debian \ |
There was a problem hiding this comment.
Now that the manpages have been moved out of debian, is there still a reason to include the debian directory here?
There was a problem hiding this comment.
There is still a bitcoin-qt.desktop file and a bitcoin-qt.protocol file in there (makes it open bitcoin-qt when clicking a bitcoin: url in kde apps like kmail for example) but I could live without it... Problem is still apparently everything in debian/ is GPL2 according to the copyright file in that folder:
Files: debian/*
Copyright: 2010-2011, Jonas Smedegaard [email protected]
2011, Matt Corallo [email protected]
License: GPL-2+
So I guess it makes sense to remove it for now, until someone has a better idea because of the licensing.
There was a problem hiding this comment.
Thanks, yes, the licensing is still annoying.
Would be easy enough to write our own desktop and protocol file and install them, though OTOH I suppose those things are quite distro specific, at least where to install them.
Out of scope for this pull at least.
|
Concept ACK. Please list them rather than using wildcards, though. That ensures that local files don't cause unexpected results. I know doc already uses it above, but let's not make it worse here. |
|
Ok no problem, I've added a commit that removes the wildcard. |
|
Concept ACK |
|
Hmm, maybe squash the three commits into one? Concept ACK f6c6c6b |
…om contrib 1ee6f91 new var DIST_CONTRIB adds useful things for packagers from contrib/ to EXTRA_DIST (nomnombtc)
|
Merged (and squashed) via 078900d |
…gers from contrib 1ee6f91 new var DIST_CONTRIB adds useful things for packagers from contrib/ to EXTRA_DIST (nomnombtc)
…gers from contrib 1ee6f91 new var DIST_CONTRIB adds useful things for packagers from contrib/ to EXTRA_DIST (nomnombtc)
…gers from contrib 1ee6f91 new var DIST_CONTRIB adds useful things for packagers from contrib/ to EXTRA_DIST (nomnombtc)
6 participants
This creates a new variable DIST_CONTRIB in Makefile.am and adds it to EXTRA_DIST.
I included a few useful things like contrib/debian subdir (contains manpages, .desktop file), contrib/rpm subdir (contains .spec file to build rpms), contrib/init subdir (contains things like systemd startup files) and the *.bash-completion files.
Reason is that many packagers just use the (unsigned) tarball from the github release page, as it contains the full contrib folder including manpages. With this change the release tarball created by
make distcontains most of those files too, so packagers can use this one instead. See also #6753