From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58773) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAQtG-0000Sl-IG for guix-patches@gnu.org; Mon, 15 May 2017 21:03:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dAQtC-0000xd-LT for guix-patches@gnu.org; Mon, 15 May 2017 21:03:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:44505) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dAQtC-0000xK-Ee for guix-patches@gnu.org; Mon, 15 May 2017 21:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dAQtC-0005aH-84 for guix-patches@gnu.org; Mon, 15 May 2017 21:03:02 -0400 Subject: bug#26924: [PATCH 06/12] gnu: calibre: Undelete GPLv2 icon file. Resent-Message-ID: References: <9ebee0d0-e6ab-0573-2974-5c501537efdd@openmailbox.org> <8737c6f41w.fsf@fastmail.com> From: Brendan Tildesley Message-ID: <9893970f-1633-0649-6964-fdc5456e6120@openmailbox.org> Date: Tue, 16 May 2017 11:02:25 +1000 MIME-Version: 1.0 In-Reply-To: <8737c6f41w.fsf@fastmail.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit 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: 26924@debbugs.gnu.org On 2017-05-16 03:00, Marius Bakke wrote: > Brendan Tildesley writes: > >> From efcfd192fb22ab36054d41ba02ae3e5e32a9239c Mon Sep 17 00:00:00 2001 >> From: Brendan Tildesley >> Date: Sat, 13 May 2017 23:34:59 +1000 >> Subject: [PATCH 06/12] gnu: calibre: Undelete GPLv2 icon file. >> >> gnu/package/ebook.scm (calibre): Undelete GPLv2 icon file from openoffice >> (see thumbnail.py). > [...] > >> - ;; Remove non-free or doubtful code, see >> - ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html >> + ;; Remove nonfree unrar and bundled dependencies. >> (modules '((guix build utils))) >> (snippet >> '(begin >> (delete-file-recursively "src/calibre/ebooks/markdown") >> (delete-file-recursively "src/unrar") >> - (delete-file "src/odf/thumbnail.py") > I peeked in the git repository (not the release tarball) and this file > still says "License: Freeware" as the linked thread discusses. Am I > missing something? If you look in thumbnail.py it's self, it says the icon is from http://www.zwahlendesign.ch/en/node/20 Which has a .zip file, containing the icons and a LICENSE.txt file stating they are GPLv2