[oe-commits] Stefan Schmidt : fso-gpsd: Do not RCONFLICTS with gpsd for now as it will not show up in the image with this

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 3fd196635bcc6efe5c86fdcccc4849e1cb9fdd4f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=3fd196635bcc6efe5c86fdcccc4849e1cb9fdd4f

Author: Stefan Schmidt <stefan at datenfreihafen.org>
Date:   Fri Jan  9 16:06:42 2009 +0100

fso-gpsd: Do not RCONFLICTS with gpsd for now as it will not show up in the image with this

---

 packages/freesmartphone/fso-gpsd_git.bb |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/freesmartphone/fso-gpsd_git.bb b/packages/freesmartphone/fso-gpsd_git.bb
index 73e59be..cde1bb6 100644
--- a/packages/freesmartphone/fso-gpsd_git.bb
+++ b/packages/freesmartphone/fso-gpsd_git.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 SECTION = "network"
 DEPENDS = "dbus-glib"
 PV = "0.8+gitr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "\
   ${FREESMARTPHONE_GIT}/fso-gpsd.git;protocol=git;branch=master \
@@ -24,4 +24,6 @@ do_install_append() {
 FILES_${PN} += "${sysconfdir}"
 RDEPENDS_${PN} = "frameworkd"
 RPROVIDES_${PN} = "gpsd"
-RCONFLICTS_${PN} = "gpsd"
+# Disabled as we always got gpsd but not fso-gpsd in the fso-image. Needs
+# fixing.
+#RCONFLICTS_${PN} = "gpsd"