From 4786ecdf7cd427089464dcb62579110d494e7cd7 Mon Sep 17 00:00:00 2001 From: Beth Flanagan Date: Wed, 25 May 2011 14:05:02 -0700 Subject: License Field Cleanup: Non-standard field names I've cleaned up some odd license fields, fixed some license names and corrected some incorrect licenses. LICENSE really needs a pass through by the maintainers as some of the licensing is incorrect. Also, every license with Artistic should be gone through and noted as which version of Artistic. Signed-off-by: Beth Flanagan --- meta/recipes-core/dbus/dbus-glib.inc | 2 +- meta/recipes-core/dbus/dbus.inc | 2 +- meta/recipes-core/glib-2.0/glib.inc | 2 +- meta/recipes-core/zlib/zlib_1.2.5.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc index 22bf6274a..704dc04cd 100644 --- a/meta/recipes-core/dbus/dbus-glib.inc +++ b/meta/recipes-core/dbus/dbus-glib.inc @@ -2,7 +2,7 @@ SUMMARY = "High level language (GLib) binding for D-Bus" DESCRIPTION = "GLib bindings for the D-Bus message bus that integrate \ the D-Bus library with the GLib thread abstraction and main loop." HOMEPAGE = "http://www.freedesktop.org/Software/dbus" -LICENSE = "AFL2.1 | GPLv2+" +LICENSE = "AFL-2 | GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=cf5b3a2f7083750d504333114e738656 \ file://dbus/dbus-glib.h;firstline=7;endline=21;md5=833ef01806b4c524fb3678a16300536f" SECTION = "base" diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 38acf354f..22514e9e0 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -2,7 +2,7 @@ SUMMARY = "D-Bus message bus" DESCRIPTION = "D-Bus is a message bus system, a simple way for applications to talk to one another. In addition to interprocess communication, D-Bus helps coordinate process lifecycle; it makes it simple and reliable to code a \"single instance\" application or daemon, and to launch applications and daemons on demand when their services are needed." HOMEPAGE = "http://dbus.freedesktop.org" SECTION = "base" -LICENSE = "AFL2.1 | GPLv2+" +LICENSE = "AFL-2 | GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ file://dbus/dbus.h;firstline=6;endline=20;md5=6eea2e0c7750dd8e620dcb1437312fa5" DEPENDS = "expat virtual/libintl virtual/libx11 libsm" diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index f015fd3a9..0488490b8 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -2,7 +2,7 @@ SUMMARY = "A general-purpose utility library" DESCRIPTION = "GLib is a general-purpose utility library, which provides many useful data types, macros, type conversions, string utilities, file utilities, a main loop abstraction, and so on." # pcre is under BSD; # docs/reference/COPYING is with a 'public domai'-like license! -LICENSE = "LGPLv2+ & BSD & public domain" +LICENSE = "LGPLv2+ & BSD & PD" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://glib/glib.h;startline=4;endline=17;md5=a4332fe58b076f29d07c9c066d2967b6 \ file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ diff --git a/meta/recipes-core/zlib/zlib_1.2.5.bb b/meta/recipes-core/zlib/zlib_1.2.5.bb index c9f29ccd6..f7cfa407d 100644 --- a/meta/recipes-core/zlib/zlib_1.2.5.bb +++ b/meta/recipes-core/zlib/zlib_1.2.5.bb @@ -4,7 +4,7 @@ library which is used by many different programs." HOMEPAGE = "http://zlib.net/" SECTION = "libs" PRIORITY = "required" -LICENSE = "zlib" +LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=084e9c30e4e6272c3b057b13c6467f3d" DEPENDS = "libtool-cross" -- cgit v1.2.3