[oe-commits] org.oe.dev merge of '2c3f3df8f990a6610a9f87f048204b154418a06a'

[oe commit]

merge of '2c3f3df8f990a6610a9f87f048204b154418a06a'
     and 'fa54a53ed347c26402f271ae2550d35a6849f1f6'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 5140a55fd62a4e67330c5dc059c8fb7f0b2e4880
ViewMTN: http://monotone.openembedded.org/revision/info/5140a55fd62a4e67330c5dc059c8fb7f0b2e4880
Files:
1
packages/mythtv/gmyth-upnp_0.7.0.bb
packages/sugar/sugar-base_0.82.0.bb
packages/sugar/sugar-toolkit_0.82.1.bb
packages/linux/linux-nokia800.inc
Diffs:

#
# mt diff -r2c3f3df8f990a6610a9f87f048204b154418a06a -r5140a55fd62a4e67330c5dc059c8fb7f0b2e4880
#
#
#
# patch "packages/mythtv/gmyth-upnp_0.7.0.bb"
#  from [4667af3879b4e91ebc27b0ecf26ebfe32d999a2d]
#    to [8b75bcd164ea2941db3ae19b4f30ab821fa36300]
# 
# patch "packages/sugar/sugar-base_0.82.0.bb"
#  from [222d6d3f00da874f79551cb34f5c1303ca257ed0]
#    to [70239f49bd9bfd947c846d0d91029add7b6f950b]
# 
# patch "packages/sugar/sugar-toolkit_0.82.1.bb"
#  from [26cbe65d86d7a8971743b26419af876eafaea7ef]
#    to [0a78f1c049b134608bf91224e00ad17aec1e0ef0]
#
============================================================
--- packages/mythtv/gmyth-upnp_0.7.0.bb	4667af3879b4e91ebc27b0ecf26ebfe32d999a2d
+++ packages/mythtv/gmyth-upnp_0.7.0.bb	8b75bcd164ea2941db3ae19b4f30ab821fa36300
@@ -2,7 +2,7 @@ HOMEPAGE = "http://gmyth.sourceforge.net
 LICENSE = "LGPLv2""
 HOMEPAGE = "http://gmyth.sourceforge.net/wiki/index.php/Main_Page"
 
-PR = "r2"
+PR = "r3"
 
 DEPENDS = "glib-2.0 mysql gmyth libupnp"
 
@@ -21,6 +21,10 @@ do_compile_append() {
                   gmyth-upnp.pc
 }
 
+do_install_append() {
+	mv ${D}/${bindir}/test ${D}/${bindir}/gmyth-upnp-test
+}
+
 do_stage() {
         autotools_stage_all
 }
============================================================
--- packages/sugar/sugar-base_0.82.0.bb	222d6d3f00da874f79551cb34f5c1303ca257ed0
+++ packages/sugar/sugar-base_0.82.0.bb	70239f49bd9bfd947c846d0d91029add7b6f950b
@@ -1,9 +1,11 @@ LICENSE = "LGPLv2"
 DESCRIPTION = "Sugar base system"
 LICENSE = "LGPLv2"
 
-DEPENDS = "sugar-toolkit"
-RDEPENDS = "sugar-toolkit"
+PR = "r2"
 
+DEPENDS = "python-pygtk sugar-toolkit"
+RDEPENDS = "python-pygtk sugar-toolkit python-logging python-dbus python-subprocess telepathy-python"
+
 SRC_URI = "http://dev.laptop.org/pub/sugar/sources/sugar-base/${PN}-${PV}.tar.bz2"
 
 inherit autotools distutils-base
============================================================
--- packages/sugar/sugar-toolkit_0.82.1.bb	26cbe65d86d7a8971743b26419af876eafaea7ef
+++ packages/sugar/sugar-toolkit_0.82.1.bb	0a78f1c049b134608bf91224e00ad17aec1e0ef0
@@ -1,7 +1,7 @@ LICENSE = "LGPLv2"
 DESCRIPTION = "Sugar toolkit"
 LICENSE = "LGPLv2"
 
-DEPENDS = "libxml2 gtk+"
+DEPENDS = "python-pygtk libxml-parser-perl libxml2 gtk+"
 
 SRC_URI = "http://dev.laptop.org/pub/sugar/sources/sugar-toolkit/sugar-toolkit-${PV}.tar.bz2"
 


#
# mt diff -rfa54a53ed347c26402f271ae2550d35a6849f1f6 -r5140a55fd62a4e67330c5dc059c8fb7f0b2e4880
#
#
#
# patch "packages/linux/linux-nokia800.inc"
#  from [e115eb464fd01dc9fb6240cf410d23831cdb0c3f]
#    to [6a011f12e3c1cb85af2fb3ee6256f0f1ce45e89c]
#
============================================================
--- packages/linux/linux-nokia800.inc	e115eb464fd01dc9fb6240cf410d23831cdb0c3f
+++ packages/linux/linux-nokia800.inc	6a011f12e3c1cb85af2fb3ee6256f0f1ce45e89c
@@ -2,8 +2,6 @@ LICENSE = "GPL"
 DESCRIPTION = "Linux kernel for Nokia 770/800"
 LICENSE = "GPL"
 
-KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}"
-
 inherit kernel
 
 RPROVIDES_kernel-image = "hostap-modules"