[oe-commits] Chase Maupin : gnutls: update LICENSE setting to GPLv3 and LGPLv2.1

[git at git.openembedded.org]

Module: openembedded.git
Branch: 2011.03-maintenance
Commit: e94f0fae6a1382a31ade3a7288cfd8c88b3c1666
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=e94f0fae6a1382a31ade3a7288cfd8c88b3c1666

Author: Chase Maupin <Chase.Maupin at ti.com>
Date:   Thu May 10 15:53:34 2012 -0500

gnutls: update LICENSE setting to GPLv3 and LGPLv2.1

* Updated the LICENSE field setting based on settings in oe-core
  as well as code inspection.
* Gave specific LICENSE versions instead of generic GPL LGPL
* Bump the INC_PR

Signed-off-by: Chase Maupin <Chase.Maupin at ti.com>

---

 recipes/gnutls/gnutls.inc |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/recipes/gnutls/gnutls.inc b/recipes/gnutls/gnutls.inc
index 6fb712f..a8e1e0d 100644
--- a/recipes/gnutls/gnutls.inc
+++ b/recipes/gnutls/gnutls.inc
@@ -1,14 +1,18 @@
 DESCRIPTION = "GNU Transport Layer Security Library"
 HOMEPAGE = "http://www.gnu.org/software/gnutls/"
 DEPENDS = "zlib libgcrypt lzo guile-native gtk-doc"
-LICENSE = "LGPL"
-LICENSE_${PN}-extra = "GPLv3"
+LICENSE = "GPLv3+ LGPLv2.1+"
+LICENSE_${PN} = "LGPLv2.1+"
+LICENSE_${PN}-xx = "LGPLv2.1+"
+LICENSE_${PN}-bin = "GPLv3+"
+LICENSE_${PN}-extra = "GPLv3+"
+LICENSE_${PN}-openssl = "GPLv3+"
 
 SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2;name=gnutls"
 
 inherit autotools binconfig pkgconfig gettext
 
-INC_PR = "r11"
+INC_PR = "r12"
 
 EXTRA_OECONF = "--with-included-opencdk --with-included-libtasn1 --disable-rpath"