[oe-commits] org.oe.dev merge of '332a00dc550ca182177c40331ae4e05ba59793e0'

[koen commit]

merge of '332a00dc550ca182177c40331ae4e05ba59793e0'
     and 'aa744207a479e8c8226e2ab5eceab4897c4cd863'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: b30f5071d106efd92d97d7e0c735332475c0ee26
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b30f5071d106efd92d97d7e0c735332475c0ee26
Files:
1
classes/sanity.bbclass
packages/openmoko-apps/openmoko-rssreader_svn.bb
conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
packages/opie-alarm/opie-alarm_cvs.bb
Diffs:

#
# mt diff -r332a00dc550ca182177c40331ae4e05ba59793e0 -rb30f5071d106efd92d97d7e0c735332475c0ee26
#
# 
# 
# patch "classes/sanity.bbclass"
#  from [dcb94eb7036e5db9888430963dfbead08880632d]
#    to [95fd13bb43f72d6183d34fd1c7babdc5fd181427]
# 
# patch "packages/openmoko-apps/openmoko-rssreader_svn.bb"
#  from [413a32e69453ed84ebeba692f3795ebaa83bef8f]
#    to [cdd9a012395501606080a4fd591a4a3a39a0be4f]
# 
============================================================
--- classes/sanity.bbclass	dcb94eb7036e5db9888430963dfbead08880632d
+++ classes/sanity.bbclass	95fd13bb43f72d6183d34fd1c7babdc5fd181427
@@ -89,7 +89,7 @@ def check_sanity(e):
 	if not check_app_exists('${BUILD_PREFIX}g++', e.data):
 		missing = missing + "C++ Compiler (${BUILD_PREFIX}g++),"
 
-	required_utilities = "patch diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk md5sum bison"
+	required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk md5sum bison"
 
 	for util in required_utilities.split():
 		if not check_app_exists( util, e.data ):
============================================================
--- packages/openmoko-apps/openmoko-rssreader_svn.bb	413a32e69453ed84ebeba692f3795ebaa83bef8f
+++ packages/openmoko-apps/openmoko-rssreader_svn.bb	cdd9a012395501606080a4fd591a4a3a39a0be4f
@@ -1,6 +1,6 @@ SECTION = "openmoko/applications"
 DESCRIPTION = "The OpenMoko RSS Reader"
 SECTION = "openmoko/applications"
-DEPENDS += "libmrss check"
+DEPENDS += "libmrss check webkit"
 
 PV = "0.0.1+svn${SRCDATE}"
 PR = "r1"


#
# mt diff -raa744207a479e8c8226e2ab5eceab4897c4cd863 -rb30f5071d106efd92d97d7e0c735332475c0ee26
#
# 
# 
# patch "conf/distro/include/preferred-opie-versions-1.2.3-pre.inc"
#  from [274dcb7d5c72996b49644fa765c72f56ce8f956e]
#    to [2ed176b9d093b41fb1abb2ec3d3fffaed7673a66]
# 
# patch "packages/opie-alarm/opie-alarm_cvs.bb"
#  from [ab53754a45a99c30cb4df8437d42d73aad9d163e]
#    to [729efab276ac16baecddae1fc83592ec38182ff4]
# 
============================================================
--- conf/distro/include/preferred-opie-versions-1.2.3-pre.inc	274dcb7d5c72996b49644fa765c72f56ce8f956e
+++ conf/distro/include/preferred-opie-versions-1.2.3-pre.inc	2ed176b9d093b41fb1abb2ec3d3fffaed7673a66
@@ -1,9 +1,9 @@ PALMTOP_USE_MULTITHREADED_QT ?= "yes"
 #
 # Default versions
 QTE_VERSION ?= "2.3.10"
 PALMTOP_USE_MULTITHREADED_QT ?= "yes"
 
-OPIE_SRCDATE ?= "20070717"
+OPIE_SRCDATE ?= "20070724"
 OPIE_VERSION ?= "1.2.2+cvs${OPIE_SRCDATE}"
 OPIE_CVS_PV ?= "1.2.2+cvs${OPIE_SRCDATE}"
 
============================================================
--- packages/opie-alarm/opie-alarm_cvs.bb	ab53754a45a99c30cb4df8437d42d73aad9d163e
+++ packages/opie-alarm/opie-alarm_cvs.bb	729efab276ac16baecddae1fc83592ec38182ff4
@@ -1,7 +1,7 @@ PV = "${OPIE_CVS_PV}"
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r2.1"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/opiealarm \
            file://01opiealarm \