diff options
| author | Chris Lord <chris@openedhand.com> | 2006-08-01 11:44:25 +0000 |
|---|---|---|
| committer | Chris Lord <chris@openedhand.com> | 2006-08-01 11:44:25 +0000 |
| commit | a7d6fa4c495a4082cf5bdf3b0c49d5277ed0aa00 (patch) | |
| tree | 72a72101e2c9fa599978171dd0f2cc2edaec6e41 /meta | |
| parent | 150c1ccc8880bbb649b6b234091bee0b02b86857 (diff) | |
| download | poky-a7d6fa4c495a4082cf5bdf3b0c49d5277ed0aa00.tar.gz | |
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
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/settings-daemon/files/settings-daemon.schemas | 17 | ||||
| -rw-r--r-- | meta/packages/settings-daemon/settings-daemon_svn.bb | 9 |
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 @@ | |||
| 1 | <gconfschemafile> | ||
| 2 | <schemalist> | ||
| 3 | |||
| 4 | <schema> | ||
| 5 | <key>/schemas/desktop/poky/interface/theme</key> | ||
| 6 | <applyto>/desktop/poky/interface/theme</applyto> | ||
| 7 | <type>string</type> | ||
| 8 | <owner>settings-daemon</owner> | ||
| 9 | <default>Clearlooks</default> | ||
| 10 | <locale name="C"> | ||
| 11 | <short>Palmtop theme</short> | ||
| 12 | <long>The theme name for Matchbox and GTK+ to use.</long> | ||
| 13 | </locale> | ||
| 14 | </schema> | ||
| 15 | </schemalist> | ||
| 16 | </gconfschemafile> | ||
| 17 | |||
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" | |||
| 2 | LICENSE = "GPL" | 2 | LICENSE = "GPL" |
| 3 | DEPENDS = "gconf glib-2.0" | 3 | DEPENDS = "gconf glib-2.0" |
| 4 | SECTION = "gpe" | 4 | SECTION = "gpe" |
| 5 | PV = "0.0+svn${SRCDATE}" | ||
| 6 | PR = "r1" | ||
| 5 | 7 | ||
| 6 | SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ | 8 | SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ |
| 7 | file://70settings-daemon" | 9 | file://70settings-daemon" |
| 8 | # file://settings-daemon.schemas" | ||
| 9 | 10 | ||
| 10 | S = "${WORKDIR}/${PN}" | 11 | S = "${WORKDIR}/${PN}" |
| 11 | 12 | ||
| 12 | PV = "0.0+svn${SRCDATE}" | ||
| 13 | PR = "r1" | ||
| 14 | |||
| 15 | inherit autotools pkgconfig gettext gconf | 13 | inherit autotools pkgconfig gettext gconf |
| 16 | # gconf | ||
| 17 | 14 | ||
| 18 | FILES_${PN} = "${bindir} ${sysconfdir}" | 15 | FILES_${PN} = "${bindir} ${sysconfdir}" |
| 19 | 16 | ||
| @@ -22,5 +19,3 @@ do_install_append () { | |||
| 22 | install -m 755 ${WORKDIR}/70settings-daemon ${D}/${sysconfdir}/X11/Xsession.d/ | 19 | install -m 755 ${WORKDIR}/70settings-daemon ${D}/${sysconfdir}/X11/Xsession.d/ |
| 23 | } | 20 | } |
| 24 | 21 | ||
| 25 | # install -d ${D}/${sysconfdir}/gconf/schemas | ||
| 26 | # install -m 644 ${WORKDIR}/settings-daemon.schemas ${D}/${sysconfdir}/gconf/schemas/ | ||