summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-05-17 22:13:14 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-05-17 22:13:14 +0000
commit1cc77842b921d55096211543c91b91ecca25ad81 (patch)
tree4dac25762f35b6392125f2e0bacf260a8d446c48
parent8bb942cfe86d9a37a3dbff31eb0163a3cab1c192 (diff)
parent378c7b7c13dfbd91cbf41ba63d78de9c9e604b13 (diff)
merge of '7f7ecaeecb75904bd446276f156340f12b4213c7'
and 'f4fc6d5b07cfbbf0922b31fa7a5f3163c120543d'
-rw-r--r--packages/freesmartphone/zhone_git.bb10
1 files changed, 2 insertions, 8 deletions
diff --git a/packages/freesmartphone/zhone_git.bb b/packages/freesmartphone/zhone_git.bb
index 419ee7a3e3..513b06f35a 100644
--- a/packages/freesmartphone/zhone_git.bb
+++ b/packages/freesmartphone/zhone_git.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "Zhone: Zen Phone"
LICENSE = "GPL"
SECTION = "x11"
DEPENDS = "edje-native"
-RDEPENDS = "task-python-efl python-textutils"
+RDEPENDS = "task-python-efl python-textutils python-dbus"
PV = "0.0.0+gitr${SRCREV}"
-PR = "r3"
+PR = "r4"
SRC_URI = "${FREESMARTPHONE_GIT}/zhone.git;protocol=git;branch=master \
file://80zhone"
@@ -12,10 +12,6 @@ S = "${WORKDIR}/git"
inherit autotools
-RDEPENDS_${PN} += "\
- python-dbus \
-"
-
do_install_append() {
install -d ${D}${sysconfdir}/X11/Xsession.d/
install -m 0755 ${WORKDIR}/80zhone ${D}${sysconfdir}/X11/Xsession.d/
@@ -23,7 +19,5 @@ do_install_append() {
FILES_${PN} += "${datadir} ${sysconfdir}"
-RCONFLICTS = "openmoko-session2"
-RREPLACES = "openmoko-session2"
PACKAGE_ARCH = "${MACHINE_ARCH}"