[oe] [meta-qt5][PATCH] licenses: rename NOKIA-TPLA-2.4 to DIGIA-TPLA-2.4

[Martin Jansa]

On Sat, Mar 15, 2014 at 08:55:30AM -0700, Khem Raj wrote:
> On Sat, Mar 15, 2014 at 8:27 AM, Martin Jansa <martin.jansa at gmail.com> wrote:
> > On Sat, Mar 15, 2014 at 08:22:33AM -0700, Khem Raj wrote:
> >>
> >> On Mar 15, 2014, at 8:20 AM, Martin Jansa <martin.jansa at gmail.com> wrote:
> >>
> >> > On Sat, Mar 15, 2014 at 08:04:14AM -0700, Khem Raj wrote:
> >> >>
> >> >> On Mar 15, 2014, at 7:54 AM, Jonathan Liu <net147 at gmail.com> wrote:
> >> >>
> >> >>> The license agreement doesn't mention Nokia anymore after Qt was
> >> >>> acquired by Digia.
> >> >>>
> >> >>> Signed-off-by: Jonathan Liu <net147 at gmail.com>
> >> >>> ---
> >> >>> 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.
> >>
> >>
> >> I think call it QT-TPLA-2.4 and then the name becomes universal
> >
> > name yes, but still the text would be different in qt3d repo and our
> > text before this qt3d commit which changed it to digia:
> > https://qt.gitorious.org/qt/qt3d/commit/06eb6c1060743b7dbd61bfa9a169f2a1cd44af39#LICENSE.PREVIEW.COMMERCIAL
> >
> > alternatively we can keep both texts (remove my update of license text
> > from NOKIA-TPLA-2.4 and keep separate DIGIA-TPLA-2.4 and use the right
> > one based on SRCREV used in recipe.
> 
> yeh probably have 2 copied is better

Sorry for noise and confusion, I've double-checked and even old SRCREV
in meta-qt5/dylan already has this commit, so I've just merged the
rename to all branches.

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20140315/7f9a0bb2/attachment-0002.sig>