hal: fix metadata

add bugtracker, update license
The detail license is very complex and not easy to be expressed
in a single LICENSE line. Adopt a simple notation here, and will
describe details when the package is actually being upgraded.

hal_git doesn't use hal.inc, need further cleanups.

Signed-off-by: Qing He <qing.he@intel.com>

2 files changed, 14 insertions, 10 deletions

diff --git a/meta/packages/hal/hal.inc b/meta/packages/hal/hal.inc
index 4d72e94fa7..2b70eb714d 100644
--- a/meta/packages/hal/hal.inc
+++ b/meta/packages/hal/hal.inc
@@ -1,22 +1,24 @@
 DESCRIPTION = "Hardware Abstraction Layer"
 HOMEPAGE = "http://freedesktop.org/Software/hal"
+BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=hal"
 SECTION = "unknown"
-LICENSE = "GPL LGPL AFL"
 
-SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz"
-
-S = "${WORKDIR}/hal-${PV}"
-
-inherit autotools pkgconfig
+LICENSE = "GPLv2+ | AFL"
 
 DEPENDS = "virtual/kernel dbus-glib udev intltool intltool-native expat libusb gperf-native"
 RDEPENDS += "udev hal-info"
 RRECOMMENDS = "udev-utils"
 
+SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz"
 SRC_URI += "file://99_hal \
             file://20hal \
            "
 
+S = "${WORKDIR}/hal-${PV}"
+
+inherit autotools pkgconfig
+
+
 LEAD_SONAME = "libhal.so"
 
 # machines with pci and acpi get a machine dependant hal
diff --git a/meta/packages/hal/hal_git.bb b/meta/packages/hal/hal_git.bb
index 21fde21fe9..85bb777d5f 100644
--- a/meta/packages/hal/hal_git.bb
+++ b/meta/packages/hal/hal_git.bb
@@ -1,19 +1,21 @@
 DESCRIPTION = "Hardware Abstraction Layer"
 HOMEPAGE = "http://freedesktop.org/Software/hal"
+BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=hal"
 SECTION = "unknown"
-LICENSE = "GPL LGPL AFL"
+
+LICENSE = "GPLv2+ | AFL"
 
 DEPENDS = "virtual/kernel dbus-glib udev intltool-native expat libusb"
 RDEPENDS_${PN} += "udev hal-info"
 RRECOMMENDS_${PN} += "udev-utils"
 
+PV = "0.5.9.1+git${SRCDATE}"
+PR = "r4"
+
 SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \
         file://20hal \
         file://99_hal"
 
-PV = "0.5.9.1+git${SRCDATE}"
-PR = "r4"
-
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig