add bluez-(utils|libs)-2.16 and kill off a few outdated ones

BKrev: 4266857bH35EfhBI7T5gJgaxEyhaww

diff --git a/packages/bluez-libs/bluez-libs_2.10.bb b/packages/bluez-libs/bluez-libs_2.16.bb
similarity index 100%
rename from packages/bluez-libs/bluez-libs_2.10.bb
rename to packages/bluez-libs/bluez-libs_2.16.bb

diff --git a/packages/bluez-utils/bluez-utils-common_2.10.inc b/packages/bluez-utils/bluez-utils-common_2.10.inc
deleted file mode 100644 (file)
index 902189d..0000000
--- a/packages/bluez-utils/bluez-utils-common_2.10.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
-SECTION = "console"
-PRIORITY = "optional"
-DEPENDS = "bluez-libs pcmcia-cs"
-RPROVIDES = "bluez-pan bluez-sdp"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
-       file://hcid.conf"
-S = "${WORKDIR}/bluez-utils-${PV}"
-
-EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} --enable-pcmcia --enable-initscripts"
-
-do_install_append() {
-       install -d ${D}${base_sbindir} ${D}${base_bindir}/
-       mv ${D}${sbindir}/* ${D}${base_sbindir}/
-       mv ${D}${bindir}/* ${D}${base_bindir}/
-       rmdir ${D}${bindir} ${D}${sbindir}
-       chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
-       chmod 755 ${D}${sysconfdir}/pcmcia/bluetooth
-       install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
-}
-
-inherit autotools update-rc.d
-
-INITSCRIPT_NAME = "bluetooth"
-INITSCRIPT_PARAMS = "defaults"
-

diff --git a/packages/bluez-utils/bluez-utils-common_2.11.inc b/packages/bluez-utils/bluez-utils-common_2.11.inc
deleted file mode 100644 (file)
index 6567658..0000000
--- a/packages/bluez-utils/bluez-utils-common_2.11.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
-SECTION = "console"
-PRIORITY = "optional"
-DEPENDS = "bluez-libs-2.11 pcmcia-cs"
-RPROVIDES = "bluez-pan bluez-sdp bluez-utils"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
-       file://hcid.conf"
-S = "${WORKDIR}/bluez-utils-${PV}"
-
-EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} --enable-pcmcia --enable-initscripts"
-
-do_install_append() {
-       install -d ${D}${base_sbindir} ${D}${base_bindir}/
-       mv ${D}${sbindir}/* ${D}${base_sbindir}/
-       mv ${D}${bindir}/* ${D}${base_bindir}/
-       rmdir ${D}${bindir} ${D}${sbindir}
-       chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
-       chmod 755 ${D}${sysconfdir}/pcmcia/bluetooth
-       install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
-}
-
-inherit autotools update-rc.d
-
-INITSCRIPT_NAME = "bluetooth"
-INITSCRIPT_PARAMS = "defaults 23 19"
-

diff --git a/packages/bluez-utils/bluez-utils-common_2.13.inc b/packages/bluez-utils/bluez-utils-common_2.13.inc
deleted file mode 100644 (file)
index 8c57742..0000000
--- a/packages/bluez-utils/bluez-utils-common_2.13.inc
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
-SECTION = "console"
-PRIORITY = "optional"
-DEPENDS = "bluez-libs-2.13 pcmcia-cs"
-RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils"
-LICENSE = "GPL"
-PACKAGES =+ "${PN}-ciptool ${PN}-bluepin"
-PR = "r1"
-
-FILES_${PN}-ciptool = "/bin/ciptool"
-FILES_${PN}-bluepin = "/bin/bluepin"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
-       file://hcid.conf"
-S = "${WORKDIR}/bluez-utils-${PV}"
-
-EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} --enable-pcmcia --enable-initscripts"
-
-do_install_append() {
-       install -d ${D}${base_sbindir} ${D}${base_bindir}/
-       mv ${D}${sbindir}/* ${D}${base_sbindir}/
-       mv ${D}${bindir}/* ${D}${base_bindir}/
-       rmdir ${D}${bindir} ${D}${sbindir}
-       chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
-       chmod 755 ${D}${sysconfdir}/pcmcia/bluetooth
-       install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
-}
-
-inherit autotools update-rc.d
-
-INITSCRIPT_NAME = "bluetooth"
-INITSCRIPT_PARAMS = "defaults 23 19"
-

diff --git a/packages/bluez-libs/bluez-libs_2.11.bb b/packages/bluez-utils/bluez-utils-common_2.16.inc
similarity index 100%
rename from packages/bluez-libs/bluez-libs_2.11.bb
rename to packages/bluez-utils/bluez-utils-common_2.16.inc

diff --git a/packages/bluez-utils/bluez-utils-dbus_2.10.bb b/packages/bluez-utils/bluez-utils-dbus_2.10.bb
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/bluez-utils/bluez-utils-dbus_2.11.bb b/packages/bluez-utils/bluez-utils-dbus_2.11.bb
deleted file mode 100644 (file)
index fd2f222..0000000
--- a/packages/bluez-utils/bluez-utils-dbus_2.11.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-include bluez-utils-common_${PV}.inc
-DEPENDS += "dbus"
-SRC_URI += "file://dbus.patch;patch=1 file://smash.patch;patch=1"
-PR = "r4"
-EXTRA_OECONF += "--with-dbus"
-

diff --git a/packages/bluez-utils/bluez-utils-dbus_2.13.bb b/packages/bluez-utils/bluez-utils-dbus_2.13.bb
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/bluez-libs/bluez-libs_2.13.bb b/packages/bluez-utils/bluez-utils-dbus_2.16.bb
similarity index 100%
rename from packages/bluez-libs/bluez-libs_2.13.bb
rename to packages/bluez-utils/bluez-utils-dbus_2.16.bb

diff --git a/packages/bluez-utils/bluez-utils-nodbus_2.10.bb b/packages/bluez-utils/bluez-utils-nodbus_2.10.bb
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/bluez-utils/bluez-utils-nodbus_2.11.bb b/packages/bluez-utils/bluez-utils-nodbus_2.11.bb
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/bluez-utils/bluez-utils-nodbus_2.13.bb b/packages/bluez-utils/bluez-utils-nodbus_2.13.bb
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/bluez-libs/bluez-libs_2.8.bb b/packages/bluez-utils/bluez-utils-nodbus_2.16.bb
similarity index 100%
rename from packages/bluez-libs/bluez-libs_2.8.bb
rename to packages/bluez-utils/bluez-utils-nodbus_2.16.bb