Merge commit 'origin/shr/merge' into shr/testing2009

Conflicts:
	conf/distro/include/sane-srcrevs.inc
	recipes/enotes/enotes_svn.bb
	recipes/intone-video/intone-video_svn.bb
	recipes/intone/intone_svn.bb
	recipes/shr/shr-wizard_git.bb
	recipes/tasks/task-shr-minimal.bb

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>

12 files changed, 53 insertions, 55 deletions

diff --git a/conf/distro/include/angstrom-package-deb.inc b/conf/distro/include/angstrom-package-deb.inc
index 3dbb175f93..e060bb1ccf 100644
--- a/conf/distro/include/angstrom-package-deb.inc
+++ b/conf/distro/include/angstrom-package-deb.inc
@@ -1,4 +1,4 @@
 INHERIT += "package_deb"
 
-PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native"
-PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth"
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "update-alternatives-cworth-native"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
diff --git a/conf/distro/include/angstrom-package-ipk.inc b/conf/distro/include/angstrom-package-ipk.inc
index a33a4ad2b4..14206bda2d 100644
--- a/conf/distro/include/angstrom-package-ipk.inc
+++ b/conf/distro/include/angstrom-package-ipk.inc
@@ -1,5 +1,4 @@
 INHERIT += "package_ipk"
 
-PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native"
-PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth"
-
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= ${PREFERRED_PROVIDER_opkg}
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 6e65285e99..8647dd7ec4 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -11,8 +11,10 @@ BUILDNAME = "Angstrom ${DISTRO_VERSION}"
 
 TARGET_VENDOR = "-angstrom"
 
-# Add FEED_ARCH to overrides
-OVERRIDES .= ":${FEED_ARCH}"
+SOC_FAMILY ?= "Unknown"
+
+# Add FEED_ARCH and SOC_FAMILY to overrides
+OVERRIDES .= ":${FEED_ARCH}:${SOC_FAMILY}"
 
 # Put links to sources in deploy/sources to make it easier for people to be GPL compliant
 INHERIT += "src_distribute_local"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 7cc923cc60..d881202b09 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -175,7 +175,7 @@ PREFERRED_VERSION_comprec ?= "0.02"
 PREFERRED_VERSION_confuse ?= "2.5"
 PREFERRED_VERSION_confuse-native ?= "2.5"
 PREFERRED_VERSION_connect ?= "0.1"
-PREFERRED_VERSION_connman ?= "0.10"
+PREFERRED_VERSION_connman ?= "0.15"
 PREFERRED_VERSION_conserver ?= "8.1.14"
 PREFERRED_VERSION_console-tools ?= "0.3.2"
 PREFERRED_VERSION_contacts ?= "0.7"
@@ -1963,7 +1963,7 @@ PREFERRED_VERSION_wlan-ng-modules ?= "0.2.7"
 PREFERRED_VERSION_wlan-ng-utils ?= "0.2.7"
 PREFERRED_VERSION_wmctrl ?= "1.07"
 PREFERRED_VERSION_wpa-gui ?= "0.4.8"
-PREFERRED_VERSION_wpa-supplicant ?= "0.6.3"
+PREFERRED_VERSION_wpa-supplicant ?= "0.6.9"
 PREFERRED_VERSION_wpa-supplicant-nossl ?= "0.2.6"
 PREFERRED_VERSION_wpa-supplicant-ssl ?= "0.2.6"
 PREFERRED_VERSION_wrt-imagetools-native ?= "1.0"
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index f4ddf2fa25..fd83e02afe 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -17,8 +17,7 @@ PREFERRED_VERSION_classpath-native = "0.98"
 PREFERRED_VERSION_linux-libc-headers = "2.6.31"
 
 # override EFL_SRCREV from sane-srcrevs.inc
-# now is EFL_SRCREV newer in sane-srcrevs.inc
-# EFL_SRCREV ?= "43898"
+EFL_SRCREV ?= "44424"
 
 # specifically set an openssh version
 # NOTE: whenever changing the version here make sure
diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc
index 5ec80ffeb1..204047fd63 100644
--- a/conf/distro/include/preferred-slugos-versions.inc
+++ b/conf/distro/include/preferred-slugos-versions.inc
@@ -36,22 +36,22 @@ PREFERRED_VERSION_binutils			?= "2.18.50.0.7"
 PREFERRED_VERSION_binutils-cross		?= "2.18.50.0.7"
 PREFERRED_VERSION_binutils-cross-sdk		?= "2.18.50.0.7"
 PREFERRED_VERSION_busybox			?= "1.13.2"
-PREFERRED_VERSION_dbus				?= "1.2.1"
+PREFERRED_VERSION_dbus				?= "1.2.3"
 PREFERRED_VERSION_gcc				?= "4.2.4"
 PREFERRED_VERSION_gcc-cross			?= "4.2.4"
 PREFERRED_VERSION_gcc-cross-sdk			?= "4.2.4"
 PREFERRED_VERSION_gcc-cross-initial		?= "4.2.4"
 PREFERRED_VERSION_gcc-cross-intermediate	?= "4.2.4"
-PREFERRED_VERSION_glib-2.0			?= "2.18.3"
-PREFERRED_VERSION_glib-2.0-native		?= "2.18.0"
+PREFERRED_VERSION_glib-2.0			?= "2.22.1"
+PREFERRED_VERSION_glib-2.0-native		?= "2.22.1"
 PREFERRED_VERSION_glibc				?= "2.6.1"
 PREFERRED_VERSION_glibc-initial			?= "2.6.1"
 PREFERRED_VERSION_ipkg				?= "0.99.163"
 PREFERRED_VERSION_ipkg-native			?= "0.99.163"
-PREFERRED_VERSION_libtool			?= "2.2.4"
-PREFERRED_VERSION_libtool-native		?= "2.2.4"
-PREFERRED_VERSION_libtool-cross			?= "2.2.4"
-PREFERRED_VERSION_libtool-sdk			?= "2.2.4"
+PREFERRED_VERSION_libtool			?= "2.2.6a"
+PREFERRED_VERSION_libtool-native		?= "2.2.6a"
+PREFERRED_VERSION_libtool-cross			?= "2.2.6a"
+PREFERRED_VERSION_libtool-sdk			?= "2.2.6a"
 PREFERRED_VERSION_linux-libc-headers		?= "2.6.23"
 PREFERRED_VERSION_m4				?= "1.4.8"
 PREFERRED_VERSION_m4-native			?= "1.4.8"
diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc
index 3d1ae5235f..7da1c16a2a 100644
--- a/conf/distro/include/preferred-xorg-versions-live.inc
+++ b/conf/distro/include/preferred-xorg-versions-live.inc
@@ -1,4 +1,4 @@
-#Fri Dec  4 07:59:36 CET 2009
+#Wed Dec 16 09:33:47 CET 2009
 #app
 PREFERRED_VERSION_appres ?= "1.0.2"
 PREFERRED_VERSION_bdftopcf ?= "1.0.2"
@@ -13,7 +13,7 @@ PREFERRED_VERSION_fstobdf ?= "1.0.3"
 PREFERRED_VERSION_iceauth ?= "1.0.3"
 PREFERRED_VERSION_ico ?= "1.0.2"
 PREFERRED_VERSION_lbxproxy ?= "1.0.2"
-PREFERRED_VERSION_listres ?= "1.0.1"
+PREFERRED_VERSION_listres ?= "1.0.2"
 PREFERRED_VERSION_luit ?= "1.0.4"
 PREFERRED_VERSION_mkcfm ?= "1.0.1"
 PREFERRED_VERSION_mkcomposecache ?= "1.2.1"
@@ -72,7 +72,7 @@ PREFERRED_VERSION_xkbprint ?= "1.0.2"
 PREFERRED_VERSION_xkbutils ?= "1.0.2"
 PREFERRED_VERSION_xkill ?= "1.0.2"
 PREFERRED_VERSION_xload ?= "1.0.2"
-PREFERRED_VERSION_xlogo ?= "1.0.1"
+PREFERRED_VERSION_xlogo ?= "1.0.2"
 PREFERRED_VERSION_xlsatoms ?= "1.0.2"
 PREFERRED_VERSION_xlsclients ?= "1.0.2"
 PREFERRED_VERSION_xlsfonts ?= "1.0.2"
@@ -120,7 +120,7 @@ PREFERRED_VERSION_xf86-input-dmc ?= "1.1.2"
 PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.2"
 PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.2"
 PREFERRED_VERSION_xf86-input-elographics ?= "1.2.3"
-PREFERRED_VERSION_xf86-input-evdev ?= "2.3.1"
+PREFERRED_VERSION_xf86-input-evdev ?= "2.3.2"
 PREFERRED_VERSION_xf86-input-fpit ?= "1.3.0"
 PREFERRED_VERSION_xf86-input-hyperpen ?= "1.3.0"
 PREFERRED_VERSION_xf86-input-jamstudio ?= "1.2.0"
@@ -135,7 +135,7 @@ PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0"
 PREFERRED_VERSION_xf86-input-penmount ?= "1.4.0"
 PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1"
 PREFERRED_VERSION_xf86-input-summa ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.1"
 PREFERRED_VERSION_xf86-input-tek4957 ?= "1.2.0"
 PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0"
 PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.5"
@@ -162,7 +162,7 @@ PREFERRED_VERSION_xf86-video-mga ?= "1.9.100"
 PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.4"
 PREFERRED_VERSION_xf86-video-newport ?= "0.2.3"
 PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3"
-PREFERRED_VERSION_xf86-video-nv ?= "2.1.15"
+PREFERRED_VERSION_xf86-video-nv ?= "2.1.16"
 PREFERRED_VERSION_xf86-video-openchrome ?= "0.2.904"
 PREFERRED_VERSION_xf86-video-r128 ?= "6.8.1"
 PREFERRED_VERSION_xf86-video-radeonhd ?= "1.3.0"
@@ -286,13 +286,13 @@ PREFERRED_VERSION_libxxf86vm ?= "1.1.0"
 PREFERRED_VERSION_libdmx ?= "1.1.0"
 PREFERRED_VERSION_libfontenc ?= "1.0.5"
 PREFERRED_VERSION_libfontenc-native ?= "1.0.5"
-PREFERRED_VERSION_liblbxutil ?= "1.0.1"
+PREFERRED_VERSION_liblbxutil ?= "1.1.0"
 PREFERRED_VERSION_liboldx ?= "1.0.1"
-PREFERRED_VERSION_libpciaccess ?= "0.10.9"
+PREFERRED_VERSION_libpciaccess ?= "0.11.0"
 PREFERRED_VERSION_libxkbfile ?= "1.0.6"
 PREFERRED_VERSION_libxkbfile-native ?= "1.0.6"
 PREFERRED_VERSION_libxkbui ?= "1.0.2"
-PREFERRED_VERSION_pixman ?= "0.17.2"
+PREFERRED_VERSION_pixman ?= "0.16.2"
 PREFERRED_VERSION_xtrans ?= "1.2.5"
 PREFERRED_VERSION_xtrans-native ?= "1.2.5"
 #proto
@@ -346,8 +346,8 @@ PREFERRED_VERSION_imake ?= "1.0.2"
 PREFERRED_VERSION_lndir ?= "1.0.1"
 PREFERRED_VERSION_makedepend ?= "1.0.2"
 PREFERRED_VERSION_makedepend-native ?= "1.0.2"
-PREFERRED_VERSION_util-macros ?= "1.3.0"
-PREFERRED_VERSION_util-macros-native ?= "1.3.0"
+PREFERRED_VERSION_util-macros ?= "1.4.1"
+PREFERRED_VERSION_util-macros-native ?= "1.4.1"
 PREFERRED_VERSION_xorg-cf-files ?= "1.0.3"
 #xserver
 PREFERRED_VERSION_xserver-xorg ?= "1.7.3"
diff --git a/conf/distro/include/sane-feed-deb.inc b/conf/distro/include/sane-feed-deb.inc
index 4f38b8f936..d953d6ebe0 100644
--- a/conf/distro/include/sane-feed-deb.inc
+++ b/conf/distro/include/sane-feed-deb.inc
@@ -2,5 +2,5 @@
 
 INHERIT += "package_deb"
 
-PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native"
-PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth"
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "update-alternatives-cworth-native"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
diff --git a/conf/distro/include/sane-feed-ipk.inc b/conf/distro/include/sane-feed-ipk.inc
index a33a4ad2b4..14206bda2d 100644
--- a/conf/distro/include/sane-feed-ipk.inc
+++ b/conf/distro/include/sane-feed-ipk.inc
@@ -1,5 +1,4 @@
 INHERIT += "package_ipk"
 
-PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native"
-PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth"
-
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= ${PREFERRED_PROVIDER_opkg}
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index f99b44945c..d975ec261a 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -30,7 +30,7 @@ SRCREV_pn-fso-specs ?= "14de522adbea80416df811085b3112cd1d5d5336"
 SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8"
 SRCREV_pn-libeflvala ?= "d07db4fbd24c9d5dfc9b1fd5024fd651b02f123e"
 SRCREV_pn-libfso-glib ?= "9a627aa1c33f5a46ae4316fc274126ca5f37e979"
-SRCREV_pn-libframeworkd-glib ?= "dc5409fbf9d2d22a7fa871199bb66da5ac6f5084"
+SRCREV_pn-libframeworkd-glib ?= "e5cc248f241ea549810051fb95f0250bd1224cf9"
 SRCREV_pn-libgsm0710 ?= "cd564c8782f018e0d65fb8716c99a6040b5bd166"
 SRCREV_pn-libgsm0710mux ?= "e81ed512ec86e31d0d0119826afa9d1302651693"
 SRCREV_pn-libpersistence ?= "26180fd3c0fe4eb6abb7440f10e51d997719b97a"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 8c9638571a..060f2277e3 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -46,7 +46,7 @@ SRCREV_pn-dfu-util-native ?= "4160"
 SRCREV_pn-disko ?= "f52597b8d5d584811cbe8f9e0bf25ea372526953"
 SRCREV_pn-diversity-daemon ?= "571"
 SRCREV_pn-diversity-radar ?= "453"
-SRCREV_pn-e-tasks ?= "14"
+SRCREV_pn-e-tasks ?= "22"
 SRCREV_pn-e-wm-config-illume-shr ?= "bbcec18f0ebd47e4f6eea88b9b774edf7400e752"
 SRCREV_pn-e-wm-illume-dict-pl ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-e-wm-menu-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
@@ -66,7 +66,7 @@ SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-elmdentica ?= "171"
 SRCREV_pn-enlazar ?= "37"
 SRCREV_pn-enotes ?= "19"
-SRCREV_pn-epdfview ?= "345"
+SRCREV_pn-epdfview ?= "346"
 SRCREV_pn-epiphany ?= "7837"
 SRCREV_pn-essential-dialer ?= "194"
 SRCREV_pn-etk-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
@@ -86,7 +86,7 @@ SRCREV_pn-fsoraw ?= "20"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gabriel ?= "38"
 SRCREV_pn-gabriel-native ?= "38"
-GCCREV ?= "145550"
+GCCREV ?= "155234"
 SRCREV_pn-gcc ?= ${GCCREV}
 SRCREV_pn-gcc-cross ?= ${GCCREV}
 SRCREV_pn-gcc-cross-initial ?= ${GCCREV}
@@ -104,25 +104,15 @@ SRCREV_pn-gpe-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-gridpad ?= "194"
 SRCREV_pn-gtk-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-gtkhtml2 ?= "1158"
+SRCREV_pn-guitartune ?= "11"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
 SRCREV_pn-icon-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-SRCREV_pn-illume-keyboard-arabic ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-browse ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-danish ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-default-alt ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-dutch ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-dvorak ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-french ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-german ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-hebrew ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-numeric-alt ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-russian ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-russian-terminal ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboards-shr ?= "c23bde500152c303971b4c2ec5c463d760b7cc14"
 SRCREV_pn-illume-theme-asu ?= "4881"
 SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181bc5"
-SRCREV_pn-intone ?= "66"
-SRCREV_pn-intone-video ?= "9"
+SRCREV_pn-intone ?= "75"
+SRCREV_pn-intone-video ?= "12"
 SRCREV_pn-intuition ?= "194"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
@@ -196,7 +186,7 @@ SRCREV_pn-mplayer-maemo ?= "342"
 SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257"
 SRCREV_pn-multitap-pad ?= "373"
 SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
-SRCREV_pn-navit ?= "2809"
+SRCREV_pn-navit ?= "2846"
 SRCREV_pn-navit-icons ?= "2618"
 SRCREV_pn-neod ?= "4617"
 SRCREV_pn-neomis ?= "6"
@@ -303,10 +293,10 @@ SRCREV_pn-shr-config ?= "37dd7ac950e2bfd438801faf34c29fccfdbbaccf"
 SRCREV_pn-shr-contacts ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-dialer ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-installer ?= "f17fa104639113fb0d3212b6bba366c092854cde"
-SRCREV_pn-shr-launcher ?= "92"
+SRCREV_pn-shr-launcher ?= "99"
 SRCREV_pn-shr-messages ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-settings ?= "ef06fe86c49958673889671c46682c0b2f1d74d7"
-SRCREV_pn-shr-specs ?= "ed8452c3153b6961f2d264129edcd349296d49c3"
+SRCREV_pn-shr-specs ?= "63dd65685a5ab8a304e6c9e12320f07ac58a0aca"
 SRCREV_pn-shr-splash ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-splash-theme-dontpanic ?= "e994275bbfdca33a6776d9edbddc711c10aba40d"
 SRCREV_pn-shr-splash-theme-handy ?= "e994275bbfdca33a6776d9edbddc711c10aba40d"
@@ -418,6 +408,9 @@ SRCREV_pn-illume ?= "${EFL_SRCREV}"
 SRCREV_pn-illume-theme-illume ?= "${EFL_SRCREV}"
 SRCREV_pn-waker ?= "${EFL_SRCREV}"
 
+#illume default keyboards
+SRCREV_pn-illume-keyboard-default ?= "${EFL_SRCREV}"
+
 #exalt
 SRCREV_pn-exalt ?= "${EFL_SRCREV}"
 SRCREV_pn-exalt-client ?= "${EFL_SRCREV}"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 8a331ae7f2..10a2bc4a02 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -166,6 +166,12 @@ PREFERRED_PROVIDER_avahi			?= "avahi"
 PREFERRED_PROVIDER_gconf			?= "gconf"
 PREFERRED_PROVIDER_virtual/libusb0		?= "libusb-compat"
 
+# we use bluez4 instead of the older bluez3
+DISTRO_BLUETOOTH_MANAGER			= "bluez4"
+PREFERRED_PROVIDER_bluez-utils-dbus		= "bluez-utils"
+PREFERRED_PROVIDER_bluez-libs			= "bluez4"
+PREFERRED_PROVIDER_bluez-utils			= "bluez4"
+
 # Include any package preferred versions and srcrevs:
 
 require conf/distro/include/preferred-slugos-versions.inc