From patchwork Thu Jan 2 13:01:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 306124 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 228CC2C00A2 for ; Fri, 3 Jan 2014 00:01:59 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 75A399420C; Thu, 2 Jan 2014 13:01:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id A2uElAQNCOMS; Thu, 2 Jan 2014 13:01:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id DBB43941FB; Thu, 2 Jan 2014 13:01:56 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 2E15F1BF878 for ; Thu, 2 Jan 2014 13:01:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 24A2E8D33E for ; Thu, 2 Jan 2014 13:01:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xIkQtz5LZNKK for ; Thu, 2 Jan 2014 13:01:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com [74.125.82.45]) by whitealder.osuosl.org (Postfix) with ESMTPS id C849E8BCCF for ; Thu, 2 Jan 2014 13:01:52 +0000 (UTC) Received: by mail-wg0-f45.google.com with SMTP id y10so12501752wgg.12 for ; Thu, 02 Jan 2014 05:01:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=dMvFCh+mpaDWIjYBf+EqGSvc8JJfy+vK/TaKese9wA4=; b=TGfmggVic/f8CoKhhbQTxur20czburYVXUwnNu/8LsDfYJllqYoxNH77sFe7CiMQs8 4SdGJTlH9F8p0l7Iw8Up8XsINtJ7WqYmULq6ZnZh5wd5uOlvNfCrzQkaRDlg4A/ntfYd h3INtT019CO2rAIP3x7mB3DeiuSCjyPv1iV1pTFxpH7hWIrw6ua5WUSjcy22Mmg2MsM/ 9u861+WaWYlV/udFdsNxX44yckN2OC42qciL6Ey1x+NzA/OExq+Ow1S5Llb72skeRZ14 IafTHWpGxAQtfeAS7YwvWbFvRDiB6ko7dSaefyouLodFZwvdoq/825E0N8xoDht3qJ8o cSwQ== X-Received: by 10.180.188.175 with SMTP id gb15mr54573893wic.50.1388667711224; Thu, 02 Jan 2014 05:01:51 -0800 (PST) Received: from localhost.localdomain (host109-150-80-255.range109-150.btcentralplus.com. [109.150.80.255]) by mx.google.com with ESMTPSA id v7sm64019439wix.5.2014.01.02.05.01.49 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 02 Jan 2014 05:01:50 -0800 (PST) From: spdawson@gmail.com To: buildroot@busybox.net Date: Thu, 2 Jan 2014 13:01:48 +0000 Message-Id: <1388667708-6240-1-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.8.3.2 Subject: [Buildroot] [PATCH v2] package: standardise Apache licenses X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Simon Dawson 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 --- 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