4 files changed, 7 insertions, 7 deletions
diff --git a/recipes/bluez/bluez-gnome_1.8.bb b/recipes/bluez/bluez-gnome_1.8.bb
index 28c513bbca..66956f64d5 100644
--- a/recipes/bluez/bluez-gnome_1.8.bb
+++ b/recipes/bluez/bluez-gnome_1.8.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Bluetooth configuration applet"
 LICENSE = "GPL+LGPL"
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "dbus-glib gconf libnotify gtk+"
 RRECOMMENDS_${PN} = "gnome-icon-theme"
diff --git a/recipes/bluez/bluez-utils.inc b/recipes/bluez/bluez-utils.inc
index 9933748eb6..dfe64c3bb5 100644
--- a/recipes/bluez/bluez-utils.inc
+++ b/recipes/bluez/bluez-utils.inc
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 DEPENDS = "gstreamer gst-plugins-base bluez-libs-${PV} virtual/libusb0 dbus cups"
 PROVIDES = "bluez-utils-dbus"
 RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
-RREPLACES = "bluez-utils-dbus"
+RREPLACES_${PN} = "bluez-utils-dbus"
 RCONFLICTS_${PN} = "bluez-utils-nodbus"
 LICENSE = "GPL"
 
diff --git a/recipes/bluez/bluez-utils3.inc b/recipes/bluez/bluez-utils3.inc
index d75745954d..c3899dbb68 100644
--- a/recipes/bluez/bluez-utils3.inc
+++ b/recipes/bluez/bluez-utils3.inc
@@ -4,11 +4,11 @@ PRIORITY = "optional"
 DEPENDS = "gstreamer gst-plugins-base bluez-libs-${PV} virtual/libusb0 dbus glib-2.0"
 PROVIDES = "bluez-utils-dbus"
 RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
-RREPLACES = "bluez-utils-dbus"
+RREPLACES_${PN} = "bluez-utils-dbus"
 RCONFLICTS_${PN} = "bluez-utils-nodbus"
 LICENSE = "GPL"
 
-FILESPATH = "${FILE_DIRNAME}/bluez-utils-${PV}:${FILE_DIRNAME}/bluez-utils"
+FILESPATHPKG =. "bluez-utils-${PV}:bluez-utils:"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
            file://hcid.conf \
diff --git a/recipes/bluez/bluez.inc b/recipes/bluez/bluez.inc
index e4202f3bd5..039a4d83ea 100644
--- a/recipes/bluez/bluez.inc
+++ b/recipes/bluez/bluez.inc
@@ -3,15 +3,15 @@ SECTION = "console"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.bluez.org"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "gstreamer gst-plugins-base dbus glib-2.0"
 PROVIDES = "bluez-utils-dbus"
 RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
-RREPLACES = "bluez-utils-dbus"
+RREPLACES_${PN} = "bluez-utils-dbus"
 RCONFLICTS_${PN} = "bluez-utils-nodbus"
 
-FILESPATH = "${FILE_DIRNAME}/bluez-utils-${PV}:${FILE_DIRNAME}/bluez-utils"
+FILESPATHPKG =. "bluez-utils-${PV}:bluez-utils:"
 
 S = "${WORKDIR}/bluez-${PV}"