From af74f962282c0bf8edd0cebeb2e69865f66b06ea Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 29 Dec 2014 10:57:49 +0100 Subject: meta-efl: use MIT & BSD license * add & operator Signed-off-by: Martin Jansa --- meta-efl/classes/efl.bbclass | 2 +- meta-efl/recipes-efl/e17/e-wm-theme-b-and-w_svn.bb | 2 +- meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb | 2 +- meta-efl/recipes-efl/e17/e-wm.inc | 2 +- meta-efl/recipes-efl/e17/ephoto_svn.bb | 2 +- meta-efl/recipes-efl/e17/exquisite-theme-illume.bb | 2 +- meta-efl/recipes-efl/e17/exquisite_svn.bb | 2 +- meta-efl/recipes-efl/e17/illume-keyboards-shr_git.bb | 2 +- meta-efl/recipes-efl/e17/nonworking/emprint_svn.bb | 2 +- meta-efl/recipes-efl/e17/nonworking/rage_svn.bb | 2 +- meta-efl/recipes-efl/e17/terminology.inc | 2 +- meta-efl/recipes-efl/efl/e-wm-illume-dict-pl_git.bb | 2 +- meta-efl/recipes-efl/efl/edb_svn.bb | 2 +- meta-efl/recipes-efl/efl/edbus.inc | 2 +- meta-efl/recipes-efl/efl/efl.inc | 2 +- meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb | 2 +- meta-efl/recipes-efl/efl/expedite.inc | 2 +- meta-efl/recipes-efl/efl/imlib2_git.bb | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta-efl/classes/efl.bbclass b/meta-efl/classes/efl.bbclass index fb96ef0362..eb40e4bc3e 100644 --- a/meta-efl/classes/efl.bbclass +++ b/meta-efl/classes/efl.bbclass @@ -1,5 +1,5 @@ SECTION = "e/libs" -LICENSE = "MIT BSD" +LICENSE = "MIT & BSD" DEPENDS += "pkgconfig-native" # revision 0d93ec84b30bc1bee2caaee72d667f87bc468a70 made SRCDATE and hence PV go backwards, so we need to up PE to unbreak builds and feeds :( diff --git a/meta-efl/recipes-efl/e17/e-wm-theme-b-and-w_svn.bb b/meta-efl/recipes-efl/e17/e-wm-theme-b-and-w_svn.bb index af32a355a4..ae1b8a6c69 100644 --- a/meta-efl/recipes-efl/e17/e-wm-theme-b-and-w_svn.bb +++ b/meta-efl/recipes-efl/e17/e-wm-theme-b-and-w_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "b-and-w theme was default E17 theme before alpha3 and some people SECTION = "e/utils" DEPENDS = "edje-native" RDEPENDS_${PN} = "e-wm" -LICENSE = "MIT BSD" +LICENSE = "MIT & BSD" # upstream was asked to include license infor in THEME dir LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" diff --git a/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb b/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb index 1bf5f1de09..965e4e995a 100644 --- a/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb +++ b/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb @@ -9,7 +9,7 @@ HOMEPAGE = "http://trac.enlightenment.org/e/wiki/Themes#Efenniht" DEPENDS = "edje-native" RDEPENDS_${PN} = "e-wm" RSUGGESTS_${PN} = "elementary-theme-efenniht" -LICENSE = "MIT BSD" +LICENSE = "MIT & BSD" LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=f523ab5986cc79b52a90d2ac3d5454a2" SRCREV = "${EFL_SRCREV}" diff --git a/meta-efl/recipes-efl/e17/e-wm.inc b/meta-efl/recipes-efl/e17/e-wm.inc index 0ff26ef9cd..5e3f2939f6 100644 --- a/meta-efl/recipes-efl/e17/e-wm.inc +++ b/meta-efl/recipes-efl/e17/e-wm.inc @@ -1,6 +1,6 @@ DESCRIPTION = "The Enlightenment Window Manager Version 17" DEPENDS = "eet evas eina ecore edje efreet edbus eeze eio elementary libxcb xcb-util-keysyms" -LICENSE = "MIT BSD" +LICENSE = "MIT & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=76de290eb3fdda12121830191c152a7d" SRCNAME = "e" diff --git a/meta-efl/recipes-efl/e17/ephoto_svn.bb b/meta-efl/recipes-efl/e17/ephoto_svn.bb index 3255ab835c..5cecda5889 100644 --- a/meta-efl/recipes-efl/e17/ephoto_svn.bb +++ b/meta-efl/recipes-efl/e17/ephoto_svn.bb @@ -1,4 +1,4 @@ -LICENSE = "MIT GPL-3.0" +LICENSE = "MIT & GPL-3.0" PV = "0.1.0+svnr${SRCREV}" PR = "${INC_PR}.0" diff --git a/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb b/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb index 5948e20731..aad0646477 100644 --- a/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb +++ b/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb @@ -1,5 +1,5 @@ DDESCRIPTION = "A theme for exquisite" -LICENSE = "MIT BSD" +LICENSE = "MIT & BSD" LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=f523ab5986cc79b52a90d2ac3d5454a2" SECTION = "x11" DEPENDS = "edje-native" diff --git a/meta-efl/recipes-efl/e17/exquisite_svn.bb b/meta-efl/recipes-efl/e17/exquisite_svn.bb index dc46a94abd..8f2d25d7d6 100644 --- a/meta-efl/recipes-efl/e17/exquisite_svn.bb +++ b/meta-efl/recipes-efl/e17/exquisite_svn.bb @@ -1,5 +1,5 @@ SUMMARY = "A psplash replacement for display" -LICENSE = "MIT BSD" +LICENSE = "MIT & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=14defa372a91118e755133bc8e6aff83" DEPENDS = "eet evas ecore embryo edje" PV = "0.0.1+svnr${SRCPV}" diff --git a/meta-efl/recipes-efl/e17/illume-keyboards-shr_git.bb b/meta-efl/recipes-efl/e17/illume-keyboards-shr_git.bb index 55f3282b7b..6f81b6b07a 100644 --- a/meta-efl/recipes-efl/e17/illume-keyboards-shr_git.bb +++ b/meta-efl/recipes-efl/e17/illume-keyboards-shr_git.bb @@ -9,7 +9,7 @@ SRCREV = "4064489f359a1addf572089b582f317dff5f50e1" PV = "0.0+gitr${SRCPV}" PE = "1" PR = "r5" -LICENSE = "MIT BSD" +LICENSE = "MIT & BSD" LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=f523ab5986cc79b52a90d2ac3d5454a2" PACKAGES = "\ diff --git a/meta-efl/recipes-efl/e17/nonworking/emprint_svn.bb b/meta-efl/recipes-efl/e17/nonworking/emprint_svn.bb index 777e30218d..6c2abdc5ba 100644 --- a/meta-efl/recipes-efl/e17/nonworking/emprint_svn.bb +++ b/meta-efl/recipes-efl/e17/nonworking/emprint_svn.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Emprint is a utility for taking screenshots of the entire screen, a specific window, or a specific region." -LICENSE = "MIT BSD" +LICENSE = "MIT & BSD" DEPENDS = "imlib2 virtual/libx11 ecore evas edje eina" PV = "0.0.1+svnr${SRCPV}" LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" diff --git a/meta-efl/recipes-efl/e17/nonworking/rage_svn.bb b/meta-efl/recipes-efl/e17/nonworking/rage_svn.bb index 3cf576f08f..da51ae6c43 100644 --- a/meta-efl/recipes-efl/e17/nonworking/rage_svn.bb +++ b/meta-efl/recipes-efl/e17/nonworking/rage_svn.bb @@ -1,7 +1,7 @@ SUMMARY = "Rage is a media center application based on EFL" AUTHOR = "Carsten 'The Rasterman' Haitzler" HOMEPAGE = "http://www.rasterman.com" -LICENSE = "MIT BSD" +LICENSE = "MIT & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" DEPENDS = "emotion evas ecore edje" SECTION = "x11/multimedia" diff --git a/meta-efl/recipes-efl/e17/terminology.inc b/meta-efl/recipes-efl/e17/terminology.inc index 9dd2264d53..bec2c0a547 100644 --- a/meta-efl/recipes-efl/e17/terminology.inc +++ b/meta-efl/recipes-efl/e17/terminology.inc @@ -1,5 +1,5 @@ DESCRIPTION = "Enlightenment Terminal Emulator" -LICENSE = "MIT BSD" +LICENSE = "MIT & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=9a8682b561bdfa219d59483a679ed80a" DEPENDS = "evas ecore edje elementary eina eet emotion" diff --git a/meta-efl/recipes-efl/efl/e-wm-illume-dict-pl_git.bb b/meta-efl/recipes-efl/efl/e-wm-illume-dict-pl_git.bb index 17f668b98f..657adcd92c 100644 --- a/meta-efl/recipes-efl/efl/e-wm-illume-dict-pl_git.bb +++ b/meta-efl/recipes-efl/efl/e-wm-illume-dict-pl_git.bb @@ -3,7 +3,7 @@ SECTION = "x11/data" SRCREV = "38fdd9bb0d8296e984bb6443466801eea6f62f00" PV = "1.0+gitr${SRCPV}" PE = "1" -LICENSE = "MIT BSD" +LICENSE = "MIT & BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=f523ab5986cc79b52a90d2ac3d5454a2" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/meta-efl/recipes-efl/efl/edb_svn.bb b/meta-efl/recipes-efl/efl/edb_svn.bb index a895cb31bf..7c6abdaf04 100644 --- a/meta-efl/recipes-efl/efl/edb_svn.bb +++ b/meta-efl/recipes-efl/efl/edb_svn.bb @@ -1,5 +1,5 @@ SUMMARY = "Edb is the Enlightenment database library" -LICENSE = "MIT BSD" +LICENSE = "MIT & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=d8a7c08df3bc3280208b959be7215c25 \ file://COPYING-PLAIN;md5=f59cacc08235a546b0c34a5422133035" diff --git a/meta-efl/recipes-efl/efl/edbus.inc b/meta-efl/recipes-efl/efl/edbus.inc index 7b11af54bb..03d0ee58d9 100644 --- a/meta-efl/recipes-efl/efl/edbus.inc +++ b/meta-efl/recipes-efl/efl/edbus.inc @@ -1,6 +1,6 @@ DESCRIPTION = "DBus and HAL convenience wrappers for EFL" DEPENDS = "dbus ecore eina" -LICENSE = "MIT BSD" +LICENSE = "MIT & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=550b8cea13dacc4bf00508a8cce1074c" inherit efl diff --git a/meta-efl/recipes-efl/efl/efl.inc b/meta-efl/recipes-efl/efl/efl.inc index 05fe1bdc7b..d870fdbd49 100644 --- a/meta-efl/recipes-efl/efl/efl.inc +++ b/meta-efl/recipes-efl/efl/efl.inc @@ -1,5 +1,5 @@ SUMMARY = "EFL" -LICENSE = "MIT BSD LGPL-2.1" +LICENSE = "MIT & BSD & LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=a1809a807e39dd48ddcf7be98477d130" DEPENDS_class-native = "freetype-native libxext-native libpng-native jpeg-native tiff-native libfribidi-native glib-2.0-native dbus-native" diff --git a/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb b/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb index fa635c0d81..494e743f58 100644 --- a/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb +++ b/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb @@ -8,7 +8,7 @@ SECTION = "e/utils" HOMEPAGE = "http://trac.enlightenment.org/e/wiki/Themes#Efenniht" DEPENDS = "edje-native" RSUGGESTS_${PN} = "e-wm-theme-illume-efenniht" -LICENSE = "MIT BSD" +LICENSE = "MIT & BSD" LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=f523ab5986cc79b52a90d2ac3d5454a2" SRCREV_THM_REV ?= "${EFL_SRCREV}" diff --git a/meta-efl/recipes-efl/efl/expedite.inc b/meta-efl/recipes-efl/efl/expedite.inc index 30ba063069..60e85974cb 100644 --- a/meta-efl/recipes-efl/efl/expedite.inc +++ b/meta-efl/recipes-efl/efl/expedite.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas" DEPENDS = "eet evas libsdl" -LICENSE = "MIT BSD" +LICENSE = "MIT & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=d70bc65d46237e4ef386beebe7d0fe5b" INC_PR = "r0" diff --git a/meta-efl/recipes-efl/efl/imlib2_git.bb b/meta-efl/recipes-efl/efl/imlib2_git.bb index 8c6ac66192..355b3341f6 100644 --- a/meta-efl/recipes-efl/efl/imlib2_git.bb +++ b/meta-efl/recipes-efl/efl/imlib2_git.bb @@ -1,5 +1,5 @@ SUMMARY = "A graphic library for file loading, saving, rendering, and manipulation" -LICENSE = "MIT BSD" +LICENSE = "MIT & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" DEPENDS = "freetype libpng jpeg virtual/libx11 libxext" -- cgit 1.2.3-korg