From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57888) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBpvN-0002Ql-O5 for guix-patches@gnu.org; Fri, 19 May 2017 17:59:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dBpvK-0003NM-Kv for guix-patches@gnu.org; Fri, 19 May 2017 17:59:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:53017) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dBpvK-0003N7-61 for guix-patches@gnu.org; Fri, 19 May 2017 17:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dBpvJ-00075K-VE for guix-patches@gnu.org; Fri, 19 May 2017 17:59:01 -0400 Subject: bug#26924: [PATCH 09/10] gnu: calibre: Add exhaustive license list Resent-To: guix-patches@gnu.org Resent-Message-ID: From: Marius Bakke In-Reply-To: <53a09b3e-160d-1569-32ab-3b6b8b355fc6@openmailbox.org> References: <53a09b3e-160d-1569-32ab-3b6b8b355fc6@openmailbox.org> Date: Fri, 19 May 2017 23:58:36 +0200 Message-ID: <87lgpsa4qb.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Brendan Tildesley , 26924-done@debbugs.gnu.org --=-=-= Content-Type: text/plain Brendan Tildesley writes: > From 7e36409c4464bc10af90a2075f202dc22007b23c Mon Sep 17 00:00:00 2001 > From: Brendan Tildesley > 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. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkfao0ACgkQoqBt8qM6 VPp6LAf8DihaQ6O8i2eCV0stazxvIl6ggDkYEcRDK4EkddOF5KxXkzS2Xkag59H8 e9saq5275V78yI46HQBbQZxWjg7c/OCEAkfZZ19hFSz+l3lcd4j8+mmPbkDFr2/f c16jHFgg3Rq4ba3JuwsqsHCeNukSme7G+s8sjEGfHNYTot+dh5oxD6aaUANNSWIE qDw5WRfefR5zIDK1dL7m04SROaYb576Dp9pkNK+6deS5HqjSwlI5qx6fQoU6Rc6G obcP7OXA981SezoJQ7PHkz5uDwdd/6egKc/bfnYVTP39ogWl5KwKP3j33IZy6dhC eSo02Cn+4LaAsmgTZa33vW/8G9Izcg== =vGVH -----END PGP SIGNATURE----- --=-=-=--