settings-daemon: merge changes from Poky (proper PV, dependencies)

diff --git a/packages/settings-daemon/settings-daemon_svn.bb b/packages/settings-daemon/settings-daemon_svn.bb
index b81c6c3..b427176 100644 (file)
--- a/packages/settings-daemon/settings-daemon_svn.bb
+++ b/packages/settings-daemon/settings-daemon_svn.bb
@@ -1,16 +1,17 @@
-DESCRIPTION = "Settings-daemon is a bridge between xst/gpe-confd and gconf"
+DESCRIPTION = "Settings-daemon provides a bridge between gconf and xsettings"
 LICENSE = "GPL"
-DEPENDS = "gconf xst glib-2.0"
+DEPENDS = "gconf glib-2.0"
+RDEPENDS = "xrdb"
 SECTION = "x11"
-
-PR = "r1"
+PV = "0.0+svn${SRCDATE}"
+PR = "r2"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
           file://70settings-daemon"
 
 S = "${WORKDIR}/${PN}"
 
-inherit autotools pkgconfig gettext
+inherit autotools pkgconfig gettext gconf
 
 FILES_${PN} =  "${bindir}/* ${sysconfdir}"
 
@@ -18,3 +19,4 @@ do_install_append () {
        install -d ${D}/${sysconfdir}/X11/Xsession.d
        install -m 755 ${WORKDIR}/70settings-daemon ${D}/${sysconfdir}/X11/Xsession.d/
 }
+