licenses: rename NOKIA-TPLA-2.4 to DIGIA-TPLA-2.4

PATCH In review Jonathan Liu 3 participants 7 messages Mar 15, 2014

lore

Share & tools

lore

Jonathan Liu

author

2014-03-15 14:49 UTC #0 lore raw

PATCH 1/1 licenses: rename NOKIA-TPLA-2.4 to DIGIA-TPLA-2.4

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%)

licenses/DIGIA-TPLA-2.4 renamed from licenses/NOKIA-TPLA-2.4 +0 -0

similarity index 100%
rename from licenses/NOKIA-TPLA-2.4
rename to licenses/DIGIA-TPLA-2.4

recipes-qt/qt5/qt3d.inc +1 -1

index 78b9ecc..74c4cad 100644
@@ -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 \

Signature · 1 line

1.9.0

Khem Raj

2014-03-15 15:04 UTC #1 lore raw

Quoted 22 lines · Jonathan Liu

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%)
licenses/DIGIA-TPLA-2.4 renamed from licenses/NOKIA-TPLA-2.4 +0 -0
similarity index 100%
rename from licenses/NOKIA-TPLA-2.4
rename to licenses/DIGIA-TPLA-2.4
recipes-qt/qt5/qt3d.inc +0 -0
index 78b9ecc..74c4cad 100644
@@ -2,7 +2,7 @@ require qt5.inc
 
DEPENDS += "qtdeclarative"

recipes-qt/qt5/qt3d.inc

Quoted 2 lines

recipes-qt/qt5/qt3d.inc +1 -1

-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

Quoted 11 lines

LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
                    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
                    file://LICENSE.PREVIEW.COMMERCIAL;md5=9d94dadfab8b246782ffea02082ee13a \

Signature · 7 lines

1.9.0

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Martin Jansa

2014-03-15 15:19 UTC #2 lore raw

Quoted 23 lines · Khem Raj

Quoted 20 lines · Jonathan Liu
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%)
licenses/DIGIA-TPLA-2.4 renamed from licenses/NOKIA-TPLA-2.4 +0 -0
similarity index 100%
rename from licenses/NOKIA-TPLA-2.4
rename to licenses/DIGIA-TPLA-2.4
recipes-qt/qt5/qt3d.inc +0 -0
index 78b9ecc..74c4cad 100644
@@ -2,7 +2,7 @@ require qt5.inc
 

Quoted 6 lines

recipes-qt/qt5/qt3d.inc
Quoted 4 lines
DEPENDS += "qtdeclarative"
recipes-qt/qt5/qt3d.inc +1 -1
-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.

Quoted 20 lines

Quoted 11 lines

LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
                    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
                    file://LICENSE.PREVIEW.COMMERCIAL;md5=9d94dadfab8b246782ffea02082ee13a \

Signature · 7 lines

1.9.0

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Signature · 4 lines

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Khem Raj

2014-03-15 15:22 UTC #3 lore raw

Quoted 31 lines · Martin Jansa

Quoted 23 lines · Khem Raj
Quoted 20 lines · Jonathan Liu
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%)
licenses/DIGIA-TPLA-2.4 renamed from licenses/NOKIA-TPLA-2.4 +0 -0
similarity index 100%
rename from licenses/NOKIA-TPLA-2.4
rename to licenses/DIGIA-TPLA-2.4
recipes-qt/qt5/qt3d.inc +0 -0
index 78b9ecc..74c4cad 100644
@@ -2,7 +2,7 @@ require qt5.inc
 
Quoted 6 lines
recipes-qt/qt5/qt3d.inc
Quoted 4 lines
DEPENDS += "qtdeclarative"
recipes-qt/qt5/qt3d.inc +1 -1
-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

Quoted 8 lines

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

Martin Jansa

2014-03-15 15:27 UTC #4 lore raw

Quoted 39 lines · Khem Raj

Quoted 36 lines · Martin Jansa
Quoted 23 lines · Khem Raj
Quoted 20 lines · Jonathan Liu
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%)
licenses/DIGIA-TPLA-2.4 renamed from licenses/NOKIA-TPLA-2.4 +0 -0
similarity index 100%
rename from licenses/NOKIA-TPLA-2.4
rename to licenses/DIGIA-TPLA-2.4
recipes-qt/qt5/qt3d.inc +0 -0
index 78b9ecc..74c4cad 100644
@@ -2,7 +2,7 @@ require qt5.inc
 
Quoted 6 lines
recipes-qt/qt5/qt3d.inc
Quoted 4 lines
DEPENDS += "qtdeclarative"
recipes-qt/qt5/qt3d.inc +1 -1
-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

Quoted 6 lines

Quoted 3 lines
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.

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Khem Raj

2014-03-15 15:56 UTC #5 lore raw

Quoted 47 lines · Martin Jansa

Quoted 39 lines · Khem Raj
Quoted 36 lines · Martin Jansa
Quoted 23 lines · Khem Raj
Quoted 20 lines · Jonathan Liu
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%)
licenses/DIGIA-TPLA-2.4 renamed from licenses/NOKIA-TPLA-2.4 +0 -0
similarity index 100%
rename from licenses/NOKIA-TPLA-2.4
rename to licenses/DIGIA-TPLA-2.4
recipes-qt/qt5/qt3d.inc +0 -0
index 78b9ecc..74c4cad 100644
@@ -2,7 +2,7 @@ require qt5.inc
 
Quoted 6 lines
recipes-qt/qt5/qt3d.inc
Quoted 4 lines
DEPENDS += "qtdeclarative"
recipes-qt/qt5/qt3d.inc +1 -1
-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
Quoted 6 lines
Quoted 3 lines
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

Quoted 7 lines

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

Quoted 10 lines

--
Martin 'JaMa' Jansa jabber: [email protected]
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Martin Jansa

2014-03-15 18:02 UTC #6 lore raw

Quoted 52 lines · Khem Raj

Quoted 51 lines · Martin Jansa
Quoted 39 lines · Khem Raj
Quoted 36 lines · Martin Jansa
Quoted 23 lines · Khem Raj
Quoted 20 lines · Jonathan Liu
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%)
licenses/DIGIA-TPLA-2.4 renamed from licenses/NOKIA-TPLA-2.4 +0 -0
similarity index 100%
rename from licenses/NOKIA-TPLA-2.4
rename to licenses/DIGIA-TPLA-2.4
recipes-qt/qt5/qt3d.inc +0 -0
index 78b9ecc..74c4cad 100644
@@ -2,7 +2,7 @@ require qt5.inc
 
Quoted 6 lines
recipes-qt/qt5/qt3d.inc
Quoted 4 lines
DEPENDS += "qtdeclarative"
recipes-qt/qt5/qt3d.inc +1 -1
-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
Quoted 6 lines
Quoted 3 lines
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

Quoted 5 lines

Quoted 3 lines
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.

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]