* [meta-qt5][PATCH] licenses: rename NOKIA-TPLA-2.4 to DIGIA-TPLA-2.4
@ 2014-03-15 14:54 Jonathan Liu
2014-03-15 15:04 ` Khem Raj
0 siblings, 1 reply; 7+ messages in thread
From: Jonathan Liu @ 2014-03-15 14:54 UTC (permalink / raw)
To: openembedded-devel
The license agreement doesn't mention Nokia anymore after Qt was
acquired by Digia.
Signed-off-by: Jonathan Liu <net147@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"
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
file://LICENSE.PREVIEW.COMMERCIAL;md5=9d94dadfab8b246782ffea02082ee13a \
--
1.9.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [meta-qt5][PATCH] licenses: rename NOKIA-TPLA-2.4 to DIGIA-TPLA-2.4 2014-03-15 14:54 [meta-qt5][PATCH] licenses: rename NOKIA-TPLA-2.4 to DIGIA-TPLA-2.4 Jonathan Liu @ 2014-03-15 15:04 ` Khem Raj 2014-03-15 15:20 ` Martin Jansa 0 siblings, 1 reply; 7+ messages in thread From: Khem Raj @ 2014-03-15 15:04 UTC (permalink / raw) To: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 1515 bytes --] On Mar 15, 2014, at 7:54 AM, Jonathan Liu <net147@gmail.com> wrote: > The license agreement doesn't mention Nokia anymore after Qt was > acquired by Digia. > > Signed-off-by: Jonathan Liu <net147@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 > 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 > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel [-- Attachment #2: Message signed with OpenPGP using GPGMail --] [-- Type: application/pgp-signature, Size: 211 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [meta-qt5][PATCH] licenses: rename NOKIA-TPLA-2.4 to DIGIA-TPLA-2.4 2014-03-15 15:04 ` Khem Raj @ 2014-03-15 15:20 ` Martin Jansa 2014-03-15 15:22 ` Khem Raj 0 siblings, 1 reply; 7+ messages in thread From: Martin Jansa @ 2014-03-15 15:20 UTC (permalink / raw) To: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 2260 bytes --] On Sat, Mar 15, 2014 at 08:04:14AM -0700, Khem Raj wrote: > > On Mar 15, 2014, at 7:54 AM, Jonathan Liu <net147@gmail.com> wrote: > > > The license agreement doesn't mention Nokia anymore after Qt was > > acquired by Digia. > > > > Signed-off-by: Jonathan Liu <net147@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. > > 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 > > Openembedded-devel@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [meta-qt5][PATCH] licenses: rename NOKIA-TPLA-2.4 to DIGIA-TPLA-2.4 2014-03-15 15:20 ` Martin Jansa @ 2014-03-15 15:22 ` Khem Raj 2014-03-15 15:27 ` Martin Jansa 0 siblings, 1 reply; 7+ messages in thread From: Khem Raj @ 2014-03-15 15:22 UTC (permalink / raw) To: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 1632 bytes --] On Mar 15, 2014, at 8:20 AM, Martin Jansa <martin.jansa@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@gmail.com> wrote: >> >>> The license agreement doesn't mention Nokia anymore after Qt was >>> acquired by Digia. >>> >>> Signed-off-by: Jonathan Liu <net147@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 [-- Attachment #2: Message signed with OpenPGP using GPGMail --] [-- Type: application/pgp-signature, Size: 211 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [meta-qt5][PATCH] licenses: rename NOKIA-TPLA-2.4 to DIGIA-TPLA-2.4 2014-03-15 15:22 ` Khem Raj @ 2014-03-15 15:27 ` Martin Jansa 2014-03-15 15:55 ` Khem Raj 0 siblings, 1 reply; 7+ messages in thread From: Martin Jansa @ 2014-03-15 15:27 UTC (permalink / raw) To: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 2267 bytes --] 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@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@gmail.com> wrote: > >> > >>> The license agreement doesn't mention Nokia anymore after Qt was > >>> acquired by Digia. > >>> > >>> Signed-off-by: Jonathan Liu <net147@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. -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [meta-qt5][PATCH] licenses: rename NOKIA-TPLA-2.4 to DIGIA-TPLA-2.4 2014-03-15 15:27 ` Martin Jansa @ 2014-03-15 15:55 ` Khem Raj 2014-03-15 18:03 ` Martin Jansa 0 siblings, 1 reply; 7+ messages in thread From: Khem Raj @ 2014-03-15 15:55 UTC (permalink / raw) To: openembeded-devel On Sat, Mar 15, 2014 at 8:27 AM, Martin Jansa <martin.jansa@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@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@gmail.com> wrote: >> >> >> >>> The license agreement doesn't mention Nokia anymore after Qt was >> >>> acquired by Digia. >> >>> >> >>> Signed-off-by: Jonathan Liu <net147@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 > > -- > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [meta-qt5][PATCH] licenses: rename NOKIA-TPLA-2.4 to DIGIA-TPLA-2.4 2014-03-15 15:55 ` Khem Raj @ 2014-03-15 18:03 ` Martin Jansa 0 siblings, 0 replies; 7+ messages in thread From: Martin Jansa @ 2014-03-15 18:03 UTC (permalink / raw) To: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 2773 bytes --] 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@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@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@gmail.com> wrote: > >> >> > >> >>> The license agreement doesn't mention Nokia anymore after Qt was > >> >>> acquired by Digia. > >> >>> > >> >>> Signed-off-by: Jonathan Liu <net147@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@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-03-15 18:02 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-03-15 14:54 [meta-qt5][PATCH] licenses: rename NOKIA-TPLA-2.4 to DIGIA-TPLA-2.4 Jonathan Liu 2014-03-15 15:04 ` Khem Raj 2014-03-15 15:20 ` Martin Jansa 2014-03-15 15:22 ` Khem Raj 2014-03-15 15:27 ` Martin Jansa 2014-03-15 15:55 ` Khem Raj 2014-03-15 18:03 ` Martin Jansa
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.