[PATCH 00/10] Various license clarifications v2

[PATCH 00/10] Various license clarifications v2

[Joshua Lock]

This series is a v2 of an earlier series. It includes a few metadata
massages to ensure LICENSE fields specify the correct license version.

Since v1 I've used the same notation as common convention and further
clarified some of the GPL licenses which have an or later clause.

Regards,
Joshua

The following changes since commit ae4118a1f78f113c3d687c3aa6a86007cf977cae:

  libsdl 1.2.14: fix packaging (2011-12-19 12:17:36 +0000)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib josh/updates
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/updates

Joshua Lock (10):
  gypsy: fix LICENSE field
  udev: tidy the LICENSE fields
  apt: clarify LICENSE as GPLv2.0
  dpkg: clarify LICENSE as GPLv2.0
  clutter: clarify LICENSE as LGPLv2.1
  cogl: clarify LICENSE as LGPLv2.1 and fix metadata
  matchbox-wm: clarify LICENSE as GPLv2.0
  pango: clarify LICENSE is LGPLv2.0+
  matchbox-desktop: clarify LICENSE is GPLv2.0+
  matchbox-session-sato: clarify LICENSE in GPLv2.0

 meta/recipes-connectivity/gypsy/gypsy.inc          |    2 +-
 meta/recipes-core/udev/udev-new.inc                |    4 ++--
 meta/recipes-core/udev/udev.inc                    |    4 ++--
 meta/recipes-devtools/apt/apt.inc                  |    2 +-
 meta/recipes-devtools/dpkg/dpkg.inc                |    2 +-
 meta/recipes-graphics/clutter/clutter.inc          |    2 +-
 meta/recipes-graphics/clutter/cogl.inc             |    6 +++---
 .../matchbox-wm/matchbox-wm_1.2.bb                 |    2 +-
 meta/recipes-graphics/pango/pango.inc              |    2 +-
 .../matchbox-desktop/matchbox-desktop_0.9.1.bb     |    2 +-
 .../matchbox-desktop/matchbox-desktop_2.0.bb       |    2 +-
 .../matchbox-sato/matchbox-session-sato_0.1.bb     |    2 +-
 12 files changed, 16 insertions(+), 16 deletions(-)

-- 
1.7.7.4

[PATCH 01/10] gypsy: fix LICENSE field

[Joshua Lock]

Gypsy binaries are Gplv2.0 and the libraries LGPLv2.1

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/recipes-connectivity/gypsy/gypsy.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-connectivity/gypsy/gypsy.inc b/meta/recipes-connectivity/gypsy/gypsy.inc
index 9b1c97e..11a7204 100644
--- a/meta/recipes-connectivity/gypsy/gypsy.inc
+++ b/meta/recipes-connectivity/gypsy/gypsy.inc
@@ -4,7 +4,7 @@ multiple clients to access GPS data from multiple GPS sources \
 concurrently.  Gypsy also hides the details of parsing NMEA from the \
 client applications, passing the data as simple values for the clients \
 to use."
-LICENSE = "GPL"
+LICENSE = "GPLv2.0 & LGPLv2.1"
 SECTION = "x11"
 DEPENDS = "glib-2.0 dbus bluez4 dbus-glib"
 
-- 
1.7.7.4

[PATCH 02/10] udev: tidy the LICENSE fields

[Joshua Lock]

Signed-off-by: Joshua Lock <josh@linux.intel.com>

fix udev
---
 meta/recipes-core/udev/udev-new.inc |    4 ++--
 meta/recipes-core/udev/udev.inc     |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-core/udev/udev-new.inc b/meta/recipes-core/udev/udev-new.inc
index eac7903..e302c03 100644
--- a/meta/recipes-core/udev/udev-new.inc
+++ b/meta/recipes-core/udev/udev-new.inc
@@ -2,8 +2,8 @@ SUMMARY = "/dev/ and hotplug management daemon"
 DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
 /dev/, handles hotplug events and loads drivers at boot time."
 HOMEPAGE = "http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
-LICENSE = "GPLv2+ & LGPLv2.1+"
-LICENSE_${PN} = "GPLv2+"
+LICENSE = "GPLv2.0+ & LGPLv2.1+"
+LICENSE_${PN} = "GPLv2.0+"
 LICENSE_libudev = "LGPLv2.1+"
 LICENSE_libgudev = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index d731816..eb096ee 100644
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -1,7 +1,7 @@
 SUMMARY = "/dev/ and hotplug management daemon"
 DESCRIPTION = "udev is a program which dynamically creates and removes device nodes from \
 /dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel."
-LICENSE = "GPL"
+LICENSE = "GPLv2.0+ & LGPLv2.1+"
 
 SRC_URI += " \
 	   file://udev.rules \
@@ -11,7 +11,7 @@ SRC_URI += " \
 	   file://mount.sh \
 	   file://network.sh \
 	   file://local.rules \
-       file://udev-cache \
+           file://udev-cache \
            file://init"
 
 UDEV_DEVFS_RULES ?= "0"
-- 
1.7.7.4

[PATCH 03/10] apt: clarify LICENSE as GPLv2.0

[Joshua Lock]

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/recipes-devtools/apt/apt.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc
index 9d3268d..6265203 100644
--- a/meta/recipes-devtools/apt/apt.inc
+++ b/meta/recipes-devtools/apt/apt.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "Advanced front-end for dpkg."
-LICENSE = "GPL"
+LICENSE = "GPLv2.0+"
 SECTION = "base"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \
-- 
1.7.7.4

[PATCH 04/10] dpkg: clarify LICENSE as GPLv2.0

[Joshua Lock]

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/recipes-devtools/dpkg/dpkg.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 2aecff5..1326994 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "Package maintenance system for Debian."
-LICENSE = "GPL"
+LICENSE = "GPLv2.0+"
 SECTION = "base"
 
 INC_PR = "r15"
-- 
1.7.7.4

[PATCH 05/10] clutter: clarify LICENSE as LGPLv2.1

[Joshua Lock]

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/recipes-graphics/clutter/clutter.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/clutter/clutter.inc b/meta/recipes-graphics/clutter/clutter.inc
index 24cb30d..9d7760f 100644
--- a/meta/recipes-graphics/clutter/clutter.inc
+++ b/meta/recipes-graphics/clutter/clutter.inc
@@ -1,6 +1,6 @@
 DESCRIPTION = "Clutter graphics library"
 HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPL"
+LICENSE = "LGPLv2.1+"
 
 # Internal json-glib was removed in Clutter 1.5.2, cogl was removed in 1.8, atk required since 1.8
 STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes libxi json-glib cogl atk"
-- 
1.7.7.4

[PATCH 06/10] cogl: clarify LICENSE as LGPLv2.1 and fix metadata

[Joshua Lock]

Fix the HOMEPAGE and DESCRIPTION which were using the same values as Clutter.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/recipes-graphics/clutter/cogl.inc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-graphics/clutter/cogl.inc b/meta/recipes-graphics/clutter/cogl.inc
index 81317c6..f2ad6d1 100644
--- a/meta/recipes-graphics/clutter/cogl.inc
+++ b/meta/recipes-graphics/clutter/cogl.inc
@@ -1,6 +1,6 @@
-DESCRIPTION = "Clutter graphics library"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPL"
+DESCRIPTION = "a modern 3D graphics API with associated utility APIs"
+HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl"
+LICENSE = "LGPLv2.1+"
 
 STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gdk-pixbuf libxi"
 BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
-- 
1.7.7.4

[PATCH 07/10] matchbox-wm: clarify LICENSE as GPLv2.0

[Joshua Lock]

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 .../matchbox-wm/matchbox-wm_1.2.bb                 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
index 63829ec..84b966a 100644
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
@@ -1,6 +1,6 @@
 SECTION = "x11/wm"
 DESCRIPTION = "Matchbox window manager"
-LICENSE = "GPL"
+LICENSE = "GPLv2.0+"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat"
 PR = "r4"
 
-- 
1.7.7.4

[PATCH 08/10] pango: clarify LICENSE is LGPLv2.0+

[Joshua Lock]

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/recipes-graphics/pango/pango.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index ff5a73a..b428b9d 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -7,7 +7,7 @@ core of text and font handling for GTK+-2.x."
 HOMEPAGE = "http://www.pango.org/"
 BUGTRACKER = "http://bugzilla.gnome.org"
 SECTION = "libs"
-LICENSE = "LGPL"
+LICENSE = "LGPLv2.0+"
 
 X11DEPENDS = "virtual/libx11 libxft"
 DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo "
-- 
1.7.7.4

[PATCH 09/10] matchbox-desktop: clarify LICENSE is GPLv2.0+

[Joshua Lock]

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 .../matchbox-desktop/matchbox-desktop_0.9.1.bb     |    2 +-
 .../matchbox-desktop/matchbox-desktop_2.0.bb       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb
index 0a02bb9..43e10ca 100644
--- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb
+++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Matchbox Window Manager Desktop"
-LICENSE = "GPL"
+LICENSE = "GPLv2.0+"
 DEPENDS = "libmatchbox startup-notification"
 SECTION = "x11/wm"
 
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb
index 2943e4d..3e95bc1 100644
--- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb
+++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Matchbox Window Manager Desktop"
-LICENSE = "GPL"
+LICENSE = "GPLv2.0+"
 DEPENDS = "gtk+ startup-notification"
 SECTION = "x11/wm"
 PR = "r2"
-- 
1.7.7.4

[PATCH 10/10] matchbox-session-sato: clarify LICENSE in GPLv2.0

[Joshua Lock]

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 .../matchbox-sato/matchbox-session-sato_0.1.bb     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
index c738584..10fd5b4 100644
--- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
+++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Custom MB session files for poky"
 HOMEPAGE = "http://www.matchbox-project.org/"
 BUGTRACKER = "http://bugzilla.openedhand.com/"
 
-LICENSE = "GPL"
+LICENSE = "GPLv2.0+"
 LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be63"
 
 # Distro can override initscripts provider
-- 
1.7.7.4