[oe] [PATCH 2/2] recipes: drop '+' from LICENSE fields

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 10-05-11 09:39, Martin Jansa wrote:
> * '+' is valid folder name, so it does not break distribute_sources like & does,
>   but still tmp/deploy/sources/+ folder doesn't make sense at all
> * PR was bumped only when white-spaces were removed from LICENSE field causing
>   sources to be stored in different folder (classpathx recipes)
> 
> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

Acked-by: Koen Kooi <koen at dominion.thruhere.net>

> ---
>  recipes/classpathx/gnujaf_1.1.1.bb      |    4 ++--
>  recipes/classpathx/gnumail_1.1.2.bb     |    4 ++--
>  recipes/classpathx/inetlib_1.1.1.bb     |    4 ++--
>  recipes/gpe-themes/gpe-theme-e17_0.1.bb |    2 +-
>  recipes/hwdata/hwdata_0.191.bb          |    2 +-
>  recipes/sdr/soft66_git.bb               |    2 +-
>  recipes/tesseract/tesseract_1.0.bb      |    2 +-
>  7 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/recipes/classpathx/gnujaf_1.1.1.bb b/recipes/classpathx/gnujaf_1.1.1.bb
> index e0dfd24..94560ea 100644
> --- a/recipes/classpathx/gnujaf_1.1.1.bb
> +++ b/recipes/classpathx/gnujaf_1.1.1.bb
> @@ -1,5 +1,5 @@
>  DESCRIPTION = "Provides a mean to type data and locate components suitable for performing various kinds of action on it."
> -LICENSE = "GPL + library exception"
> +LICENSE = "GPL+libraryexception"
>  AUTHOR = "GNU ClasspathX"
>  
>  SRC_URI = "\
> @@ -12,7 +12,7 @@ inherit autotools java-library
>  
>  S = "${WORKDIR}/activation-${PV}"
>  
> -PR = "r1"
> +PR = "r2"
>  
>  export JAVAC = "javac"
>  
> diff --git a/recipes/classpathx/gnumail_1.1.2.bb b/recipes/classpathx/gnumail_1.1.2.bb
> index 3eab0f6..0c3afd8 100644
> --- a/recipes/classpathx/gnumail_1.1.2.bb
> +++ b/recipes/classpathx/gnumail_1.1.2.bb
> @@ -1,5 +1,5 @@
>  DESCRIPTION = "GNU's free implementation of the JavaMail API specification"
> -LICENSE = "GPL + library exception"
> +LICENSE = "GPL+libraryexception"
>  AUTHOR = "GNU ClasspathX"
>  
>  SRC_URI = "\
> @@ -14,7 +14,7 @@ S = "${WORKDIR}/mail-${PV}"
>  DEPENDS = "fastjar-native gnujaf inetlib"
>  DEPENDS_virtclass-native = "fastjar-native gnujaf-native inetlib-native"
>  
> -PR = "r1"
> +PR = "r2"
>  
>  export JAVAC = "${STAGING_BINDIR_NATIVE}/javac"
>  export JAVA = "${STAGING_BINDIR_NATIVE}/java"
> diff --git a/recipes/classpathx/inetlib_1.1.1.bb b/recipes/classpathx/inetlib_1.1.1.bb
> index 9377d6d..7d8e89d 100644
> --- a/recipes/classpathx/inetlib_1.1.1.bb
> +++ b/recipes/classpathx/inetlib_1.1.1.bb
> @@ -1,5 +1,5 @@
>  DESCRIPTION = "A Java library of clients for common internet protocols"
> -LICENSE = "GPL + library exception"
> +LICENSE = "GPL+libraryexception"
>  AUTHOR = "GNU Classpath"
>  HOMEPAGE = "http://gnu.org/software/classpath/inetlib.html"
>  
> @@ -12,7 +12,7 @@ inherit java-library autotools
>  
>  DEPENDS = "fastjar-native"
>  
> -PR = "r1"
> +PR = "r2"
>  
>  JPN = "libgnuinet-java"
>  
> diff --git a/recipes/gpe-themes/gpe-theme-e17_0.1.bb b/recipes/gpe-themes/gpe-theme-e17_0.1.bb
> index bf29f9b..9b76007 100644
> --- a/recipes/gpe-themes/gpe-theme-e17_0.1.bb
> +++ b/recipes/gpe-themes/gpe-theme-e17_0.1.bb
> @@ -1,5 +1,5 @@
>  DESCRIPTION =	"GTK+ enlightenment theme adjusted for GPE"
> -LICENSE = 	"MIT + GPL"
> +LICENSE = 	"MIT GPL"
>  PR =		"r1"
>  
>  #it doesn't really depends on it, but it's nice to make OE build it
> diff --git a/recipes/hwdata/hwdata_0.191.bb b/recipes/hwdata/hwdata_0.191.bb
> index 527efdf..e94d997 100644
> --- a/recipes/hwdata/hwdata_0.191.bb
> +++ b/recipes/hwdata/hwdata_0.191.bb
> @@ -1,5 +1,5 @@
>  DESCRIPTION = "This package contains various hardware identification and configuration data, such as the pci.ids database, or the XFree86/xorg Cards database. It's needed for the kudzu hardware detection."
> -LICENSE = "GPL + X11"
> +LICENSE = "GPL X11"
>  
>  PR = "r1"
>  
> diff --git a/recipes/sdr/soft66_git.bb b/recipes/sdr/soft66_git.bb
> index 8955d1e..7aa827f 100644
> --- a/recipes/sdr/soft66_git.bb
> +++ b/recipes/sdr/soft66_git.bb
> @@ -1,5 +1,5 @@
>  DESCRIPTION = "Library and tools for Soft66ADD and related SDR radio receivers"
> -LICENSE = "GPLv3 + LGPLv3"
> +LICENSE = "GPLv3 LGPLv3"
>  
>  DEPENDS = "libftdi"
>  
> diff --git a/recipes/tesseract/tesseract_1.0.bb b/recipes/tesseract/tesseract_1.0.bb
> index 762eb95..de20403 100644
> --- a/recipes/tesseract/tesseract_1.0.bb
> +++ b/recipes/tesseract/tesseract_1.0.bb
> @@ -1,5 +1,5 @@
>  DESCRIPTION = "A commercial quality OCR engine "
> -LICENSE = "APL + others"
> +LICENSE = "APL others"
>  
>  DEPENDS = "tiff"
>  

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNyPC9MkyGM64RGpERApcpAKCpHvFEqaG50Z9dIMxzHwm6ccY6GQCdEESy
GHutDfOjxispdcit8ypbqDk=
=Uz9S
-----END PGP SIGNATURE-----