Re: [PATCH 1/2] gnu: gajim: License is "version 3 only".

2016-10-22 Thread Arun Isaac

> Given that the combination is GPLv3-only in practice, I think it’s
> enough to write ‘gpl3’ (I know we’ve been somewhat inconsistent here…).

In that case, could you use the patch set I sent earlier? That has only
the GPL3.

http://lists.gnu.org/archive/html/guix-devel/2016-10/msg00974.html


signature.asc
Description: PGP signature


Re: [PATCH 1/2] gnu: gajim: License is "version 3 only".

2016-10-20 Thread Ludovic Courtès
Leo Famulari  skribis:

> On Wed, Oct 19, 2016 at 10:20:04AM +0530, Arun Isaac wrote:
>> * gnu/packages/messaging.scm (gajim)[license]: Change to GPL3.
>
> Thanks for checking on this!
>
> Indeed, the bulk of the license headers say "version 3 only", so I think
> gajim is GPL3. But, I found a few files that are GPL3+, and at least one
> 2-clause BSD licensed file in 'src/command-system'.
>
> Can you revise this patch to give a license list, with comments
> explaining that the package is GPL3 but includes some
> differently-licensed components?

Given that the combination is GPLv3-only in practice, I think it’s
enough to write ‘gpl3’ (I know we’ve been somewhat inconsistent here…).

Ludo’.



[PATCH 1/2] gnu: gajim: License is "version 3 only".

2016-10-20 Thread Arun Isaac
* gnu/packages/messaging.scm (gajim)[license]: Change to GPL3.
---
 gnu/packages/messaging.scm | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 0089da1..f5a8c4a 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -504,7 +504,11 @@ Among its features are: a tabbed chat window and single 
window modes; support
 for group chat (with Multi-User Chat protocol), invitation, chat to group chat
 transformation; audio and video conferences; file transfer; TLS, GPG and
 end-to-end encryption support; XML console.")
-(license license:gpl3+)))
+;; Gajim is released under the GPL3 license, but a few files are
+;; released under the GPL3+ and the 2-clause BSD licenses
+(license (list license:gpl3
+   license:gpl3+
+   license:bsd-2
 
 (define-public prosody
   (package
-- 
2.10.1




Re: [PATCH 1/2] gnu: gajim: License is "version 3 only".

2016-10-19 Thread Leo Famulari
On Wed, Oct 19, 2016 at 10:20:04AM +0530, Arun Isaac wrote:
> * gnu/packages/messaging.scm (gajim)[license]: Change to GPL3.

Thanks for checking on this!

Indeed, the bulk of the license headers say "version 3 only", so I think
gajim is GPL3. But, I found a few files that are GPL3+, and at least one
2-clause BSD licensed file in 'src/command-system'.

Can you revise this patch to give a license list, with comments
explaining that the package is GPL3 but includes some
differently-licensed components?

> ---
>  gnu/packages/messaging.scm | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
> index 0089da1..37bbed7 100644
> --- a/gnu/packages/messaging.scm
> +++ b/gnu/packages/messaging.scm
> @@ -504,7 +504,7 @@ Among its features are: a tabbed chat window and single 
> window modes; support
>  for group chat (with Multi-User Chat protocol), invitation, chat to group 
> chat
>  transformation; audio and video conferences; file transfer; TLS, GPG and
>  end-to-end encryption support; XML console.")
> -(license license:gpl3+)))
> +(license license:gpl3)))
>  
>  (define-public prosody
>(package
> -- 
> 2.10.1
> 
> 



[PATCH 1/2] gnu: gajim: License is "version 3 only".

2016-10-18 Thread Arun Isaac
* gnu/packages/messaging.scm (gajim)[license]: Change to GPL3.
---
 gnu/packages/messaging.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 0089da1..37bbed7 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -504,7 +504,7 @@ Among its features are: a tabbed chat window and single 
window modes; support
 for group chat (with Multi-User Chat protocol), invitation, chat to group chat
 transformation; audio and video conferences; file transfer; TLS, GPG and
 end-to-end encryption support; XML console.")
-(license license:gpl3+)))
+(license license:gpl3)))
 
 (define-public prosody
   (package
-- 
2.10.1