summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-03-07 16:47:25 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-03-07 16:47:25 +0000
commit3a72565ebf8f5cc366a8b04e23adcf402b05541d (patch)
tree6d1ca209df129cee3fbb8a17995144105e7e814d
parent1614567a19ca570e9134a99079f61c34711d315d (diff)
parente1feec31ce68a87f85b3d735f530f4e0cf6bf542 (diff)
merge of 'b0902151107c9e0c0fc121ba37c6b72aad2172f9'
and 'ecb927de3eaab5791424a9ef99e3e3a97c12c7b3'
-rw-r--r--packages/gnumeric/gnumeric_1.6.3.bb3
-rw-r--r--packages/tasks/task-gpephone.bb4
2 files changed, 5 insertions, 2 deletions
diff --git a/packages/gnumeric/gnumeric_1.6.3.bb b/packages/gnumeric/gnumeric_1.6.3.bb
index c41b971530..9c757fb7ff 100644
--- a/packages/gnumeric/gnumeric_1.6.3.bb
+++ b/packages/gnumeric/gnumeric_1.6.3.bb
@@ -4,6 +4,8 @@ S = "${WORKDIR}/gnumeric-${PV}"
DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui"
DESCRIPTION = "Gnumeric spreadsheet for GNOME"
+PR = "r1"
+
inherit gnome flow-lossage
SRC_URI += "file://remove-docs.patch;patch=1"
@@ -12,6 +14,7 @@ EXTRA_OECONF=" --without-perl "
PACKAGES_DYNAMIC = "gnumeric-plugin-*"
+FILES_${PN}-dbg += "${libdir}/gnumeric/1.6.3/plugins/*/.debug"
FILES_gnumeric_append = " /usr/lib/libspreadsheet-${PV}.so "
python populate_packages_prepend () {
diff --git a/packages/tasks/task-gpephone.bb b/packages/tasks/task-gpephone.bb
index 87f8c01749..e03886f0fd 100644
--- a/packages/tasks/task-gpephone.bb
+++ b/packages/tasks/task-gpephone.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Task packages for GPE Palmtop Environment Phone Edition"
-PR = "r2"
+PR = "r3"
LICENSE = "MIT"
ALLOW_EMPTY = "1"
@@ -67,8 +67,8 @@ RDEPENDS_gpephone-task-base := "\
pango-module-basic-x \
pango-module-basic-fc \
detect-stylus \
+ libgtkinput \
${@base_contains("MACHINE_FEATURES", "touchscreen", "libgtkstylus xtscal", "",d)} \
- ${@base_contains("MACHINE_FEATURES", "keyboard", "", "libgtkinput",d)} \
"
RDEPENDS_gpephone-task-pim := "\