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

[mickeyl commit]

merge of '0cb6ae9adc44c4c9b9075a61d9a73a9c2978e89d'
     and '61916fde303a24e027564cf07127b974edcf2ce8'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 47f50b0caeb4ce0ed68e21f71ad68ae79e309be3
ViewMTN: http://monotone.openembedded.org/revision/info/47f50b0caeb4ce0ed68e21f71ad68ae79e309be3
Files:
1
packages/freesmartphone/frameworkd/frameworkd.conf
packages/freesmartphone/frameworkd_git.bb
packages/linux/linux-omap2-git/beagleboard/0001-omap3-cpuidle.patch
packages/linux/linux-omap2-git/beagleboard/0002-omap3-cpuidle.patch
packages/linux/linux-omap2-git/beagleboard/fix-dispc-clocks.patch
packages/linux/linux-omap2-git/omap3evm/0001-omap3-cpuidle.patch
packages/linux/linux-omap2-git/omap3evm/0002-omap3-cpuidle.patch
Diffs:

#
# mt diff -r0cb6ae9adc44c4c9b9075a61d9a73a9c2978e89d -r47f50b0caeb4ce0ed68e21f71ad68ae79e309be3
#
#
#
# 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 -r61916fde303a24e027564cf07127b974edcf2ce8 -r47f50b0caeb4ce0ed68e21f71ad68ae79e309be3
#
#
#
# patch "packages/linux/linux-omap2-git/beagleboard/0001-omap3-cpuidle.patch"
#  from [91c3d0a6224a49772f836023095df61194e6ca80]
#    to [da122a0b580dcab240c34313b0d32d0bb1b46d51]
# 
# patch "packages/linux/linux-omap2-git/beagleboard/0002-omap3-cpuidle.patch"
#  from [b6a63ccfb40c5bcb4f97d87a16af46efd3f441e0]
#    to [b02d7738a08ab20b0e149590e025b56110c7c644]
# 
# patch "packages/linux/linux-omap2-git/beagleboard/fix-dispc-clocks.patch"
#  from [d4754ea80e0f0bdb6d98843867b0505738c47471]
#    to [5431ff35c8f9aa3cb43e4ef7044ab72005c9be98]
# 
# patch "packages/linux/linux-omap2-git/omap3evm/0001-omap3-cpuidle.patch"
#  from [91c3d0a6224a49772f836023095df61194e6ca80]
#    to [da122a0b580dcab240c34313b0d32d0bb1b46d51]
# 
# patch "packages/linux/linux-omap2-git/omap3evm/0002-omap3-cpuidle.patch"
#  from [b6a63ccfb40c5bcb4f97d87a16af46efd3f441e0]
#    to [b02d7738a08ab20b0e149590e025b56110c7c644]
#
============================================================
--- packages/linux/linux-omap2-git/beagleboard/0001-omap3-cpuidle.patch	91c3d0a6224a49772f836023095df61194e6ca80
+++ packages/linux/linux-omap2-git/beagleboard/0001-omap3-cpuidle.patch	da122a0b580dcab240c34313b0d32d0bb1b46d51
============================================================
--- packages/linux/linux-omap2-git/beagleboard/0002-omap3-cpuidle.patch	b6a63ccfb40c5bcb4f97d87a16af46efd3f441e0
+++ packages/linux/linux-omap2-git/beagleboard/0002-omap3-cpuidle.patch	b02d7738a08ab20b0e149590e025b56110c7c644
============================================================
--- packages/linux/linux-omap2-git/beagleboard/fix-dispc-clocks.patch	d4754ea80e0f0bdb6d98843867b0505738c47471
+++ packages/linux/linux-omap2-git/beagleboard/fix-dispc-clocks.patch	5431ff35c8f9aa3cb43e4ef7044ab72005c9be98
============================================================
--- packages/linux/linux-omap2-git/omap3evm/0001-omap3-cpuidle.patch	91c3d0a6224a49772f836023095df61194e6ca80
+++ packages/linux/linux-omap2-git/omap3evm/0001-omap3-cpuidle.patch	da122a0b580dcab240c34313b0d32d0bb1b46d51
============================================================
--- packages/linux/linux-omap2-git/omap3evm/0002-omap3-cpuidle.patch	b6a63ccfb40c5bcb4f97d87a16af46efd3f441e0
+++ packages/linux/linux-omap2-git/omap3evm/0002-omap3-cpuidle.patch	b02d7738a08ab20b0e149590e025b56110c7c644