[oe-commits] Thomas Zimmermann : shr/merge: update task-fos-compliance and connman

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 35081ac469e1ee95192aea37a4cf00c3155402ef
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=35081ac469e1ee95192aea37a4cf00c3155402ef

Author: Thomas Zimmermann <zimmermann at vdm-design.de>
Date:   Tue Oct 13 08:22:52 2009 +0000

shr/merge: update task-fos-compliance and connman

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 conf/distro/include/preferred-shr-versions.inc |    4 ++--
 recipes/connman/connman.inc                    |    4 +++-
 recipes/tasks/task-fso-compliance.bb           |   11 ++++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index 8aa6f6e..6f9f355 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -222,9 +222,9 @@ PREFERRED_VERSION_db ?= "4.3.29"
 PREFERRED_VERSION_dbench ?= "4.0"
 PREFERRED_VERSION_dbh ?= "1.0-18"
 PREFERRED_VERSION_db-native ?= "4.3.29"
-PREFERRED_VERSION_dbus ?= "1.2.14"
+PREFERRED_VERSION_dbus ?= "1.3.0"
 PREFERRED_VERSION_dbus-native ?= "1.2.1"
-PREFERRED_VERSION_dbus-glib ?= "0.78"
+PREFERRED_VERSION_dbus-glib ?= "0.82"
 PREFERRED_VERSION_dbus-glib-native ?= "0.76"
 PREFERRED_VERSION_dbus-native ?= "1.0.3"
 PREFERRED_VERSION_dbus-python ?= "0.71"
diff --git a/recipes/connman/connman.inc b/recipes/connman/connman.inc
index eb7aa1a..5b2f0cc 100644
--- a/recipes/connman/connman.inc
+++ b/recipes/connman/connman.inc
@@ -54,7 +54,7 @@ python populate_packages_prepend() {
 
 PACKAGES_DYNAMIC = "${PN}-plugin-*"
 
-PACKAGES += "${PN}-scripts"
+PACKAGES += "${PN}-scripts ${PN}-test-utils"
 
 FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
             ${sysconfdir} ${sharedstatedir} ${localstatedir} \
@@ -64,6 +64,8 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
             ${libdir}/bonobo/servers \
             ${datadir}/dbus-1/system-services/*"
 
+FILES_${PN}-test-utils += "${libdir}/connman/test/*"
+
 FILES_${PN}-scripts += "${libdir}/connman/scripts"
 FILES_${PN}-dbg += "${libdir}/connman/*/.debug"
 FILES_${PN}-dev += "${libdir}/connman/*/*.la"
diff --git a/recipes/tasks/task-fso-compliance.bb b/recipes/tasks/task-fso-compliance.bb
index 62193ff..0f00c2b 100644
--- a/recipes/tasks/task-fso-compliance.bb
+++ b/recipes/tasks/task-fso-compliance.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The freesmartphone.org framework -- install this task to make you
 SECTION = "fso/base"
 LICENSE = "MIT"
 PV = "1.0"
-PR = "r7"
+PR = "r8"
 
 inherit task
 
@@ -11,19 +11,20 @@ RDEPENDS_${PN} = "\
   frameworkd \
 #  fso-apmd \
   fso-gpsd \
-  fso-monitord \
+#  fso-monitord \
   connman \
   connman-scripts \
-  connman-plugin-bluetooth \
+#  connman-plugin-bluetooth \
 #  connman-plugin-dhclient \
 #  connman-plugin-dnsproxy \
 #  connman-plugin-ethernet \
 #  connman-plugin-fake \
-  connman-plugin-loopback \
-  connman-plugin-pppd \
+#  connman-plugin-loopback \
+#  connman-plugin-pppd \
 #  connman-plugin-resolvconf \
   connman-plugin-udhcp \
   connman-plugin-wifi \
+  connman-test-utils \
 "
 
 RRECOMMENDS_${PN} = "\