aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngus Ainslie <nytowl@openmoko.org>2009-08-26 07:56:45 -0600
committerAngus Ainslie <nytowl@openmoko.org>2009-08-26 07:56:45 -0600
commita8bb4e2e62d212beb0d15787bd032d6308ca512e (patch)
treec88dece54e76fc19fb91b91f7c6f90b6f2dfeff2
parent333126d30e64f9a3afd54f5a081fb2f519ec29af (diff)
downloadopenembedded-a8bb4e2e62d212beb0d15787bd032d6308ca512e.zip
openembedded-a8bb4e2e62d212beb0d15787bd032d6308ca512e.tar.gz
openembedded-a8bb4e2e62d212beb0d15787bd032d6308ca512e.tar.bz2
paroli : add paroli-calculator and remove uneeded shr overidefso/milestone5.5
-rw-r--r--recipes/openmoko-projects/paroli_git.bb42
1 files changed, 17 insertions, 25 deletions
diff --git a/recipes/openmoko-projects/paroli_git.bb b/recipes/openmoko-projects/paroli_git.bb
index d41c2c7..58effb6 100644
--- a/recipes/openmoko-projects/paroli_git.bb
+++ b/recipes/openmoko-projects/paroli_git.bb
@@ -2,14 +2,14 @@ DESCRIPTION = "Paroli"
SECTION = "x11"
LICENSE = "GPL"
PV = "0.2.1+gitr${SRCREV}"
-PR = "r26"
+PR = "r27"
SRC_URI = "git://git.paroli-project.org/paroli.git;protocol=http"
S = "${WORKDIR}/git"
inherit distutils
-PACKAGES += "${PN}-autostart ${PN}-theme ${PN}-sounds"
+PACKAGES += "${PN}-autostart ${PN}-theme ${PN}-sounds ${PN}-calculator"
RDEPENDS = "\
python-datetime \
@@ -17,20 +17,6 @@ RDEPENDS = "\
python-textutils \
python-dbus \
python-pygobject \
- dbus-x11 \
- task-fso-compliance \
- elementary \
- elementary-themes \
- edbus-ehal \
- python-elementary \
-"
-
-RDEPENDS_shr = "\
- python-datetime \
- python-subprocess \
- python-textutils \
- python-dbus \
- python-pygobject \
python-elementary \
dbus-x11 \
task-fso-compliance \
@@ -39,6 +25,8 @@ RDEPENDS_shr = "\
edbus-ehal \
"
+RDEPENDS_${PN}-calculator = "paroli"
+
E_CONFIG_DIR="/usr/share/enlightenment/data"
RULES_YAML = rules.yaml
@@ -71,7 +59,7 @@ do_install_append() {
install -d ${D}${sysconfdir}/freesmartphone/oevents
install ${S}/data/${RULES_YAML} ${D}${sysconfdir}/freesmartphone/oevents/paroli_rules.yaml
- install ${S}/data/frameworkd.conf ${D}${sysconfdir}/paroli_frameworkd.conf
+# install ${S}/data/frameworkd.conf ${D}${sysconfdir}/paroli_frameworkd.conf
install -d ${D}${sysconfdir}/freesmartphone/opreferences/conf/phone
install ${S}/data/default.yaml ${D}${sysconfdir}/freesmartphone/opreferences/conf/phone/paroli_default.yaml
@@ -157,10 +145,16 @@ FILES_${PN} += " \
${sysconfdir}/dbus-1 \
${sysconfdir}/paroli \
${sysconfdir}/freesmartphone/oevents \
- ${sysconfdir}/paroli_frameworkd.conf \
-# ${sysconfdir}/frameworkd.conf \
+# ${sysconfdir}/paroli_frameworkd.conf \
${datadir}/lib \
${datadir}/bin \
+ ${datadir}/applications/common-for-edje \
+ ${datadir}/applications/i-o2 \
+ ${datadir}/applications/msgs2 \
+ ${datadir}/applications/paroli-launcher2 \
+ ${datadir}/applications/people2 \
+ ${datadir}/applications/settings \
+ ${datadir}/applications/tele2 \
${datadir}/applications \
${datadir}/elementary \
${datadir}/paroli \
@@ -168,6 +162,10 @@ FILES_${PN} += " \
${datadir}/dbus-1/system-services/ \
"
+FILES_${PN}-calculator += " \
+ ${datadir}/applications/calculator \
+ "
+
FILES_${PN}-theme = " \
${E_CONFIG_DIR}/themes \
${E_CONFIG_DIR}/config \
@@ -180,14 +178,8 @@ FILES_${PN}-sounds = " \
${sysconfdir}/freesmartphone/opreferences/conf/phone/paroli_default.yaml \
"
-#CONFILES_${PN}-theme = " \
-# ${sysconfdir}/enlightenment/default_profile \
-# "
-
CONFFILES_${PN} += " \
${sysconfdir}/paroli/paroli.cfg \
- ${sysconfdir}/paroli_frameworkd.conf \
-# ${sysconfdir}/frameworkd.conf \
${sysconfdir}/freesmartphone/oevents/paroli_rules.yaml \
"
CONFFILES_${PN}-sounds += " \