merge of '274cb1a3f97188420857e4b0650a1ace718148a6'

     and '8091ca9b08503f4700e05ee8973cec755727ed4a'

5 files changed, 16 insertions, 17 deletions

diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 4898e84a33..09908b1f23 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -44,7 +44,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 DISTRO_CORE_PACKAGE ?= "task-base-core-default"
 
 #
-# task-base 
+# task-base
 #
 RDEPENDS_task-base = "\
     ${DISTRO_CORE_PACKAGE} \
@@ -117,7 +117,7 @@ RDEPENDS_task-base-core-default = '\
     fuser \
     setserial'
 # Lets see if we can kill off hotplug...
-#    ${HOTPLUG} 
+#    ${HOTPLUG}
 #    ${@bootstrap_modutils_rdepends(d)}
 
 
@@ -289,22 +289,22 @@ task-distro-nfs-rrecommends = "\
 
 
 # Tosort
-# kernel-module-ipv6 
+# kernel-module-ipv6
 # kernel-module-nvrd
 # kernel-module-mip6-mn
 # kernel-module-tun
-# kernel-module-ide-disk 
+# kernel-module-ide-disk
 # kernel-module-ide-probe-mo
 # kernel-module-loop
-# kernel-module-vfat 
+# kernel-module-vfat
 # kernel-module-ext2
-# kernel-module-sco 
+# kernel-module-sco
 # kernel-module-af_packet
-# kernel-module-ip-gre 
-# kernel-module-ip-tables 
+# kernel-module-ip-gre
+# kernel-module-ip-tables
 # kernel-module-ipip
-# kernel-module-des 
+# kernel-module-des
 # kernel-module-md5
 # kernel-module-8250
-# Should be DISTRO_EXTRA_RRECOMMENDS: lrzsz 
+# Should be DISTRO_EXTRA_RRECOMMENDS: lrzsz
 
diff --git a/packages/tasks/task-gpe.bb b/packages/tasks/task-gpe.bb
index bbc40457f7..b93c5b7165 100644
--- a/packages/tasks/task-gpe.bb
+++ b/packages/tasks/task-gpe.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for GPE Palmtop Environment"
-PR = "r3"
+PR = "r4"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
@@ -106,7 +106,6 @@ RDEPENDS_gpe-task-connectivity := "\
 
 RDEPENDS_gpe-task-apps-extra := "\
     gpe-filemanager \
-    gpe-nmf \
     gpe-soundbite \
     mbmerlin"
 
diff --git a/packages/tasks/task-opie.bb b/packages/tasks/task-opie.bb
index 984fa61584..616968ea36 100644
--- a/packages/tasks/task-opie.bb
+++ b/packages/tasks/task-opie.bb
@@ -170,7 +170,7 @@ RDEPENDS_task-opie-extra-apps = "opie-calculator opie-checkbook opie-mail opie-e
                         opie-rdesktop opie-wellenreiter opie-irc \
                         opie-mediaplayer2 \
                         qpdf2"
-# konqueror-embedded 
+# konqueror-embedded
 
 RDEPENDS_task-opie-extra-games = "opie-parashoot opie-mindbreaker opie-fifteen opie-tictac \
                          opie-tetrix"
diff --git a/packages/tasks/task-ossie.bb b/packages/tasks/task-ossie.bb
index 98f0a2d368..cd050342aa 100644
--- a/packages/tasks/task-ossie.bb
+++ b/packages/tasks/task-ossie.bb
@@ -7,7 +7,7 @@ PACKAGES = "task-ossie"
 
 ALLOW_EMPTY = "1"
 
-IPKG_INSTALL = "${OSSIE_BASE} ${OSSIE_PLATFORM} ${OSSIE_COMPONENTS} ${OSSIE_WAVEFORMS}"
+PACKAGE_INSTALL = "${OSSIE_BASE} ${OSSIE_PLATFORM} ${OSSIE_COMPONENTS} ${OSSIE_WAVEFORMS}"
 
 OSSIE_BASE = "screen procps xerces-c omniorb usrp"
 OSSIE_PLATFORM = "ossiecf ossie-standardinterfaces ossie-nodebooter ossie-c-wavloader"
diff --git a/packages/tasks/task-self-hosting.bb b/packages/tasks/task-self-hosting.bb
index 566e0956a0..87604a2dab 100644
--- a/packages/tasks/task-self-hosting.bb
+++ b/packages/tasks/task-self-hosting.bb
@@ -13,15 +13,15 @@ RDEPENDS = "cpp gcc-symlinks binutils-symlinks \
 #
 # bitbake will fetch all needed python modules
 #
-# toolchain: 
+# toolchain:
 # - gcc-symlinks will fetch gcc
 # - binutils-symlinks will fetch binutils
 # - glibc-utils REQ cpp
-# 
+#
 # problems:
 # - binutils-symlinks conflict with busybox
 # - glibc-dev conflict with libc-linux-headers-dev
-# - perl is so granulated that it is probably impossible 
+# - perl is so granulated that it is probably impossible
 #   to find out which packages are needed
 #