Add latest maemo stuff to meta package, improve sorting by using more "task" metapack...

diff --git a/packages/meta/maemo-image.bb b/packages/meta/maemo-image.bb
index b9aad68..2adc88b 100644 (file)
--- a/packages/meta/maemo-image.bb
+++ b/packages/meta/maemo-image.bb
@@ -2,31 +2,24 @@
 # Meta package for maemo based system image
 #
 
-FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \
-                                maemo##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/maemo"
-FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \
-                                maemo##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/maemo"
-FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11"
+FEED_URIS_append_familiar   = " maemo##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/maemo"
 
-PR = "r1"
+PR = "r2"
 
 export IMAGE_BASENAME = "maemo-image"
 
 GUI_MACHINE_CLASS ?= "none"
 
-MAEMO_EXTRA_DEPENDS = "scap"
-MAEMO_EXTRA_INSTALL = "osso-af-services osso-af-base-apps scap"
+MAEMO_EXTRA_DEPENDS = "scap dosfstools"
+MAEMO_EXTRA_INSTALL = "osso-af-services osso-af-base-apps scap dosfstools"
 
-#prefer some versions of the maemo stack
-PREFERRED_VERSION_gtk+="gtk+-2.6.4-1.osso7"
-PREFERRED_VERSION_dbus = "0.23.1-osso5"
-PREFERRED_PROVIDER_gconf = "gconf-osso"
+XSERVER ?= "xserver-kdrive-omap"
 
 DEPENDS = "task-bootstrap \
           meta-maemo \
           ${MAEMO_EXTRA_DEPENDS}"
 
-export IPKG_INSTALL = "task-bootstrap maemo-task-base \
+export IPKG_INSTALL = "task-bootstrap maemo-task-base maemo-task-theme \
                       maemo-task-apps ${MAEMO_EXTRA_INSTALL} \
                       ${XSERVER}"
 

diff --git a/packages/meta/meta-maemo.bb b/packages/meta/meta-maemo.bb
index 4144a6c..2482be0 100644 (file)
--- a/packages/meta/meta-maemo.bb
+++ b/packages/meta/meta-maemo.bb
@@ -1,6 +1,6 @@
 
-PR          = "r4"
-PACKAGES    = maemo-task-base maemo-task-apps maemo-task-libs-install
+PR          = "r5"
+PACKAGES    = maemo-task-base maemo-task-apps maemo-task-libs-install maemo-task-theme
 DESCRIPTION = "Meta-package for maemo environment"
 MAINTAINER  = "Florian Boor <florian@kernelconcepts.de>"
 
@@ -28,21 +28,14 @@ RDEPENDS_maemo-task-libs-install := "${maemo-task-libs-install}"
 maemo-task-base = "\
     bluez-utils-dbus \
     matchbox \
-    xcursor-transparent-theme \
-    sdk-default-theme \
-    sdk-default-theme-config \
-    sdk-default-icons \
-    sapwood \
     shared-mime-info \
     rxvt-unicode \
     xst \
     xhost \
     xrdb \
-    ttf-bitstream-vera \
     libgtkstylus \
     detect-stylus \
     outo \
-    sapwood \
     hildon-initscripts \
     libosso \
     osso-af-utils \
@@ -50,7 +43,8 @@ maemo-task-base = "\
     osso-core-config \
     osso-gnome-vfs2 \
     osso-thumbnail \
-    xauth"
+    xauth \
+    esd"
 
 RDEPENDS_maemo-task-base := "gdk-pixbuf-loader-png \
                           gdk-pixbuf-loader-xpm \
@@ -58,8 +52,26 @@ RDEPENDS_maemo-task-base := "gdk-pixbuf-loader-png \
                           pango-module-basic-x \
                           pango-module-basic-fc \
                           ${maemo-task-base}"
+
 DEPENDS += " ${maemo-task-base}"
 
+
+maemo-task-theme = "\
+    xcursor-transparent-theme \
+    sdk-default-theme \
+    sdk-default-theme-config \
+    sdk-default-icons \
+    sapwood \
+    ttf-bitstream-vera \
+    sapwood \
+    osso-sounds"
+
+RDEPENDS_maemo-task-theme := "${maemo-task-theme}"
+
+DEPENDS += " ${maemo-task-theme}"
+
+
+
 maemo-task-apps = "\
     osso-gwobex \
     osso-gwconnect \
@@ -69,6 +81,8 @@ maemo-task-apps = "\
     hildon-navigator \
     hildon-control-panel \
     osso-application-installer \ 
+    osso-app-killer \
+    osso-screenshot-tool \
     gpe-todo-hildon \
     gpe-contacts-maemo"