diff options
| author | Oyvind Repvik <nail@nslu2-linux.org> | 2007-03-07 17:32:55 +0000 |
|---|---|---|
| committer | Oyvind Repvik <nail@nslu2-linux.org> | 2007-03-07 17:32:55 +0000 |
| commit | 079480197b5994d8249df626f5acdb3bdf8cf377 (patch) | |
| tree | 137754cd4f69ad0d57b9a2fe166d1e5e927b8ed6 /packages | |
| parent | 4cbe672fe63b18f22fd0f2161e90cced25cc1078 (diff) | |
| parent | 498d84d6e0bcf9c597e0c4e95a62c43e60a54ffa (diff) | |
merge of '0c12cf6126a10bee7a37d44010488011cec33290'
and 'f52433f8dadd3b7325c2976ace428e6d818efa9c'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/gnumeric/gnumeric_1.6.3.bb | 3 | ||||
| -rw-r--r-- | packages/tasks/task-gpephone.bb | 4 | ||||
| -rw-r--r-- | packages/tasks/task-openmoko.bb | 11 |
3 files changed, 14 insertions, 4 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 := "\ diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index 1d748f1235..ae705dd387 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -5,7 +5,7 @@ PACKAGE_ARCH = "all" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r28" +PR = "r29" PACKAGES = "\ task-openmoko-linux \ @@ -153,16 +153,23 @@ RDEPENDS_task-openmoko-demo = "\ matchbox-keyboard \ matchbox-stroke \ matchbox-config-gtk \ - matchbox-panel-manager \ + matchbox-panel-2-applets \ matchbox-panel-hacks \ matchbox-themes-extra \ matchbox-themes-gtk \ matchbox-applet-inputmanager \ matchbox-applet-startup-monitor \ + openmoko-panel-battery \ + openmoko-panel-clock \ + openmoko-panel-demo \ + openmoko-panel-demo-simple \ + openmoko-panel-gsm \ + openmoko-panel-mainmenu \ xcursor-transparent-theme \ settings-daemon \ web \ rxvt-unicode \ + gpe-terminal \ mtpaint \ " |