merge of a9cdfa26e73a0f7a055960fc96915e9e462c40f1

     and fa9802a4f987a77a22af80edcff827efa1174b62

4 files changed, 26 insertions, 26 deletions

diff --git a/packages/gpe-contacts/gpe-contacts-hildon_0.40.bb b/packages/gpe-contacts/gpe-contacts-hildon_0.40.bb
index 49f7e6533b..1762800b6d 100644
--- a/packages/gpe-contacts/gpe-contacts-hildon_0.40.bb
+++ b/packages/gpe-contacts/gpe-contacts-hildon_0.40.bb
@@ -1,9 +1,10 @@
 include gpe-contacts.inc
 
-PR="r1"
+PR="r2"
 SRC_URI = "${GPE_MIRROR}/gpe-contacts-${PV}.tar.bz2"
 
 DEPENDS += "gtk+-2.6.4-1.osso7 libgpepimc-hildon libosso hildon-lgpl"
+RDEPENDS = ""
 
 EXTRA_OECONF += "--enable-hildon"
 
diff --git a/packages/gpe-login/files/fixMakefile.translation.patch b/packages/gpe-login/files/fixMakefile.translation.patch
new file mode 100644
index 0000000000..88a093c60f
--- /dev/null
+++ b/packages/gpe-login/files/fixMakefile.translation.patch
@@ -0,0 +1,11 @@
+--- build/Makefile.translation	1 Jul 2005 13:44:49 -0000	1.44
++++ build/Makefile.translation	3 Jul 2005 10:29:38 -0000	1.45
+@@ -34,7 +34,7 @@
+ 	if [ "$(ENABLE_NLS)" != "no" ]; then \
+ 		if [ "x$(LINGUAS)" != "x" ]; then \
+ 			for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \
+-		fi;
++		fi; \
+ 	fi;
+ 
+ .po8.mo:;
diff --git a/packages/gpe-login/gpe-login_0.78.bb b/packages/gpe-login/gpe-login_0.78.bb
index e2d8d01136..234eebc0a1 100644
--- a/packages/gpe-login/gpe-login_0.78.bb
+++ b/packages/gpe-login/gpe-login_0.78.bb
@@ -8,4 +8,6 @@ MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
 RDEPENDS = "xkbd"
 RPROVIDES = "gpe-session-starter"
-PR = "r0"
+PR = "r1"
+
+SRC_URI += "file://fixMakefile.translation.patch;patch=1;pnum=0"
\ No newline at end of file
diff --git a/packages/meta/meta-maemo.bb b/packages/meta/meta-maemo.bb
index 2482be0351..4144a6c284 100644
--- a/packages/meta/meta-maemo.bb
+++ b/packages/meta/meta-maemo.bb
@@ -1,6 +1,6 @@
 
-PR          = "r5"
-PACKAGES    = maemo-task-base maemo-task-apps maemo-task-libs-install maemo-task-theme
+PR          = "r4"
+PACKAGES    = maemo-task-base maemo-task-apps maemo-task-libs-install
 DESCRIPTION = "Meta-package for maemo environment"
 MAINTAINER  = "Florian Boor <florian@kernelconcepts.de>"
 
@@ -28,14 +28,21 @@ 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 \
@@ -43,8 +50,7 @@ maemo-task-base = "\
     osso-core-config \
     osso-gnome-vfs2 \
     osso-thumbnail \
-    xauth \
-    esd"
+    xauth"
 
 RDEPENDS_maemo-task-base := "gdk-pixbuf-loader-png \
 			   gdk-pixbuf-loader-xpm \
@@ -52,26 +58,8 @@ 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 \
@@ -81,8 +69,6 @@ maemo-task-apps = "\
     hildon-navigator \
     hildon-control-panel \
     osso-application-installer \ 
-    osso-app-killer \
-    osso-screenshot-tool \
     gpe-todo-hildon \
     gpe-contacts-maemo"