mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Bastian Krause <bst@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Bastian Krause <bst@pengutronix.de>
Subject: [ptxdist] [PATCH v3] cairo: fix license identifier
Date: Fri, 30 Jul 2021 10:31:57 +0200	[thread overview]
Message-ID: <20210730083157.7588-1-bst@pengutronix.de> (raw)

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/)

While at it, pin down the copying files.

Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
Changes since (implicit) v1:
- add CAIRO_LICENSE_FILES pinning down COPYING

Changes since v2:
- add COPYING-LGPL-2.1 and COPYING-MPL-1.1 to CAIRO_LICENSE_FILES
---
 rules/cairo.make | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/rules/cairo.make b/rules/cairo.make
index cfaa74518..6d2f05272 100644
--- a/rules/cairo.make
+++ b/rules/cairo.make
@@ -21,7 +21,11 @@ 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
+CAIRO_LICENSE_FILES := \
+	file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77 \
+	file://COPYING-LGPL-2.1;md5=c9bb0ee6dbe833915b94063d594c4bfc \
+	file://COPYING-MPL-1.1;md5=bfe1f75d606912a4111c90743d6c7325
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


             reply	other threads:[~2021-07-30  8:32 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-30  8:31 Bastian Krause [this message]
2021-08-04  6:14 ` [ptxdist] [APPLIED] " Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210730083157.7588-1-bst@pengutronix.de \
    --to=bst@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox