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

[oe commit]

merge of '0a2d2ceb69c74512829d68b0e0a1d8854d70773b'
     and '47f50b0caeb4ce0ed68e21f71ad68ae79e309be3'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 879ebbc754df1f84127a2e397b8ab318636fdf13
ViewMTN: http://monotone.openembedded.org/revision/info/879ebbc754df1f84127a2e397b8ab318636fdf13
Files:
1
packages/freesmartphone/frameworkd/frameworkd.conf
packages/freesmartphone/frameworkd_git.bb
packages/e17/e-wm_cvs.bb
packages/efl1/edbus_cvs.bb
Diffs:

#
# mt diff -r0a2d2ceb69c74512829d68b0e0a1d8854d70773b -r879ebbc754df1f84127a2e397b8ab318636fdf13
#
#
#
# patch "packages/freesmartphone/frameworkd/frameworkd.conf"
#  from [697eb26d6d7e3f74669a00fd1bfc2bfb9d7d260b]
#    to [5e6f2e0547480b2177479b77f8a70a0ecd837b93]
# 
# patch "packages/freesmartphone/frameworkd_git.bb"
#  from [e14a5bed6db028f0a4a120e7a0386c427c6b0d66]
#    to [655476c5576a79469c78d14aaefb466009b2b952]
#
============================================================
--- packages/freesmartphone/frameworkd/frameworkd.conf	697eb26d6d7e3f74669a00fd1bfc2bfb9d7d260b
+++ packages/freesmartphone/frameworkd/frameworkd.conf	5e6f2e0547480b2177479b77f8a70a0ecd837b93
@@ -13,7 +13,7 @@ disable = 0
 [powercontrol-neo]
 disable = 0
 
-[ophoned]
+[gsmd]
 modemtype = ti_calypso
 
 [opreferencesd]
============================================================
--- packages/freesmartphone/frameworkd_git.bb	e14a5bed6db028f0a4a120e7a0386c427c6b0d66
+++ packages/freesmartphone/frameworkd_git.bb	655476c5576a79469c78d14aaefb466009b2b952
@@ -1,11 +1,11 @@
-DESCRIPTION = "The freesmartphon.org Framework Daemon"
+DESCRIPTION = "The freesmartphone.org Framework Daemon"
 HOMEPAGE = "http://www.freesmartphone.org"
-AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de>"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de> et. al."
 SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
 PV = "0.8.0+gitr${SRCREV}"
-PR = "r3"
+PR = "r5"
 
 inherit distutils update-rc.d
 
@@ -36,5 +36,5 @@ RDEPENDS_${PN} += "\
   python-syslog \
 "
 
-FILES_${PN} += "${sysconfdir}"
+FILES_${PN} += "${sysconfdir} ${datadir}"
 FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/framework/subsystems/*/.debug"


#
# mt diff -r47f50b0caeb4ce0ed68e21f71ad68ae79e309be3 -r879ebbc754df1f84127a2e397b8ab318636fdf13
#
#
#
# patch "packages/e17/e-wm_cvs.bb"
#  from [81f90d064b09ff63f767ff889341f23d3fa631f9]
#    to [5c53abc6e9e40395b002bae0d1c4aa17c592ddcd]
# 
# patch "packages/efl1/edbus_cvs.bb"
#  from [e051cb48a3921952f001b55f34a5f92b4234574a]
#    to [92cd93f41a1490913a58140d71ca89cf74f3fff8]
#
============================================================
--- 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