From: spdawson at gmail.com <spdawson@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2] package: standardise Apache licenses
Date: Thu, 2 Jan 2014 13:01:48 +0000 [thread overview]
Message-ID: <1388667708-6240-1-git-send-email-spdawson@gmail.com> (raw)
From: Simon Dawson <spdawson@gmail.com>
Apache licenses are referred to in a variety of ways; standardise these,
choosing a form which does not contain whitespace.
Signed-off-by: Simon Dawson <spdawson@gmail.com>
---
v2: Update license list in manual, suggested by Thomas De Schampheleire
docs/manual/legal-notice.txt | 3 +++
package/freerdp/freerdp.mk | 2 +-
package/imagemagick/imagemagick.mk | 2 +-
package/ne10/ne10.mk | 2 +-
package/python-msgpack/python-msgpack.mk | 2 +-
package/python-pyzmq/python-pyzmq.mk | 2 +-
package/python-tornado/python-tornado.mk | 2 +-
package/subversion/subversion.mk | 2 +-
package/thrift/thrift.mk | 2 +-
package/zxing/zxing.mk | 2 +-
10 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/docs/manual/legal-notice.txt b/docs/manual/legal-notice.txt
index 574c1d8..f79a578 100644
--- a/docs/manual/legal-notice.txt
+++ b/docs/manual/legal-notice.txt
@@ -122,6 +122,9 @@ Buildroot, with the name used in the manifest files:
* `BSD-3c`: BSD 3-clause license;
* `BSD-2c`: BSD 2-clause license;
* `MIT`: MIT-style license.
+* `Apache-2.0`:
+ http://apache.org/licenses/LICENSE-2.0.html[
+ Apache License, version 2.0];
Complying with the Buildroot license
------------------------------------
diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk
index 3ac53aa..e92067c 100644
--- a/package/freerdp/freerdp.mk
+++ b/package/freerdp/freerdp.mk
@@ -8,7 +8,7 @@ FREERDP_VERSION = 1.0.1
FREERDP_SITE = https://github.com/downloads/FreeRDP/FreeRDP
FREERDP_DEPENDENCIES = openssl zlib \
xlib_libX11 xlib_libXt xlib_libXext xlib_libXcursor
-FREERDP_LICENSE = Apache 2.0
+FREERDP_LICENSE = Apache-2.0
FREEDRP_LICENSE_FILES = LICENSE
ifeq ($(BR2_PACKAGE_CUPS),y)
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index ef9c1c0..cf02174 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -10,7 +10,7 @@ IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz
# available, which is annoying. Use an alternate site that keeps all
# older versions.
IMAGEMAGICK_SITE = ftp://ftp.nluug.nl/pub/ImageMagick/
-IMAGEMAGICK_LICENSE = Apache-v2
+IMAGEMAGICK_LICENSE = Apache-2.0
IMAGEMAGICK_LICENSE_FILES = LICENSE
IMAGEMAGICK_INSTALL_STAGING = YES
diff --git a/package/ne10/ne10.mk b/package/ne10/ne10.mk
index bb5259f..79b53b8 100644
--- a/package/ne10/ne10.mk
+++ b/package/ne10/ne10.mk
@@ -8,7 +8,7 @@
# one year old.
NE10_VERSION = 88c18f02199947b2c8b57796f5a3ca53160aff96
NE10_SITE = http://github.com/projectNe10/Ne10/tarball/$(NE10_VERSION)
-NE10_LICENSE = BSD-3c or Apache 2.0
+NE10_LICENSE = BSD-3c or Apache-2.0
NE10_LICENSE_FILES = doc/LICENSE
ifeq ($(BR2_PREFER_STATIC_LIB),)
diff --git a/package/python-msgpack/python-msgpack.mk b/package/python-msgpack/python-msgpack.mk
index 2a7c384..725a29d 100644
--- a/package/python-msgpack/python-msgpack.mk
+++ b/package/python-msgpack/python-msgpack.mk
@@ -7,7 +7,7 @@
PYTHON_MSGPACK_VERSION = 0.4.0
PYTHON_MSGPACK_SOURCE = msgpack-python-$(PYTHON_MSGPACK_VERSION).tar.gz
PYTHON_MSGPACK_SITE = https://pypi.python.org/packages/source/m/msgpack-python/
-PYTHON_MSGPACK_LICENSE = Apache License, Version 2.0
+PYTHON_MSGPACK_LICENSE = Apache-2.0
PYTHON_MSGPACK_LICENSE_FILES = COPYING
PYTHON_MSGPACK_SETUP_TYPE = setuptools
PYTHON_MSGPACK_DEPENDENCIES = msgpack
diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk
index b3a8f9d..b792ee9 100644
--- a/package/python-pyzmq/python-pyzmq.mk
+++ b/package/python-pyzmq/python-pyzmq.mk
@@ -7,7 +7,7 @@
PYTHON_PYZMQ_VERSION = 13.1.0
PYTHON_PYZMQ_SOURCE = pyzmq-$(PYTHON_PYZMQ_VERSION).tar.gz
PYTHON_PYZMQ_SITE = http://pypi.python.org/packages/source/p/pyzmq/
-PYTHON_PYZMQ_LICENSE = LGPLv3+ BSD-3c Apache License Version 2.0
+PYTHON_PYZMQ_LICENSE = LGPLv3+ BSD-3c Apache-2.0
# Apache license only online: http://www.apache.org/licenses/LICENSE-2.0
PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD
PYTHON_PYZMQ_DEPENDENCIES = zeromq
diff --git a/package/python-tornado/python-tornado.mk b/package/python-tornado/python-tornado.mk
index 781ec03..bac3ce7 100644
--- a/package/python-tornado/python-tornado.mk
+++ b/package/python-tornado/python-tornado.mk
@@ -7,7 +7,7 @@
PYTHON_TORNADO_VERSION = 3.1.1
PYTHON_TORNADO_SOURCE = tornado-$(PYTHON_TORNADO_VERSION).tar.gz
PYTHON_TORNADO_SITE = https://pypi.python.org/packages/source/t/tornado
-PYTHON_TORNADO_LICENSE = Apache-v2
+PYTHON_TORNADO_LICENSE = Apache-2.0
PYTHON_TORNADO_SETUP_TYPE = setuptools
$(eval $(python-package))
diff --git a/package/subversion/subversion.mk b/package/subversion/subversion.mk
index 6eb3218..d7a4b42 100644
--- a/package/subversion/subversion.mk
+++ b/package/subversion/subversion.mk
@@ -6,7 +6,7 @@
SUBVERSION_VERSION = 1.7.14
SUBVERSION_SITE = http://archive.apache.org/dist/subversion
-SUBVERSION_LICENSE = Apache 2.0
+SUBVERSION_LICENSE = Apache-2.0
SUBVERSION_LICENSE_FILES = LICENSE
SUBVERSION_DEPENDENCIES = apr apr-util expat neon zlib
diff --git a/package/thrift/thrift.mk b/package/thrift/thrift.mk
index 8af9643..d61cc3a 100644
--- a/package/thrift/thrift.mk
+++ b/package/thrift/thrift.mk
@@ -14,7 +14,7 @@ THRIFT_CONF_OPT = --with-sysroot=$(STAGING_DIR) --with-tests=no \
--with-boost=$(STAGING_DIR)
HOST_THRIFT_CONF_OPT = --with-sysroot=$(HOST_DIR) --with-tests=no
THRIFT_AUTORECONF = YES
-THRIFT_LICENSE = Apache 2.0
+THRIFT_LICENSE = Apache-2.0
THRIFT_LICENSE_FILES = LICENSE
ifeq ($(BR2_PREFER_STATIC_LIB),y)
diff --git a/package/zxing/zxing.mk b/package/zxing/zxing.mk
index f58be08..367a84f 100644
--- a/package/zxing/zxing.mk
+++ b/package/zxing/zxing.mk
@@ -7,7 +7,7 @@
ZXING_VERSION = 2.3.0
ZXING_SITE = http://zxing.googlecode.com/files
ZXING_SOURCE = ZXing-$(ZXING_VERSION).zip
-ZXING_LICENSE = Apache v2.0
+ZXING_LICENSE = Apache-2.0
ZXING_LICENSE_FILES = COPYING
ZXING_INSTALL_STAGING = YES
--
1.8.3.2
next reply other threads:[~2014-01-02 13:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-02 13:01 spdawson at gmail.com [this message]
2014-01-02 14:12 ` [Buildroot] [PATCH v2] package: standardise Apache licenses Thomas Petazzoni
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=1388667708-6240-1-git-send-email-spdawson@gmail.com \
--to=spdawson@gmail.com \
--cc=buildroot@busybox.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.