diff mbox

[1/1] edu: fix license information

Message ID 1421914942-3660-1-git-send-email-jslaby@suse.cz
State New
Headers show

Commit Message

Jiri Slaby Jan. 22, 2015, 8:22 a.m. UTC
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
 docs/specs/edu.txt | 4 ++++
 hw/misc/edu.c      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

Comments

Markus Armbruster Jan. 22, 2015, 9:04 a.m. UTC | #1
Jiri Slaby <jslaby@suse.cz> writes:

> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> ---
>  docs/specs/edu.txt | 4 ++++
>  hw/misc/edu.c      | 2 +-
>  2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/docs/specs/edu.txt b/docs/specs/edu.txt
> index 360af27ec8b1..1a23df9d21f6 100644
> --- a/docs/specs/edu.txt
> +++ b/docs/specs/edu.txt
> @@ -2,6 +2,10 @@
>  EDU device
>  ==========
>  
> +Copyleft (c) 2014-2015 Jiri Slaby

IANAL, but I'm afraid you have to spell this "Copyright" to carry legal
weight.

> +
> +This document is licensed under the GPLv2 (or later).
> +
>  This is an educational device for writing (kernel) drivers. Its original
>  intention was to support the Linux kernel lectures taught at the Masaryk
>  University. Students are given this virtual device and are expected to write a
> diff --git a/hw/misc/edu.c b/hw/misc/edu.c
> index c74f9b64540d..9a8088c6898d 100644
> --- a/hw/misc/edu.c
> +++ b/hw/misc/edu.c
> @@ -1,7 +1,7 @@
>  /*
>   * QEMU educational PCI device
>   *
> - * Copyright (c) 2012-2014 Jiri Slaby
> + * Copyright (c) 2012-2015 Jiri Slaby
>   *
>   * Permission is hereby granted, free of charge, to any person obtaining a
>   * copy of this software and associated documentation files (the "Software"),
Jiri Slaby Jan. 22, 2015, 9:04 a.m. UTC | #2
On 01/22/2015, 10:04 AM, Markus Armbruster wrote:
> Jiri Slaby <jslaby@suse.cz> writes:
> 
>> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
>> ---
>>  docs/specs/edu.txt | 4 ++++
>>  hw/misc/edu.c      | 2 +-
>>  2 files changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/docs/specs/edu.txt b/docs/specs/edu.txt
>> index 360af27ec8b1..1a23df9d21f6 100644
>> --- a/docs/specs/edu.txt
>> +++ b/docs/specs/edu.txt
>> @@ -2,6 +2,10 @@
>>  EDU device
>>  ==========
>>  
>> +Copyleft (c) 2014-2015 Jiri Slaby
> 
> IANAL, but I'm afraid you have to spell this "Copyright" to carry legal
> weight.

Not quite as (c) is enough. GPLv2 is a copyleft license.
Markus Armbruster Jan. 22, 2015, 9:41 a.m. UTC | #3
Jiri Slaby <jslaby@suse.cz> writes:

> On 01/22/2015, 10:04 AM, Markus Armbruster wrote:
>> Jiri Slaby <jslaby@suse.cz> writes:
>> 
>>> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
>>> ---
>>>  docs/specs/edu.txt | 4 ++++
>>>  hw/misc/edu.c      | 2 +-
>>>  2 files changed, 5 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/docs/specs/edu.txt b/docs/specs/edu.txt
>>> index 360af27ec8b1..1a23df9d21f6 100644
>>> --- a/docs/specs/edu.txt
>>> +++ b/docs/specs/edu.txt
>>> @@ -2,6 +2,10 @@
>>>  EDU device
>>>  ==========
>>>  
>>> +Copyleft (c) 2014-2015 Jiri Slaby
>> 
>> IANAL, but I'm afraid you have to spell this "Copyright" to carry legal
>> weight.
>
> Not quite as (c) is enough. GPLv2 is a copyleft license.

Quoting <https://www.gnu.org/licenses/gpl-howto.en.html>:

    Always use the English word “Copyright”; by international
    convention, this is used worldwide, even for material in other
    languages. The copyright symbol “©” can be included if you wish (and
    your character set supports it), but it's not necessary. There is no
    legal significance to using the three-character sequence “(C)”,
    although it does no harm.
Eric Blake Jan. 22, 2015, 3:39 p.m. UTC | #4
On 01/22/2015 01:22 AM, Jiri Slaby wrote:
> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> ---
>  docs/specs/edu.txt | 4 ++++
>  hw/misc/edu.c      | 2 +-
>  2 files changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/docs/specs/edu.txt b/docs/specs/edu.txt
> index 360af27ec8b1..1a23df9d21f6 100644
> --- a/docs/specs/edu.txt
> +++ b/docs/specs/edu.txt
> @@ -2,6 +2,10 @@
>  EDU device
>  ==========
>  
> +Copyleft (c) 2014-2015 Jiri Slaby

s/Copyleft/Copyright/.  There's legal implications to the word you use,
and the rest of the code base does not use "Copyleft".
Paolo Bonzini Jan. 22, 2015, 3:53 p.m. UTC | #5
On 22/01/2015 16:39, Eric Blake wrote:
> On 01/22/2015 01:22 AM, Jiri Slaby wrote:
>> Signed-off-by: Jiri Slaby <jslaby@suse.cz> --- docs/specs/edu.txt
>> | 4 ++++ hw/misc/edu.c      | 2 +- 2 files changed, 5
>> insertions(+), 1 deletion(-)
>> 
>> diff --git a/docs/specs/edu.txt b/docs/specs/edu.txt index
>> 360af27ec8b1..1a23df9d21f6 100644 --- a/docs/specs/edu.txt +++
>> b/docs/specs/edu.txt @@ -2,6 +2,10 @@ EDU device ==========
>> 
>> +Copyleft (c) 2014-2015 Jiri Slaby
> 
> s/Copyleft/Copyright/.  There's legal implications to the word you
> use, and the rest of the code base does not use "Copyleft".
> 

Yup, fixed and applied.

Paolo
Jiri Slaby Jan. 22, 2015, 7:10 p.m. UTC | #6
On 01/22/2015, 04:53 PM, Paolo Bonzini wrote:
> On 22/01/2015 16:39, Eric Blake wrote:
>> On 01/22/2015 01:22 AM, Jiri Slaby wrote:
>>> Signed-off-by: Jiri Slaby <jslaby@suse.cz> --- docs/specs/edu.txt
>>> | 4 ++++ hw/misc/edu.c      | 2 +- 2 files changed, 5
>>> insertions(+), 1 deletion(-)
>>>
>>> diff --git a/docs/specs/edu.txt b/docs/specs/edu.txt index
>>> 360af27ec8b1..1a23df9d21f6 100644 --- a/docs/specs/edu.txt +++
>>> b/docs/specs/edu.txt @@ -2,6 +2,10 @@ EDU device ==========
>>>
>>> +Copyleft (c) 2014-2015 Jiri Slaby
>>
>> s/Copyleft/Copyright/.  There's legal implications to the word you
>> use, and the rest of the code base does not use "Copyleft".
>>
> 
> Yup, fixed and applied.

Ok, thanks a lot! (I still think "copyleft (c)" was enough (in all laws
we care) ;).)
Markus Armbruster Jan. 23, 2015, 7:40 a.m. UTC | #7
Jiri Slaby <jslaby@suse.cz> writes:

> On 01/22/2015, 04:53 PM, Paolo Bonzini wrote:
>> On 22/01/2015 16:39, Eric Blake wrote:
>>> On 01/22/2015 01:22 AM, Jiri Slaby wrote:
>>>> Signed-off-by: Jiri Slaby <jslaby@suse.cz> --- docs/specs/edu.txt
>>>> | 4 ++++ hw/misc/edu.c      | 2 +- 2 files changed, 5
>>>> insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/docs/specs/edu.txt b/docs/specs/edu.txt index
>>>> 360af27ec8b1..1a23df9d21f6 100644 --- a/docs/specs/edu.txt +++
>>>> b/docs/specs/edu.txt @@ -2,6 +2,10 @@ EDU device ==========
>>>>
>>>> +Copyleft (c) 2014-2015 Jiri Slaby
>>>
>>> s/Copyleft/Copyright/.  There's legal implications to the word you
>>> use, and the rest of the code base does not use "Copyleft".
>>>
>> 
>> Yup, fixed and applied.
>
> Ok, thanks a lot! (I still think "copyleft (c)" was enough (in all laws
> we care) ;).)

Do not to deviate from the FSF's advice on how their licenses should be
applied unless

* you're a lawyer in all the jurisdictions we care about, or

* you got legal advice in all the jurisdictions we care about, or

* you're eagerly looking forward to needing legal advice in the future.

Since none of the above apply to the QEMU project, we stick to the FSF's
advice.

There are ample opportunities for self-expression in source code and
documentation other than legal notices.
diff mbox

Patch

diff --git a/docs/specs/edu.txt b/docs/specs/edu.txt
index 360af27ec8b1..1a23df9d21f6 100644
--- a/docs/specs/edu.txt
+++ b/docs/specs/edu.txt
@@ -2,6 +2,10 @@ 
 EDU device
 ==========
 
+Copyleft (c) 2014-2015 Jiri Slaby
+
+This document is licensed under the GPLv2 (or later).
+
 This is an educational device for writing (kernel) drivers. Its original
 intention was to support the Linux kernel lectures taught at the Masaryk
 University. Students are given this virtual device and are expected to write a
diff --git a/hw/misc/edu.c b/hw/misc/edu.c
index c74f9b64540d..9a8088c6898d 100644
--- a/hw/misc/edu.c
+++ b/hw/misc/edu.c
@@ -1,7 +1,7 @@ 
 /*
  * QEMU educational PCI device
  *
- * Copyright (c) 2012-2014 Jiri Slaby
+ * Copyright (c) 2012-2015 Jiri Slaby
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),