merge of '5140a55fd62a4e67330c5dc059c8fb7f0b2e4880'

     and '86883da58ec08eb043fd0009b78d8fd54dda214f'

diff --git a/packages/python/python-numpy_1.1.1.bb b/packages/python/python-numpy_1.1.1.bb
new file mode 100644 (file)
index 0000000..d688c93
--- /dev/null
+++ b/packages/python/python-numpy_1.1.1.bb
@@ -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}
+}
+

diff --git a/packages/sugar/sugar-base_0.82.0.bb b/packages/sugar/sugar-base_0.82.0.bb
index 9f28eae..798a049 100644 (file)
--- a/packages/sugar/sugar-base_0.82.0.bb
+++ b/packages/sugar/sugar-base_0.82.0.bb
@@ -1,10 +1,10 @@
 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"
 

diff --git a/packages/sugar/sugar-toolkit_0.82.1.bb b/packages/sugar/sugar-toolkit_0.82.1.bb
index a2cca63..cbc6b78 100644 (file)
--- a/packages/sugar/sugar-toolkit_0.82.1.bb
+++ b/packages/sugar/sugar-toolkit_0.82.1.bb
@@ -1,7 +1,7 @@
 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"