Update settings-daemon package (fix version, inherit gconf) - this may have already been done.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@588 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 2 insertions, 24 deletions

diff --git a/meta/packages/settings-daemon/files/settings-daemon.schemas b/meta/packages/settings-daemon/files/settings-daemon.schemas
deleted file mode 100644
index 05b06c2022..0000000000
--- a/meta/packages/settings-daemon/files/settings-daemon.schemas
+++ /dev/null
@@ -1,17 +0,0 @@
-<gconfschemafile>
-<schemalist>
-
-<schema>
-        <key>/schemas/desktop/poky/interface/theme</key>
-        <applyto>/desktop/poky/interface/theme</applyto>
-        <type>string</type>
-        <owner>settings-daemon</owner>
-        <default>Clearlooks</default>
-        <locale name="C">
-                <short>Palmtop theme</short>
-                <long>The theme name for Matchbox and GTK+ to use.</long>
-        </locale>
-</schema>
-</schemalist>
-</gconfschemafile>
-
diff --git a/meta/packages/settings-daemon/settings-daemon_svn.bb b/meta/packages/settings-daemon/settings-daemon_svn.bb
index 89e6163911..5e2a12268c 100644
--- a/meta/packages/settings-daemon/settings-daemon_svn.bb
+++ b/meta/packages/settings-daemon/settings-daemon_svn.bb
@@ -2,18 +2,15 @@ DESCRIPTION = "Settings-daemon is a bridge between xst/gpe-confd and gconf"
 LICENSE = "GPL"
 DEPENDS = "gconf glib-2.0"
 SECTION = "gpe"
+PV = "0.0+svn${SRCDATE}"
+PR = "r1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
            file://70settings-daemon"
-#          file://settings-daemon.schemas"
 
 S = "${WORKDIR}/${PN}"
 
-PV = "0.0+svn${SRCDATE}"
-PR = "r1"
-
 inherit autotools pkgconfig gettext gconf
-# gconf
 
 FILES_${PN} =   "${bindir} ${sysconfdir}"
 
@@ -22,5 +19,3 @@ do_install_append () {
         install -m 755 ${WORKDIR}/70settings-daemon ${D}/${sysconfdir}/X11/Xsession.d/
 }
 
-# install -d ${D}/${sysconfdir}/gconf/schemas
-# install -m 644 ${WORKDIR}/settings-daemon.schemas ${D}/${sysconfdir}/gconf/schemas/