Skip to content

Commit

Permalink
update copyright/license
Browse files Browse the repository at this point in the history
@sbourdeauducq
sbourdeauducq committed Sep 5, 2015
1 parent eb554f8 commit 2bd27a3
Showing 4 changed files with 723 additions and 3 deletions.
46 changes: 46 additions & 0 deletions CONTRIBUTING
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
Authors retain copyright of their contributions to ARTIQ, but whenever possible
should use the GNU GPL version 3 license for them to be merged.

Works of US government employees are not copyrighted but can also be merged.

We've introduced a "sign-off" procedure on patches that are being sent around.

The sign-off is a simple line at the end of the explanation for the
patch, which certifies that you wrote it or otherwise have the right to
pass it on as an open-source patch. The rules are pretty simple: if you
can certify the below:

Developer's Certificate of Origin (1.1 from the Linux kernel)

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file; or

(b) The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source
license and I have the right under that license to submit that
work with modifications, whether created in whole or in part
by me, under the same open source license (unless I am
permitted to submit under a different license), as indicated
in the file; or

(c) The contribution was provided directly to me by some other
person who certified (a), (b) or (c) and I have not modified
it.

(d) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.

then you just add a line saying

Signed-off-by: Random J Developer <random@developer.example.org>

using your real name (sorry, no pseudonyms or anonymous contributions.)

This comment has been minimized.

Sign in to view

Copy link
@whitequark

whitequark Sep 6, 2015

Contributor

The notion of a single and consistent name is meaningless and not grounded in reality. At the very least, say it as what it is: that you want a name that appears on a state-issued ID; there is nothing especially "real" in that name.

This comment has been minimized.

Sign in to view

Copy link
@fallen

fallen Sep 6, 2015

Contributor

+1

This comment has been minimized.

Sign in to view

Copy link
@jordens

jordens Sep 6, 2015

Member

I don't see where it demands a single and consistent name. If you have multiple "real names" that is fine. And "real name" is well defined. It is used to refer to a non-pseudonym that official entities would use to address you. It does not need to be a state-issued ID.

This comment has been minimized.

Sign in to view

Copy link
@whitequark

whitequark Sep 6, 2015

Contributor

I have never heard anyone use the phrase "real name" in the sense you have just described before, so clearly the term does not have such a well-defined meaning. Of course, the solution is the same: expand it and remove any ambiguity.

This comment has been minimized.

Sign in to view

Copy link
@jordens

jordens Sep 6, 2015

Member

What other meanings have you heard "real name" being used with? A cursory internet search shows only usage in the sense above. Among them are gerrit, the linux kernel, etc. I would speculate that they have thought that through, especially from a legalese perspective.

This comment has been minimized.

Sign in to view

Copy link
@whitequark

whitequark Sep 6, 2015

Contributor

The one I mention above--name from a state-issued ID (which is almost always assumed to be single and consistent by entities that demand such a name). I have had many conversations about names and this is what people used.

I very much doubt that "real name" is a legal term, and I doubt even more that clearly speaking out what you mean by "real name" will create a problem.

This comment has been minimized.

Sign in to view

Copy link
@jordens

jordens Sep 6, 2015

Member

No. In many countries (US and DE are those that I know about) you don't need a state-issued ID to have a "real name". I would be very careful with trying to over-specify what forms or documents constitute a valid official identification. That can backfire. The teleological context is strong enough.

This comment has been minimized.

Sign in to view

Copy link
@whitequark

whitequark Sep 9, 2015

Contributor

It occurs to me that phrasing it as legal name instead of "real name" will not overspecify it, will make the context clear, and will not make any allusions towards what is "real" and what is not. It is a very commonly used term as well. Any objections?

This comment has been minimized.

Sign in to view

Copy link
@jordens

jordens Sep 9, 2015

Member

Sounds good.

ARTIQ files that do not contain a license header are copyrighted by M-Labs Limited
and are licensed under GNU GPL version 3.
Loading

0 comments on commit 2bd27a3

Please sign in to comment.