[oe-commits] org.oe.dev merge of '5140a55fd62a4e67330c5dc059c8fb7f0b2e4880'

[oe commit]

merge of '5140a55fd62a4e67330c5dc059c8fb7f0b2e4880'
     and '86883da58ec08eb043fd0009b78d8fd54dda214f'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 72496963bc56d2931e759395604bb874363cb29a
ViewMTN: http://monotone.openembedded.org/revision/info/72496963bc56d2931e759395604bb874363cb29a
Files:
1
packages/python/python-numpy_1.1.1.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 -r5140a55fd62a4e67330c5dc059c8fb7f0b2e4880 -r72496963bc56d2931e759395604bb874363cb29a
#
#
#
# add_file "packages/python/python-numpy_1.1.1.bb"
#  content [94d5ee7200a201465655e3946ebf7b020628cd9b]
# 
# patch "packages/sugar/sugar-base_0.82.0.bb"
#  from [70239f49bd9bfd947c846d0d91029add7b6f950b]
#    to [cbfe5bb7096952d90c4998d19566e160f5d230b2]
# 
# patch "packages/sugar/sugar-toolkit_0.82.1.bb"
#  from [0a78f1c049b134608bf91224e00ad17aec1e0ef0]
#    to [77b79d5412c3229763f934d7818ca6b0a44ea317]
#
============================================================
--- packages/python/python-numpy_1.1.1.bb	94d5ee7200a201465655e3946ebf7b020628cd9b
+++ packages/python/python-numpy_1.1.1.bb	94d5ee7200a201465655e3946ebf7b020628cd9b
@@ -0,0 +1,16 @@
+DESCRIPTION = "A sophisticated Numeric Processing Package for Python"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "PSF"
+PR = "ml0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \
+          "
+S = "${WORKDIR}/numpy-${PV}"
+
+inherit distutils
+
+do_stage() {
+	cp -pPR Include/Num* ${STAGING_INCDIR}
+}
+
============================================================
--- packages/sugar/sugar-base_0.82.0.bb	70239f49bd9bfd947c846d0d91029add7b6f950b
+++ packages/sugar/sugar-base_0.82.0.bb	cbfe5bb7096952d90c4998d19566e160f5d230b2
@@ -1,10 +1,10 @@ LICENSE = "LGPLv2"
 DESCRIPTION = "Sugar base system"
 LICENSE = "LGPLv2"
 
-PR = "r2"
+PR = "r3"
 
 DEPENDS = "python-pygtk sugar-toolkit"
-RDEPENDS = "python-pygtk sugar-toolkit python-logging python-dbus python-subprocess telepathy-python"
+RDEPENDS = "python-pygtk sugar-toolkit python-logging python-dbus python-subprocess telepathy-python python-crypt python-numpy "
 
 SRC_URI = "http://dev.laptop.org/pub/sugar/sources/sugar-base/${PN}-${PV}.tar.bz2"
 
============================================================
--- packages/sugar/sugar-toolkit_0.82.1.bb	0a78f1c049b134608bf91224e00ad17aec1e0ef0
+++ packages/sugar/sugar-toolkit_0.82.1.bb	77b79d5412c3229763f934d7818ca6b0a44ea317
@@ -1,7 +1,7 @@ LICENSE = "LGPLv2"
 DESCRIPTION = "Sugar toolkit"
 LICENSE = "LGPLv2"
 
-DEPENDS = "python-pygtk libxml-parser-perl libxml2 gtk+"
+DEPENDS = "python-pygtk libxml-parser-perl-native libxml2 gtk+"
 
 SRC_URI = "http://dev.laptop.org/pub/sugar/sources/sugar-toolkit/sugar-toolkit-${PV}.tar.bz2"
 


#
# mt diff -r86883da58ec08eb043fd0009b78d8fd54dda214f -r72496963bc56d2931e759395604bb874363cb29a
#
#
#
# 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"