On Sat, Mar 15, 2014 at 08:04:14AM -0700, Khem Raj wrote: > > On Mar 15, 2014, at 7:54 AM, Jonathan Liu <[email protected]> wrote: > > > The license agreement doesn't mention Nokia anymore after Qt was > > acquired by Digia. > > > > Signed-off-by: Jonathan Liu <[email protected]> > > --- > > licenses/{NOKIA-TPLA-2.4 => DIGIA-TPLA-2.4} | 0 > > recipes-qt/qt5/qt3d.inc | 2 +- > > 2 files changed, 1 insertion(+), 1 deletion(-) > > rename licenses/{NOKIA-TPLA-2.4 => DIGIA-TPLA-2.4} (100%) > > > > diff --git a/licenses/NOKIA-TPLA-2.4 b/licenses/DIGIA-TPLA-2.4 > > similarity index 100% > > rename from licenses/NOKIA-TPLA-2.4 > > rename to licenses/DIGIA-TPLA-2.4 > > diff --git a/recipes-qt/qt5/qt3d.inc b/recipes-qt/qt5/qt3d.inc > > index 78b9ecc..74c4cad 100644 > > --- a/recipes-qt/qt5/qt3d.inc > > +++ b/recipes-qt/qt5/qt3d.inc > > @@ -2,7 +2,7 @@ require qt5.inc > > > > DEPENDS += "qtdeclarative" > > > > -LICENSE = "GFDL-1.3 & LGPL-2.1 & NOKIA-TPLA-2.4 | GPL-3.0" > > +LICENSE = "GFDL-1.3 & LGPL-2.1 & DIGIA-TPLA-2.4 | GPL-3.0” > > you need to rename the license file too
he did :) sorry it's my mistake, when I was updating license text from newer qt3d repo I haven't noticed nokia->digia change between whitespace changes should we use the same text for dylan,dora,master even when older qt3d revisions have older text? I think it would be better to have DIGIA-TPLA-2.4 everywhere. > > LIC_FILES_CHKSUM = > > "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ > > > > file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ > > > > file://LICENSE.PREVIEW.COMMERCIAL;md5=9d94dadfab8b246782ffea02082ee13a \ > > -- > > 1.9.0 > > > > -- > > _______________________________________________ > > Openembedded-devel mailing list > > [email protected] > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > -- > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
