From 62e3f0ff7b27d8beb21b4b226051c3db654ea4e4 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. (From OE-Core rev: 4786ecdf7cd427089464dcb62579110d494e7cd7) Signed-off-by: Beth Flanagan Signed-off-by: Richard Purdie --- meta/recipes-graphics/cairo/cairo.inc | 2 +- meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb | 2 +- meta/recipes-graphics/fstests/fstests_svn.bb | 2 +- meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb | 2 +- meta/recipes-graphics/xorg-font/encodings_1.0.4.bb | 2 +- meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb | 2 +- meta/recipes-graphics/xorg-lib/libxpm_3.5.9.bb | 2 +- meta/recipes-graphics/xorg-lib/pixman_0.20.2.bb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index 9237fadaf3..c388b566ef 100644 --- a/meta/recipes-graphics/cairo/cairo.inc +++ b/meta/recipes-graphics/cairo/cairo.inc @@ -10,7 +10,7 @@ HOMEPAGE = "http://cairographics.org" BUGTRACKER = "http://bugs.freedesktop.org" SECTION = "libs" PRIORITY = "optional" -LICENSE = "MPLv1.1 & LGPLv2.1" +LICENSE = "MPL-1 & LGPLv2.1" DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender pixman glib-2.0" #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb index 3cdfc04076..ae0fef5203 100644 --- a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb +++ b/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb @@ -11,7 +11,7 @@ rasterize fonts." HOMEPAGE = "http://www.fontconfig.org" BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig" -LICENSE = "MIT-style & MIT & Public Domain" +LICENSE = "MIT-style & MIT & PD" LIC_FILES_CHKSUM = "file://COPYING;md5=f3ad4145dea6ca7efa2f1bee8165a7a1 \ file://src/fcfreetype.c;endline=45;md5=bc3dd139e2f7245a02fde5545b203a6f \ file://src/fccache.c;beginline=1020;endline=1035;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f" diff --git a/meta/recipes-graphics/fstests/fstests_svn.bb b/meta/recipes-graphics/fstests/fstests_svn.bb index ef70eb3245..2ffdc35cc0 100644 --- a/meta/recipes-graphics/fstests/fstests_svn.bb +++ b/meta/recipes-graphics/fstests/fstests_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Various benchmarning tests for X" HOMEPAGE = "http://www.o-hand.com" SECTION = "devel" -LICENSE = "ZLIB" +LICENSE = "Zlib" DEPENDS = "pango libxext libxft virtual/libx11 gtk+" SRCREV = "426" diff --git a/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb b/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb index 9a1f5bb5e0..957350b8ed 100644 --- a/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb +++ b/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb @@ -6,7 +6,7 @@ serif faces for you: this loses hinting and distorts the faces slightly, \ but is visibly different than normal and bold, and reasonably pleasing." SECTION = "x11/fonts" PRIORITY = "optional" -LICENSE = "Bitstream Vera" +LICENSE = "Bitstream_Vera" LIC_FILES_CHKSUM = "file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be" PACKAGE_ARCH = "all" PR = "r3" diff --git a/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb b/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb index 897f0fa118..04d7c73956 100644 --- a/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb +++ b/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb @@ -4,7 +4,7 @@ DESCRIPTION = "The encodings that map to specific characters for a \ number of Xorg and common fonts." require xorg-font-common.inc -LICENSE = "Public Domain" +LICENSE = "PD" LIC_FILES_CHKSUM = "file://COPYING;md5=9da93f2daf2d5572faa2bfaf0dbd9e76" PE = "1" PR = "${INC_PR}.0" diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb index 86d61944bc..f1e8648e08 100644 --- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb @@ -5,7 +5,7 @@ BUGTRACKER = "n/a" SECTION = "x11/fonts" -LICENSE = "Public Domain" +LICENSE = "PD" LIC_FILES_CHKSUM = "file://../misc/fonts.alias;md5=bbe8d3c0e4e74af96e3ac393985c4fbb \ file://../misc/fonts.dir;md5=82a143d94d6a974aafe97132d2d519ab \ file://../misc/cursor.pcf.gz;md5=40bc81001fef4c21ca08df4305014a2a" diff --git a/meta/recipes-graphics/xorg-lib/libxpm_3.5.9.bb b/meta/recipes-graphics/xorg-lib/libxpm_3.5.9.bb index a4b3c0dd3e..5d4297e3f8 100644 --- a/meta/recipes-graphics/xorg-lib/libxpm_3.5.9.bb +++ b/meta/recipes-graphics/xorg-lib/libxpm_3.5.9.bb @@ -7,7 +7,7 @@ pixmap format, which is commonly used in legacy X applications. XPM is \ an extension of the monochrome XBM bitmap specificied in the X \ protocol." -LICENSE = "X-BSD" +LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=3e07763d16963c3af12db271a31abaa5" DEPENDS += "libxext libsm libxt" PR = "r3" diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.20.2.bb b/meta/recipes-graphics/xorg-lib/pixman_0.20.2.bb index 9a97c3d603..00a58bf546 100644 --- a/meta/recipes-graphics/xorg-lib/pixman_0.20.2.bb +++ b/meta/recipes-graphics/xorg-lib/pixman_0.20.2.bb @@ -7,7 +7,7 @@ including trapezoids, triangles, and rectangles." require xorg-lib-common.inc -LICENSE = "MIT & MIT-style & Public Domain" +LICENSE = "MIT & MIT-style & PD" LIC_FILES_CHKSUM = "file://COPYING;md5=fea989a44fb012b5e79584972a863d22 \ file://pixman/pixman-matrix.c;endline=25;md5=ba6e8769bfaaee2c41698755af04c4be \ file://pixman/pixman-arm-neon-asm.h;endline=24;md5=9a9cc1e51abbf1da58f4d9528ec9d49b \ -- cgit v1.2.3-54-g00ecf