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

[mickeyl commit]

merge of '0a4c4e919413e2fd4aff39b1053c41c247b9c30f'
     and 'f63d89980b66ed036447c254c9d7b544d095d25a'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: ab67136770cfd4c66edd2982006f5c09325ec6d2
ViewMTN: http://monotone.openembedded.org/revision/info/ab67136770cfd4c66edd2982006f5c09325ec6d2
Files:
1
packages/python/python-psyco_1.5.bb
packages/python/python-psyco_1.6.bb
packages/e17/e-wm_cvs.bb
packages/efl1/edbus_cvs.bb
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2_git.bb
Diffs:

#
# mt diff -r0a4c4e919413e2fd4aff39b1053c41c247b9c30f -rab67136770cfd4c66edd2982006f5c09325ec6d2
#
#
#
# rename "packages/python/python-psyco_1.5.bb"
#     to "packages/python/python-psyco_1.6.bb"
#


#
# mt diff -rf63d89980b66ed036447c254c9d7b544d095d25a -rab67136770cfd4c66edd2982006f5c09325ec6d2
#
#
#
# patch "packages/e17/e-wm_cvs.bb"
#  from [81f90d064b09ff63f767ff889341f23d3fa631f9]
#    to [5c53abc6e9e40395b002bae0d1c4aa17c592ddcd]
# 
# patch "packages/efl1/edbus_cvs.bb"
#  from [e051cb48a3921952f001b55f34a5f92b4234574a]
#    to [92cd93f41a1490913a58140d71ca89cf74f3fff8]
# 
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
#  from [f787aef6cd94974adc72c0e211adaae68d2f52b0]
#    to [f6e9c74dc06e456b2758005cb71361a7c78b36ed]
# 
# patch "packages/linux/linux-omap2_git.bb"
#  from [6d82490991d819c3df545adaf56e0793e3a9838e]
#    to [ec12dfb895c8dfaff3b7a30381c2cab7b66ce4bf]
#
============================================================
--- packages/e17/e-wm_cvs.bb	81f90d064b09ff63f767ff889341f23d3fa631f9
+++ packages/e17/e-wm_cvs.bb	5c53abc6e9e40395b002bae0d1c4aa17c592ddcd
@@ -1,8 +1,8 @@ DESCRIPTION = "The Enlightenment Window 
 DESCRIPTION = "The Enlightenment Window Mananger Version 17"
-DEPENDS = "eet evas ecore edje efreet"
+DEPENDS = "eet evas ecore edje efreet edbus"
 LICENSE = "MIT BSD"
 PV = "0.16.999.042+cvs${SRCDATE}"
-PR = "r8"
+PR = "r9"
 
 inherit e update-alternatives
 
============================================================
--- packages/efl1/edbus_cvs.bb	e051cb48a3921952f001b55f34a5f92b4234574a
+++ packages/efl1/edbus_cvs.bb	92cd93f41a1490913a58140d71ca89cf74f3fff8
@@ -1,8 +1,8 @@ DESCRIPTION = "DBus and HAL convenience 
 DESCRIPTION = "DBus and HAL convenience wrappers for EFL"
-DEPENDS = "dbus ecore efreet ewl"
+DEPENDS = "dbus ecore"
 LICENSE = "MIT BSD"
 PV = "0.5.0.043+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 inherit efl
 
============================================================
--- packages/linux/linux-omap2-git/beagleboard/defconfig	f787aef6cd94974adc72c0e211adaae68d2f52b0
+++ packages/linux/linux-omap2-git/beagleboard/defconfig	f6e9c74dc06e456b2758005cb71361a7c78b36ed
@@ -1592,7 +1592,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_PCF8563 is not set
 # CONFIG_RTC_DRV_PCF8583 is not set
 # CONFIG_RTC_DRV_M41T80 is not set
-CONFIG_RTC_DRV_TWL4030=y
+CONFIG_RTC_DRV_TWL4030=n
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_FM3130 is not set
 
============================================================
--- packages/linux/linux-omap2_git.bb	6d82490991d819c3df545adaf56e0793e3a9838e
+++ packages/linux/linux-omap2_git.bb	ec12dfb895c8dfaff3b7a30381c2cab7b66ce4bf
@@ -5,7 +5,7 @@ PV = "2.6.25+2.6.26-rc8+${PR}+git${SRCRE
 SRCREV = "050684c18f2ea0b08fdd5233a0cd3c7f96e00a0e"
 
 PV = "2.6.25+2.6.26-rc8+${PR}+git${SRCREV}"
-PR = "r32"
+PR = "r33"
 
 
 SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \