[oe-commits] org.oe.dev merge of '79771edb5b4d45a18e509f01db9c473d1aa63962'

[koen commit]

merge of '79771edb5b4d45a18e509f01db9c473d1aa63962'
     and '835bda37b996295e3fb4a19b2f3d71f25cd0abca'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: cc636403f564221da3d8414814995f15cc87f684
ViewMTN: http://monotone.openembedded.org/revision.psp?id=cc636403f564221da3d8414814995f15cc87f684
Files:
1
packages/starling/starling_0.2.bb
packages/starling/starling_svn.bb
packages/gtkhtml2/gtkhtml2_cvs.bb
packages/gtkhtml2/gtkhtml2_svn.bb
packages/gaim/pidgin_2.1.0.bb
packages/e17/edje-editor_cvs.bb
packages/e17/edje-viewer_cvs.bb
packages/uboot/u-boot-mkimage-gta01-native_oe.bb
Diffs:

#
# mt diff -r79771edb5b4d45a18e509f01db9c473d1aa63962 -rcc636403f564221da3d8414814995f15cc87f684
#
# 
# 
# patch "packages/starling/starling_0.2.bb"
#  from [1289158f34b79de9d3820f8c6022a7107c0cb99a]
#    to [9d0522f1342ae339228f0a79a466835a9483cb9c]
# 
# patch "packages/starling/starling_svn.bb"
#  from [6486e2268453d17257250749dc505d0f9325d01e]
#    to [41c225219a46f25d88d800d602cfc111847d3a8b]
# 
============================================================
--- packages/starling/starling_0.2.bb	1289158f34b79de9d3820f8c6022a7107c0cb99a
+++ packages/starling/starling_0.2.bb	9d0522f1342ae339228f0a79a466835a9483cb9c
@@ -1,9 +1,10 @@ DEPENDS = "gtk+ libgpewidget gstreamer g
 DESCRIPTION = "Starling audio player for GPE"
 SECTION = "gpe/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound sqlite3 libsoup"
-RDEPENDS = "pulseaudio-bin \
+
+RDEPENDS = "esd \
         gst-plugin-audioconvert \
         gst-plugin-esd \
         gst-plugin-typefindfunctions \
============================================================
--- packages/starling/starling_svn.bb	6486e2268453d17257250749dc505d0f9325d01e
+++ packages/starling/starling_svn.bb	41c225219a46f25d88d800d602cfc111847d3a8b
@@ -14,9 +14,8 @@ RRECOMMENDS = "gst-plugin-mad \
         gst-plugin-ivorbis \
         gst-plugin-tcp"
 
-PV = "0.1+svn${SRCDATE}"
+PV = "0.2+svn${SRCDATE}"
 
-
 inherit gpe autotools
 
 SRC_URI = "${GPE_EXTRA_SVN}"


#
# mt diff -r835bda37b996295e3fb4a19b2f3d71f25cd0abca -rcc636403f564221da3d8414814995f15cc87f684
#
# 
# 
# rename "packages/gtkhtml2/gtkhtml2_cvs.bb"
#     to "packages/gtkhtml2/gtkhtml2_svn.bb"
# 
# add_file "packages/gaim/pidgin_2.1.0.bb"
#  content [f38dd9af51ab37706164482bcece1477daca655a]
# 
# patch "packages/e17/edje-editor_cvs.bb"
#  from [740c05ae1ecafcda56ba3f18f5b2fe0dac6332be]
#    to [cfa6ec43d5f9faae882abbe2efa486f7fa6523f3]
# 
# patch "packages/e17/edje-viewer_cvs.bb"
#  from [2a7237f77298295dcb9a891068279c010aea803f]
#    to [a789e404a347e1eedc48636e834ce762cb837e4a]
# 
# patch "packages/uboot/u-boot-mkimage-gta01-native_oe.bb"
#  from [148eadcd4b31c1fc73879e61409c8db14331aaeb]
#    to [d2ac07afa8091ccc0ab72e917cab17dad786d31e]
# 
============================================================
--- packages/gaim/pidgin_2.1.0.bb	f38dd9af51ab37706164482bcece1477daca655a
+++ packages/gaim/pidgin_2.1.0.bb	f38dd9af51ab37706164482bcece1477daca655a
@@ -0,0 +1,9 @@
+require pidgin.inc
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
+           file://sanitize-configure.ac.patch;patch=1 \
+           file://gconf-no-errors.patch;patch=1 \
+	   file://pidgin.desktop-set-icon.patch;patch=1 \
+	  " 
+
+PR = "r0"
============================================================
--- packages/e17/edje-editor_cvs.bb	740c05ae1ecafcda56ba3f18f5b2fe0dac6332be
+++ packages/e17/edje-editor_cvs.bb	cfa6ec43d5f9faae882abbe2efa486f7fa6523f3
@@ -1,7 +1,7 @@ DEPENDS = "etk"
 DESCRIPTION = "Edje-Editor is just that."
 LICENSE = "MIT"
 DEPENDS = "etk"
-PV = "0.0.0+svn${SRCDATE}"
+PV = "0.0.0+cvs${SRCDATE}"
 PR = "r0"
 
 inherit e
============================================================
--- packages/e17/edje-viewer_cvs.bb	2a7237f77298295dcb9a891068279c010aea803f
+++ packages/e17/edje-viewer_cvs.bb	a789e404a347e1eedc48636e834ce762cb837e4a
@@ -1,7 +1,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Edje_Viewer is just that."
 DEPENDS = "etk"
 LICENSE = "MIT"
-PV = "0.0.0+svn${SRCDATE}"
+PV = "0.0.0+cvs${SRCDATE}"
 PR = "r0"
 
 inherit e
============================================================
--- packages/uboot/u-boot-mkimage-gta01-native_oe.bb	148eadcd4b31c1fc73879e61409c8db14331aaeb
+++ packages/uboot/u-boot-mkimage-gta01-native_oe.bb	d2ac07afa8091ccc0ab72e917cab17dad786d31e
@@ -5,7 +5,6 @@ file://ext2load_hex.patch;patch=1 \
 SRC_URI = "git://www.denx.de/git/u-boot.git/;protocol=git;tag=9912121f7ed804ea58fd62f3f230b5dcfc357d88 \
 file://uboot-machtypes.patch;patch=1 \
 file://ext2load_hex.patch;patch=1 \
-file://uboot-mokoversion.patch;patch=1 \
 file://uboot-s3c2410-warnings-fix.patch;patch=1 \
 file://uboot-strtoul.patch;patch=1 \
 file://uboot-cramfs_but_no_jffs2.patch;patch=1 \