summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lord <chris@openedhand.com>2006-08-01 11:44:25 +0000
committerChris Lord <chris@openedhand.com>2006-08-01 11:44:25 +0000
commita7d6fa4c495a4082cf5bdf3b0c49d5277ed0aa00 (patch)
tree72a72101e2c9fa599978171dd0f2cc2edaec6e41
parent150c1ccc8880bbb649b6b234091bee0b02b86857 (diff)
downloadopenembedded-core-a7d6fa4c495a4082cf5bdf3b0c49d5277ed0aa00.tar.gz
openembedded-core-a7d6fa4c495a4082cf5bdf3b0c49d5277ed0aa00.tar.bz2
openembedded-core-a7d6fa4c495a4082cf5bdf3b0c49d5277ed0aa00.tar.xz
openembedded-core-a7d6fa4c495a4082cf5bdf3b0c49d5277ed0aa00.zip
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
-rw-r--r--meta/packages/settings-daemon/files/settings-daemon.schemas17
-rw-r--r--meta/packages/settings-daemon/settings-daemon_svn.bb9
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 05b06c202..000000000
--- 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 89e616391..5e2a12268 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/