6 files changed, 10 insertions, 6 deletions
diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb
index 0532166748..7523f6bfc7 100644
--- a/packages/freesmartphone/frameworkd_git.bb
+++ b/packages/freesmartphone/frameworkd_git.bb
@@ -4,7 +4,7 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de> et. al."
 SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
-PV = "0.8.2+gitr${SRCREV}"
+PV = "0.8.2+${PR}-gitr${SRCREV}"
 PR = "r0"
 
 inherit distutils update-rc.d
diff --git a/packages/freesmartphone/fso-gpsd_git.bb b/packages/freesmartphone/fso-gpsd_git.bb
index 2f99ea9760..85cb5194b5 100644
--- a/packages/freesmartphone/fso-gpsd_git.bb
+++ b/packages/freesmartphone/fso-gpsd_git.bb
@@ -2,10 +2,14 @@ DESCRIPTION = "gspd compatibility layer for frameworkd"
 LICENSE = "GPL"
 SECTION = "network"
 DEPENDS = "dbus-glib"
-PV = "0.5+gitr${SRCREV}"
+PV = "0.6+${PR}+gitr${SRCREV}"
 PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/fso-gpsd.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
 
 inherit autotools
+
+RPROVIDES_${PN} = "gpsd"
+RCONFLICTS_${PN} = "gpsd"
+RREPLACES_${PN} = "gpsd"
diff --git a/packages/freesmartphone/gsm0710muxd_git.bb b/packages/freesmartphone/gsm0710muxd_git.bb
index d5e9bd0672..0c146079d0 100644
--- a/packages/freesmartphone/gsm0710muxd_git.bb
+++ b/packages/freesmartphone/gsm0710muxd_git.bb
@@ -5,7 +5,7 @@ SECTION = "console/network"
 DEPENDS = "dbus dbus-glib"
 RDEPENDS = "dbus dbus-glib"
 LICENSE = "GPL"
-PV = "0.9.1+gitr${SRCREV}"
+PV = "0.9.1+${PR}-gitr${SRCREV}"
 PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/gsm0710muxd.git;protocol=git;branch=master"
diff --git a/packages/freesmartphone/gsmd2_git.bb b/packages/freesmartphone/gsmd2_git.bb
index 6c327ede30..0432927d16 100644
--- a/packages/freesmartphone/gsmd2_git.bb
+++ b/packages/freesmartphone/gsmd2_git.bb
@@ -5,7 +5,7 @@ SECTION = "console/network"
 DEPENDS = "dbus dbus-glib"
 RDEPENDS = "gsm0710muxd"
 LICENSE = "GPL"
-PV = "0.1.0+gitr${SRCREV}"
+PV = "0.1.0+${PR}-gitr${SRCREV}"
 PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/gsmd2.git;protocol=git;branch=master"
diff --git a/packages/freesmartphone/illume-theme-freesmartphone_git.bb b/packages/freesmartphone/illume-theme-freesmartphone_git.bb
index 1ff193e87b..1e6306f624 100644
--- a/packages/freesmartphone/illume-theme-freesmartphone_git.bb
+++ b/packages/freesmartphone/illume-theme-freesmartphone_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Illume theme for the freesmartphone.org project"
 HOMEPAGE = "http://illume.projects.openmoko.org/"
 LICENSE = "MIT/BSD"
 DEPENDS = "edje-native eet-native"
-PV = "0.0+gitr${SRCREV}"
+PV = "0.0+${PR}-gitr${SRCREV}"
 PR = "r2"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/artwork.git;protocol=git;branch=master"
diff --git a/packages/freesmartphone/zhone_git.bb b/packages/freesmartphone/zhone_git.bb
index 55b56c8e26..e5c16fabad 100644
--- a/packages/freesmartphone/zhone_git.bb
+++ b/packages/freesmartphone/zhone_git.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 SECTION = "x11"
 DEPENDS = "edje-native python-pyrex-native python-cython-native"
 RDEPENDS = "task-python-efl python-textutils python-dbus python-pycairo"
-PV = "0.0.0+gitr${SRCREV}"
+PV = "0.0.0+${PR}-gitr${SRCREV}"
 PR = "r8"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/zhone.git;protocol=git;branch=master \