[oe-commits] org.oe.dev merge of '0bc3c3218eac32db6b13fb154e1fc29a0b348663'

[rwhitby commit]

merge of '0bc3c3218eac32db6b13fb154e1fc29a0b348663'
     and 'c1014f980e6dad4562c28412cfb1935df7ce9057'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 0c8a8c3dfe5c4029c990f8c832cb1deb0776314e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0c8a8c3dfe5c4029c990f8c832cb1deb0776314e
Files:
1
packages/meta/package-index.bb
packages/tasks/task-openmoko-feed.bb
Diffs:

#
# mt diff -r0bc3c3218eac32db6b13fb154e1fc29a0b348663 -r0c8a8c3dfe5c4029c990f8c832cb1deb0776314e
#
# 
# 
# patch "packages/meta/package-index.bb"
#  from [4f33564e2d11f46b7975676e5901b225190d4920]
#    to [913b2200fb1f3c012233ec7cb2c160ecfdc3ef15]
# 
============================================================
--- packages/meta/package-index.bb	4f33564e2d11f46b7975676e5901b225190d4920
+++ packages/meta/package-index.bb	913b2200fb1f3c012233ec7cb2c160ecfdc3ef15
@@ -1,13 +1,10 @@ LICENSE = "MIT"
 DESCRIPTION = "Rebuild the package index"
 LICENSE = "MIT"
-PR = "r3"
 
 INHIBIT_DEFAULT_DEPS = "1"
 ALLOW_EMPTY = "1"
 PACKAGES = ""
 
-inherit rootfs_ipk
-
 do_fetch() {
 }
 do_unpack() {
@@ -27,6 +24,6 @@ do_build() {
 do_build[dirs] = "${DEPLOY_DIR_IPK}"
 do_build() {
 	set -ex
-	rootfs_ipk_do_indexes
+	package_update_index_ipk
 	set +ex
 }


#
# mt diff -rc1014f980e6dad4562c28412cfb1935df7ce9057 -r0c8a8c3dfe5c4029c990f8c832cb1deb0776314e
#
# 
# 
# patch "packages/tasks/task-openmoko-feed.bb"
#  from [556642537d4bd3763b3a455f2bd4eb77bd92deca]
#    to [a7527c662326b7f7df77f0f2016d359069a4ebf3]
# 
============================================================
--- packages/tasks/task-openmoko-feed.bb	556642537d4bd3763b3a455f2bd4eb77bd92deca
+++ packages/tasks/task-openmoko-feed.bb	a7527c662326b7f7df77f0f2016d359069a4ebf3
@@ -1,15 +1,26 @@ LICENSE = "MIT"
 DESCRIPTION = "OpenMoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r4"
+PR = "r5"
 
 inherit task
 
 RDEPENDS_task-openmoko-feed = "\
-  ntpclient \
+  aspell enchant \
+  bluez-hcidump \
+  gpe-filemanager gpe-gallery gpe-timesheet gpe-todo \
+  kbdd \
+  midori \
+  mtpaint \
+  mysql \
+  nano \
+  ntpclient ntp \
   openssh openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc \
   python \
   python-pygtk \
   python-pyserial \
+  ruby \
   timezones \
+  tor \
+  vnc \
 "