bug#26924: [PATCH 09/10] gnu: calibre: Add exhaustive license list

[Marius Bakke]

Brendan Tildesley <address@hidden> writes:

> From 7e36409c4464bc10af90a2075f202dc22007b23c Mon Sep 17 00:00:00 2001
> From: Brendan Tildesley <address@hidden>
> Date: Sun, 14 May 2017 17:01:06 +1000
> Subject: [PATCH 09/10] gnu: calibre: Add exhaustive license list

[...]

> @@ -165,4 +165,13 @@ and catalog ebooks in most of the major ebook formats.  
> It can also talk
>  to many ebook reader devices.  It can go out to the Internet and fetch
>  metadata for books.  It can download newspapers and convert them into
>  ebooks for convenient reading.")
> -    (license gpl3))) ; some files are under various other licenses, see 
> COPYRIGHT
> +    (license (list license:gpl3 ; Too many files to detail here. See source.
> +                   license:gpl2+
> +                   license:gpl2
> +                   license:bsd-3
> +                   license:lgpl2.1+
> +                   license:lgpl2.1
> +                   license:expat
> +                   license:asl2.0
> +                   license:non-copyleft ; hyphenate license, and Info-Zip 
> license.
> +                   license:cc-by-sa3.0))))

I removed hyphenate (which appears to be MIT) and info-ZIP (a weird BSD
variant only used in the windows installer). I also added zpl2.1,
public-domain and silofl1.1; and dropped the GPL2 and GPL3 only
variants (AFAICT everything installed is covered by "or later").

I also did some style changes in the commit messages. Pushed everything
but the icon patch with 1326166ebe15be3936c1a0497fd860f2fe69b5fa !

Closing this bug, but it would be great to find out about that
openoffice icon.

signature.asc
Description: PGP signature