[Buildroot] [PATCH 1/2] package/qt5/qt5xmlpatterns: Fix license

[Buildroot] [PATCH 1/2] package/qt5/qt5xmlpatterns: Fix license

[Bernd Kuhls]

Fixes
http://autobuild.buildroot.net/results/853/85335cddd123cae5a5b99d715c179c26ed9d6009/
http://autobuild.buildroot.net/results/097/0970e3d663da687f9bcdf0136584eaa5629f4216/
http://autobuild.buildroot.net/results/c62/c62eef5e5b8add138cdab34e64103d974d0a510b/
http://autobuild.buildroot.net/results/8b2/8b22985cc4a3ed3ced5900931dc6ec3b4c2f36c6/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
index b69cac7..136da9f 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -11,8 +11,8 @@ QT5XMLPATTERNS_DEPENDENCIES = qt5base
 QT5XMLPATTERNS_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5XMLPATTERNS_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
-QT5XMLPATTERNS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2
+QT5XMLPATTERNS_LICENSE = LGPLv2.1 with exception or LGPLv3
+QT5XMLPATTERNS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
 else
 QT5XMLPATTERNS_LICENSE = Commercial license
 QT5XMLPATTERNS_REDISTRIBUTE = NO
-- 
1.7.10.4

[Buildroot] [PATCH 2/2] package/qt5/qt5multimedia: Fix license

[Bernd Kuhls]

Fixes
http://autobuild.buildroot.net/results/533/533c1d8529e2006379fb8eacb5ea1c23f240f724/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/qt5/qt5multimedia/qt5multimedia.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index 0c8d2ec..763fc28 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -11,8 +11,8 @@ QT5MULTIMEDIA_DEPENDENCIES = qt5base
 QT5MULTIMEDIA_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5MULTIMEDIA_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
-QT5MULTIMEDIA_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2
+QT5MULTIMEDIA_LICENSE = LGPLv2.1 with exception or LGPLv3
+QT5MULTIMEDIA_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
 else
 QT5MULTIMEDIA_LICENSE = Commercial license
 QT5MULTIMEDIA_REDISTRIBUTE = NO
-- 
1.7.10.4

[Buildroot] [PATCH 1/2] package/qt5/qt5xmlpatterns: Fix license

[Yann E. MORIN]

Bernd, All,

On 2015-04-10 18:53 +0200, Bernd Kuhls spake thusly:
> Fixes
> http://autobuild.buildroot.net/results/853/85335cddd123cae5a5b99d715c179c26ed9d6009/
> http://autobuild.buildroot.net/results/097/0970e3d663da687f9bcdf0136584eaa5629f4216/
> http://autobuild.buildroot.net/results/c62/c62eef5e5b8add138cdab34e64103d974d0a510b/
> http://autobuild.buildroot.net/results/8b2/8b22985cc4a3ed3ced5900931dc6ec3b4c2f36c6/
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Thomas has already sent a patch to fix those two legal-info issues:
    https://patchwork.ozlabs.org/patch/460020/

Since your two patches and his own are exactly the same, but his patch
has more context in the commit log, I'll mark your patches as Rejected
in Patchwork.

Nevertheless, thank you! :-)

Regards,
Yann E. MORIN.

> ---
>  package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
> index b69cac7..136da9f 100644
> --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
> +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
> @@ -11,8 +11,8 @@ QT5XMLPATTERNS_DEPENDENCIES = qt5base
>  QT5XMLPATTERNS_INSTALL_STAGING = YES
>  
>  ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
> -QT5XMLPATTERNS_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
> -QT5XMLPATTERNS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2
> +QT5XMLPATTERNS_LICENSE = LGPLv2.1 with exception or LGPLv3
> +QT5XMLPATTERNS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
>  else
>  QT5XMLPATTERNS_LICENSE = Commercial license
>  QT5XMLPATTERNS_REDISTRIBUTE = NO
> -- 
> 1.7.10.4
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'