aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Menzel <paulepanter@users.sourceforge.net>2011-10-07 10:26:19 +0200
committerPaul Menzel <paulepanter@users.sourceforge.net>2011-10-07 10:26:19 +0200
commit5116102dac06690e3f24afa0500eb0d68ec229ee (patch)
treec1c1a12638455d937d6b048486462c30c07bf679
parent071372aa5a2cdacd0f20efe5cfc0324c5ac8d38b (diff)
downloadopenembedded-5116102dac06690e3f24afa0500eb0d68ec229ee.tar.gz
openembedded-5116102dac06690e3f24afa0500eb0d68ec229ee.tar.bz2
openembedded-5116102dac06690e3f24afa0500eb0d68ec229ee.zip
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@users.sourceforge.net>
-rw-r--r--recipes/imagemagick/imagemagick_6.3.5-10.bb4
-rw-r--r--recipes/imagemagick/imagemagick_6.4.4-1.bb4
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 fdb496934d..3b581f1cec 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 78f738a82b..8ad3d359b5 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 \