[oe-commits] Paul Menzel : imagemagick: Correct `LICENSE` to `Apache-2.0`

[git version control]

Module: openembedded.git
Branch: master
Commit: 5116102dac06690e3f24afa0500eb0d68ec229ee
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=5116102dac06690e3f24afa0500eb0d68ec229ee

Author: Paul Menzel <paulepanter at users.sourceforge.net>
Date:   Fri Oct  7 10:26:19 2011 +0200

imagemagick: Correct `LICENSE` to `Apache-2.0`

The web site says it is distributed under the Apache 2.0 license [1].

	It is distributed under the Apache 2.0 license, approved by the OSI and recommended for use by the OSSCC.It is distributed under the Apache 2.0 license, approved by the OSI and recommended for use by the OSSCC.

[1] http://www.imagemagick.org/script/index.php

Signed-off-by: Paul Menzel <paulepanter at users.sourceforge.net>

---

 recipes/imagemagick/imagemagick_6.3.5-10.bb |    4 ++--
 recipes/imagemagick/imagemagick_6.4.4-1.bb  |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes/imagemagick/imagemagick_6.3.5-10.bb b/recipes/imagemagick/imagemagick_6.3.5-10.bb
index fdb4969..3b581f1 100644
--- a/recipes/imagemagick/imagemagick_6.3.5-10.bb
+++ b/recipes/imagemagick/imagemagick_6.3.5-10.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "ImageMagick contains image manipulation and conversion tools"
 SECTION = "console/utils"
-LICENSE = "GPL"
+LICENSE = "Apache-2.0"
 DEPENDS = "tiff jpeg libpng librsvg tiff zlib"
-PR = "r10"
+PR = "r11"
 
 SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}.tar.bz2 \
            file://PerlMagic_MakePatch;apply=yes \
diff --git a/recipes/imagemagick/imagemagick_6.4.4-1.bb b/recipes/imagemagick/imagemagick_6.4.4-1.bb
index 78f738a..8ad3d35 100644
--- a/recipes/imagemagick/imagemagick_6.4.4-1.bb
+++ b/recipes/imagemagick/imagemagick_6.4.4-1.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "ImageMagick contains image manipulation and conversion tools"
 SECTION = "console/utils"
-LICENSE = "GPL"
+LICENSE = "Apache-2.0"
 # FIXME: There is much more checked libraries. All should be added or explicitly disabled to get consistent results.
 DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib"
 
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}.tar.bz2 \
            file://PerlMagic_MakePatch;apply=yes \