sugar: update some bit sto the 0.83 release

4 files changed, 121 insertions, 3 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index cb63ab788a..7b0cd1bf17 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -3842,6 +3842,10 @@ sha256=1dd2cce79f93cb3483fefdc02f65ed0868754ad12360c830d5f5cbe95da8e0e4
 md5=e23f236e94be4c429aa1ceac0f01544b
 sha256=3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639
 
+[http://www.lartmaker.nl/lartware/port/devmem2.c]
+md5=be12c0132a1ae118cbf5e79d98427c1d
+sha256=ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191
+
 [http://pknet.com/~joe/dgen-sdl-1.23.tar.gz]
 md5=b1896c1b21ddb152626aec2e8a157a3a
 sha256=44396b3b324433187cf7082d1059cd9f519f02accddd667e627a57ff8514d436
@@ -14522,6 +14526,10 @@ sha256=990af2fa20ad4e99ae5000df1afdb2e3b70400ba22d62e8917123d6a9d966397
 md5=6dfc8364f6e761d558f134a707bae421
 sha256=44fc0eddf56c0abe861190051fceec6e223122c5835967459c69fbf98ee52067
 
+[http://bec-systems.com/pub/mono/mono-2.2-rc2.tar.bz2]
+md5=a311545a0003f1a599297d57e4e27916
+sha256=4cf6094f64f3446e83b968cbee3f0ed5d579b635644dd8cbd51bbbe184446600
+
 [http://venge.net/monotone/downloads/monotone-0.20.tar.gz]
 md5=3bdf4da35ff576a401483815952f4045
 sha256=56a5c5afd838f90146205ee4769b83988c6bafc85826c0fbcad982f1e0333d93
@@ -19278,6 +19286,10 @@ sha256=ca4c614e09371a986ca5d86065fc697f7eb07b2064a6a2cad541755df0135883
 md5=71af6b9632f441259e7ea5608db2ae5f
 sha256=2172bfed8fdeab4279dad7712390fd98ae0a993c42c2c4eec98cf3d30d1a11aa
 
+[http://download.sugarlabs.org/sources/sucrose/glucose/sugar/sugar-0.83.4.tar.bz2]
+md5=6b981c63bb5d8b23b43831ece79884e6
+sha256=254ac13ceeba17749ff6416b33fd038f8db7aaf6fab2e0a9d2303dd07314b186
+
 [http://dev.laptop.org/pub/sugar/sources/sugar-artwork/sugar-artwork-0.82.0.tar.bz2]
 md5=3d271bf9f0d412afb9a5618ba5496fb8
 sha256=dbe36fa758a49dd8526885e2025b51d6e1e6e32458168e420c955b633ee3b100
@@ -19290,6 +19302,10 @@ sha256=124db55b59cdf5731096276e30d07b3537bc217ae63607f1394c2bb118cfe694
 md5=c5790a18fd9ee86a49ffa727505294f5
 sha256=430b27a0510a50fb66ee211e35565be7e1e522bcde7d1adde5c63a1d18ad7f1d
 
+[http://download.sugarlabs.org/sources/sucrose/glucose/sugar-base/sugar-base-0.83.2.tar.bz2]
+md5=0f05d95eaf0f8e3174a3b3e3b0afe995
+sha256=64ece8bb8e6eddb4c7b8b4ce0aa30f07f00a86ed7b113a7957661e73616a8dc3
+
 [http://dev.laptop.org/pub/sugar/sources/sugar-datastore/sugar-datastore-0.82.0.tar.bz2]
 md5=7a6bbb387c1f7cd3ddd6663869df3b88
 sha256=3fc7ed937865773089d146f0fce72ee556f0655c612ae840a08dbd1a13d92d39
@@ -19310,6 +19326,10 @@ sha256=68f1a10298f34ea133a679085b3b54bdb990c49324779f79e40aff0f274b6a9a
 md5=c3a2c45d6444efcd3fa59c50198f9483
 sha256=a0fae53f396c6223365c28c8cda0538f2cb20c660bffd9cfcc37ee00b57c2a7b
 
+[http://download.sugarlabs.org/sources/sucrose/glucose/sugar-toolkit/sugar-toolkit-0.83.3.tar.bz2]
+md5=f6882ee56ed327c6680738133e911bf3
+sha256=243a9d699af072b4cb79334b62638463d9f39437e7a886a14a95b7a8250983bd
+
 [http://ssel.vub.ac.be/Members/DennisWagelaar/download/zaurus/supertux-0.1.2-fp.patch.gz]
 md5=05787c6553316940873e8bce192a4fe0
 sha256=ab958a3cc04858ab72f3fe2844362f249897c3bb2149208be22da2ce5d46c9c0
@@ -24222,6 +24242,3 @@ sha256=5cc1a53bb909922596bdd0fa967b654fe1bfbe0dcf1d34608f0b7c90e0c27867
 md5=5f7b88ebb2bcd7e8044328482d079661
 sha256=f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af
 
-[http://www.lartmaker.nl/lartware/port/devmem2.c]
-md5=be12c0132a1ae118cbf5e79d98427c1d
-sha256=ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191
diff --git a/packages/sugar/sugar-base_0.83.2.bb b/packages/sugar/sugar-base_0.83.2.bb
new file mode 100644
index 0000000000..468ff3b0dc
--- /dev/null
+++ b/packages/sugar/sugar-base_0.83.2.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "Sugar base system"
+LICENSE = "LGPLv2"
+
+DEPENDS = "python-pygtk sugar-toolkit"
+RDEPENDS = "librsvg-gtk \
+            ohm-plugin-x11 ohm \
+	    hippo-canvas \
+            python-datetime \
+            python-netclient \
+	    python-pygtk \
+	    sugar-toolkit \
+	    python-logging \
+	    python-dbus \
+	    python-subprocess \
+	    telepathy-gabble telepathy-salut telepathy-python \
+	    sugar-presence-service \
+	    python-crypt \
+	    python-numpy \
+	    python-compression \
+	    python-gst \
+	    python-simplejson \
+	    python-misc \
+	    python-xmlrpc \
+	    python-compiler \
+	    python-pydoc \
+	    python-mmap \
+	    python-doctest \
+	    ssh-keygen"
+
+SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/sugar-base/${PN}-${PV}.tar.bz2"
+
+inherit autotools distutils-base
+
+SRC_URI += "file://acinclude.m4"
+
+EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+}
+
+FILES_${PN} += "${datadir}/${PN} \
+		${datadir}/dbus-1 \
+		${sysconfdir} "
+
+FILES_${PN}-dbg += "${libdir}/python*/site-packages/sugar/.debug"
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+        autotools_stage_all
+}
+
diff --git a/packages/sugar/sugar-toolkit_0.83.3.bb b/packages/sugar/sugar-toolkit_0.83.3.bb
new file mode 100644
index 0000000000..864582d7e5
--- /dev/null
+++ b/packages/sugar/sugar-toolkit_0.83.3.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Sugar toolkit"
+LICENSE = "LGPLv2"
+DEPENDS = "python-pygtk libxml-parser-perl-native libxml2 gtk+ alsa-lib"
+
+SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/sugar-toolkit/sugar-toolkit-${PV}.tar.bz2"
+
+inherit autotools distutils-base
+
+SRC_URI += "file://acinclude.m4"
+
+EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
+
+do_configure_prepend() {
+        install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+}
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+        autotools_stage_all
+}
+
diff --git a/packages/sugar/sugar_0.83.4.bb b/packages/sugar/sugar_0.83.4.bb
new file mode 100644
index 0000000000..955272df4d
--- /dev/null
+++ b/packages/sugar/sugar_0.83.4.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Sugar base system"
+LICENSE = "GPLv2"
+
+DEPENDS = "sugar-toolkit libxml2 gtk+"
+RDEPENDS = "sugar-toolkit sugar-base sugar-datastore gnome-python-desktop"
+
+SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/sugar/${PN}-${PV}.tar.bz2"
+
+inherit autotools distutils-base mime
+
+do_configure_prepend() {
+	mkdir -p ${S}/m4
+}	
+
+FILES_${PN} += "${datadir}/${PN} \
+                ${datadir}/mime/packages \
+		${datadir}/xsessions \
+		${datadir}/dbus-1 \
+		${sysconfdir} "
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+        autotools_stage_all
+}
+