From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 28 Jul 2021 13:48:35 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1m8i39-000543-Be for lore@lore.pengutronix.de; Wed, 28 Jul 2021 13:48:35 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1m8i38-0004ei-VK; Wed, 28 Jul 2021 13:48:34 +0200 Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=[127.0.0.1]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1m8i2j-0004eS-Ra; Wed, 28 Jul 2021 13:48:09 +0200 To: Roland Hieber References: <20210728090107.23043-1-bst@pengutronix.de> <20210728094928.yckfwrmkajppzc24@pengutronix.de> From: Bastian Krause Message-ID: <65b3b816-444e-9c18-16d6-74dd3ace2fbb@pengutronix.de> Date: Wed, 28 Jul 2021 13:48:09 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210728094928.yckfwrmkajppzc24@pengutronix.de> Content-Language: en-US Subject: Re: [ptxdist] [PATCH] cairo: fix license identifier X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false On 7/28/21 11:49 AM, Roland Hieber wrote: > On Wed, Jul 28, 2021 at 11:01:07AM +0200, Bastian Krause wrote: >> Cairo is dual-licensed: >> >> "Cairo is free software and is available to be redistributed and/or >> modified under the terms of either the GNU Lesser General Public License >> (LGPL) version 2.1 or the Mozilla Public License (MPL) version 1.1 at >> your option." (https://www.cairographics.org/) >> >> Signed-off-by: Bastian Krause >> --- >> rules/cairo.make | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/rules/cairo.make b/rules/cairo.make >> index cfaa74518..cbcb76b5f 100644 >> --- a/rules/cairo.make >> +++ b/rules/cairo.make >> @@ -21,7 +21,7 @@ CAIRO_SUFFIX := tar.xz >> CAIRO_URL := http://cairographics.org/releases/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX) >> CAIRO_SOURCE := $(SRCDIR)/$(CAIRO).$(CAIRO_SUFFIX) >> CAIRO_DIR := $(BUILDDIR)/$(CAIRO) >> -CAIRO_LICENSE := LGPL-2.1-only AND MPL-1.1 >> +CAIRO_LICENSE := LGPL-2.1-only OR MPL-1.1 > > Is there anything that you can pin down for CAIRO_LICENSE_FILES? I can pin the COPYING file, will send a v2. Note that the licensing did not change, the specifier was simply wrong in the first place. This seems to be a result of 00c6e91b6 ("License report: unify all license lists"). This commit seems to replace all occurrences of ", " with " AND ", not considering dual-licensing at all. Regards, Bastian -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de