Skip to content

Conversation

@fanquake
Copy link
Member

This just leaves us the rest of the X11 license mentions in /src, which will
continue to be removed as code is changed.

@laanwj
Copy link
Member

laanwj commented Dec 15, 2014

I'd say let's just remove all of them from the tree at once.

@fanquake
Copy link
Member Author

I had considered that, but didn't think we'd want to touch a few hundred
files at once. Will update this pull.

On Monday, December 15, 2014, Wladimir J. van der Laan <
[email protected]> wrote:

I'd say let's just remove all of them from the tree at once.

Reply to this email directly or view it on GitHub
#5470 (comment).

@fanquake fanquake force-pushed the x11_removal branch 2 times, most recently from 9c3cf30 to e75c92f Compare December 15, 2014 09:54
@laanwj
Copy link
Member

laanwj commented Dec 16, 2014

It is a big change but also easy to validate. e.g

checkout fanquake/x11_removal~1
git ls-files -z | xargs -0 sed -i 's/MIT\/X11/MIT/g'
git diff fanquake/x11_removal

Looks like you forgot the following files:

 src/bitcoin-cli-res.rc
 src/bitcoind-res.rc
 src/qt/res/bitcoin-qt-res.rc
 src/test/bctest.py
 src/test/bitcoin-util-test.py
 src/univalue/gen.cpp
 src/univalue/univalue.cpp
 src/univalue/univalue.h
 src/univalue/univalue_read.cpp
 src/univalue/univalue_write.cpp

@fanquake
Copy link
Member Author

I left the remaining .py and .cpp files because they have the BitPay copyright header, was going to ask about just changing that?

As for the .rc files, wasn't sure wether they were generated somehow, hadn't had a chance to check yet.

@fanquake fanquake changed the title Remove remaining references to X11 licence from contrib/doc/qa Remove remaining references to X11 licence Dec 16, 2014
@laanwj
Copy link
Member

laanwj commented Dec 16, 2014

Just change it all, really all. The .rc files are not generated, so they too.

@fanquake
Copy link
Member Author

Thanks. Done.

@laanwj
Copy link
Member

laanwj commented Dec 16, 2014

ACK commithash 78253fc pull 5470
(verified using the above script, no output)
(signature)

@laanwj laanwj changed the title Remove remaining references to X11 licence Remove ALL remaining references to X11 licence Dec 16, 2014
@laanwj laanwj merged commit 78253fc into bitcoin:master Dec 19, 2014
laanwj added a commit that referenced this pull request Dec 19, 2014
78253fc Remove references to X11 licence (Michael Ford)
@fanquake fanquake deleted the x11_removal branch May 12, 2016 14:18
0xartem pushed a commit to Crowndev/crown-core that referenced this pull request Jun 1, 2018
78253fc Remove references to X11 licence (Michael Ford)

(cherry picked from commit 111a7d4)
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants