From 9eec190bb61a3cd02957b0b9c40884fac798f2ee Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Wed, 12 May 2010 21:12:30 +0000
Subject: Bump v4

---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..55a7b6b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,11 @@
+*.o
+*.so
+tp-magic-config
+src/tp_magic_api.h
+obj/parse_step1.c
+obj/parse.c
+trans/*
+tuxpaint
+*.tar.*
+.0sugar
+build/*
diff --git a/0sugar/NEWS b/0sugar/NEWS
new file mode 100644
index 0000000..ae1dac5
--- /dev/null
+++ b/0sugar/NEWS
@@ -0,0 +1,12 @@
+4
+
+* Update tuxpaint to 0.9.22 version
+* Initial Journal integration
+* Tuxpaint without stamp to make bundle as minimal as possible
+  stamps will be added as optional dependency after implementing
+  this feature in 0install
+
+3
+
+* Update tuxpaint to 0.9.20 version
+* Include x86_64 binaries to bundle
diff --git a/0sugar/TuxPaint.activity/activity/activity.info b/0sugar/TuxPaint.activity/activity/activity.info
new file mode 100644
index 0000000..f336dae
--- /dev/null
+++ b/0sugar/TuxPaint.activity/activity/activity.info
@@ -0,0 +1,8 @@
+[Activity]
+name = Tux Paint
+bundle_id = org.tuxpaint
+license = GPLv2
+icon = icon
+exec = .0sugar/launch tuxpaint
+requires = tuxpaint
+activity_version = 4
diff --git a/0sugar/TuxPaint.activity/activity/icon.svg b/0sugar/TuxPaint.activity/activity/icon.svg
new file mode 100644
index 0000000..cf7ed1d
--- /dev/null
+++ b/0sugar/TuxPaint.activity/activity/icon.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+        <!ENTITY ns_svg "http://www.w3.org/2000/svg">
+        <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
+        <!ENTITY stroke_color "#000000">
+        <!ENTITY fill_color "#AAAAAA">
+]>
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.0"
+   width="50"
+   height="50"
+   id="svg23699">
+  <g
+     transform="translate(2.2795368,2.5500192)"
+     id="g4446">
+    <path
+       d="M 17.127187,43.376532 C 16.055758,43.019389 14.092211,41.983376 13.621861,40.427607 C 13.295451,39.347958 12.917163,38.225465 13.376702,34.972914 C 13.648257,33.050879 14.757464,31.474464 15.519574,30.369835 L 16.318562,29.211768 C 16.318562,29.211768 14.389784,25.680946 10.51897,23.0325 C 10.51897,23.0325 8.4758522,15.614009 8.4758522,15.614009 C 8.4758522,15.614009 12.989071,12.642629 13.847113,12.703921 C 15.256756,12.489408 13.423877,16.731327 13.423877,16.731327 C 13.574018,17.436467 14.11217,17.474975 15.399238,18.608812 C 16.349208,19.360696 18.218513,20.876497 18.218513,20.876497 C 18.218513,20.876497 18.249159,18.915264 18.770114,18.087858 C 19.371128,17.073659 19.781376,16.708861 20.670065,16.095979 C 21.313594,15.758891 21.957133,15.544378 22.69259,15.360511 C 22.815175,15.05407 23.060324,8.3123078 28.208576,6.4736389 C 33.356839,4.6349803 35.318072,9.2929243 35.318072,9.2929243 C 37.892208,14.25731 37.064802,21.611965 36.819653,22.745802 C 36.697078,23.787711 37.463182,24.369958 37.463182,24.369958 C 37.463182,24.369958 44.082369,30.560119 43.530769,32.827804 C 43.775918,35.40193 40.956642,38.037348 40.466334,38.466374 C 40.405042,38.956683 40.095064,42.124763 38.071254,43.434286 L 17.127187,43.376532 z "
+       
+style="font-size:12px;fill:&fill_color;;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:3.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path23504" />
+    <path
+       d="M 20.551936,42.861105 C 20.403653,42.790501 19.844548,42.212494 19.690752,41.865324 C 19.536956,41.518155 17.345338,38.355037 18.114326,34.960475 C 18.883315,31.565914 21.228718,32.91602 21.382524,31.411616 C 21.53632,29.907201 21.88236,28.788538 23.920173,28.557095 C 25.957996,28.325642 27.57286,29.212862 28.149604,30.717266 C 28.726348,32.221681 29.72603,35.076192 29.72603,36.387736 C 29.72603,37.69927 29.649132,40.862388 29.649132,40.862388 C 29.649132,40.862388 29.513806,42.25469 28.828615,42.816075"
+       
+style="font-size:12px;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path23514" />
+    <path
+       d="M 10.976567,43.126565 C 13.613535,41.605552 11.143208,25.559436 9.565049,20.959802 C 9.1485887,19.273152 7.7419761,13.639765 7.7419761,13.639765 C 7.7419761,13.639765 8.9750209,10.823686 8.341352,7.9638238 C 7.4936144,4.1378303 5.3961269,4.4428542 5.5611779,1.4068893 C 5.5611779,1.4068893 3.8594947,2.8602418 3.5714737,3.5757333 C 3.2769165,4.3075092 1.966256,7.4771361 1.8465285,8.5538109 C 1.5213107,11.357893 4.1555913,14.324277 4.1555913,14.324277 C 4.1555913,14.324277 4.0990523,18.891917 4.2068152,20.118323 C 3.8152281,27.425484 10.6208,43.583506 10.976567,43.126565 z "
+       
+style="fill:&fill_color;;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:3.38242745;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path23530" />
+    <path
+       d="M 8.3154767,14.058809 C 7.2963858,14.341552 4.3847683,14.497268 3.7761688,14.736506"
+       
+style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1.98436975;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path23532" />
+    <path
+       d="M 25.695742,9.8430418 C 26.43121,9.7204672 27.110878,10.018171 27.386673,10.477833 C 27.662468,10.937495 27.579831,10.745425 27.746737,11.613898 C 27.733052,12.069648 27.739571,12.457156 27.751091,12.566045 C 27.930604,12.734902 28.637602,9.6285296 30.813348,9.8736878 C 31.756532,9.9454934 32.692273,10.349129 32.590725,12.172018 C 32.06977,20.476643 27.631165,16.740723 27.319292,16.553602 C 26.835401,16.351697 27.084112,15.968511 26.782815,15.832282 C 26.491578,15.82142 26.483047,16.128867 26.098691,16.082359 C 25.897915,16.079597 24.990921,15.910627 24.8377,15.849335 C 24.68448,15.788053 23.458704,15.696114 23.48935,14.470339 C 23.305483,13.305855 24.085282,10.500266 25.695742,9.8430418 z "
+       
+style="font-size:12px;fill:&stroke_color;;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path23506" />
+    <path
+       d="M 23.404475,16.087432 C 24.07865,16.056796 27.02051,16.730971 28.36886,17.680942 C 29.71721,18.630922 30.330103,20.101847 30.207529,21.266331 C 30.097593,22.283219 29.681246,24.548861 28.123711,24.943658 C 25.716019,25.515546 23.689253,24.762471 20.891631,23.687236 C 17.548588,22.414161 17.888489,15.903565 23.404475,16.087432 z "
+       
+style="font-size:12px;fill:&fill_color;;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:2.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path23510" />
+    <path
+       d="M 30.798954,14.698748 C 30.961271,14.055137 30.730835,13.444154 30.284263,13.334084 C 29.83768,13.224004 29.344066,13.656521 29.181749,14.300132 C 29.019422,14.943733 29.249859,15.554716 29.696441,15.664796 C 30.143013,15.774866 30.636627,15.342349 30.798954,14.698748 L 30.798954,14.698748 z "
+       style="font-size:12px;fill:&fill_color;;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt"
+       id="path23524" />
+    <path
+       d="M 26.399896,14.243316 C 26.562213,13.451536 26.331787,12.699888 25.885205,12.564469 C 25.438622,12.429062 24.945008,12.961145 24.782691,13.752936 C 24.620364,14.544717 24.850801,15.296364 25.297383,15.431783 C 25.743955,15.567201 26.237569,15.035107 26.399896,14.243316 L 26.399896,14.243316 z "
+       style="font-size:12px;fill:&fill_color;;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt"
+       id="path23622" />
+    <path
+       d="M 21.061566,20.090535 C 20.852555,20.92655 21.047758,21.716661 21.497554,21.855303 C 21.947359,21.99395 22.481424,21.42862 22.690434,20.592604 C 22.899444,19.7566 22.704251,18.966481 22.254446,18.827836 C 21.804648,18.689202 21.270578,19.254519 21.061566,20.090535 L 21.061566,20.090535 z "
+       style="font-size:12px;fill:&stroke_color;;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt"
+       id="path23624" />
+    <path
+       d="M 35.647787,40.034689 C 37.65407,39.950738 39.29654,39.045147 39.950741,38.340559"
+       
+style="font-size:12px;fill:none;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path851" />
+    <path
+       d="M 33.638016,28.886874 C 33.638016,30.159245 34.122729,30.704546 34.213612,30.825724 C 34.516558,31.431614 35.9404,32.310156 35.9404,33.643115 C 35.728339,34.915485 34.940681,35.218431 34.577147,35.521376 C 34.213612,35.824321 32.196784,38.44704 34.927524,39.847794"
+       
+style="font-size:12px;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path854" />
+  </g>
+</svg>
diff --git a/0sugar/TuxPaint.activity/setup.py b/0sugar/TuxPaint.activity/setup.py
new file mode 100755
index 0000000..9fe7f6d
--- /dev/null
+++ b/0sugar/TuxPaint.activity/setup.py
@@ -0,0 +1,4 @@
+#!/bin/env python
+
+from sugar.activity import bundlebuilder
+bundlebuilder.start()
diff --git a/0sugar/service.info b/0sugar/service.info
new file mode 100644
index 0000000..5f4df7f
--- /dev/null
+++ b/0sugar/service.info
@@ -0,0 +1,35 @@
+[DEFAULT]
+uid = tuxpaint
+summary = Drawing program designed for young children
+license = GPLv2
+homepage = http://www.tuxpaint.org/
+
+[Service]
+requires = %(uid)s/binary
+main     = tuxpaint
+binding  = TUXPAINT_DATA_PREFIX share/tuxpaint
+           TUXPAINT_LOCALEDIR share/locale
+exclude  = bin/*, lib/*
+machine  = *
+
+[Service/binary]
+requires = libpaper, librsvg, cairo, fribidi
+           sdl, sdl-image, sdl-mixer, sdl-ttf, sdl-pango
+           env, ds, shell
+binding  = PATH bin
+           TUXPAINT_MAGIC_PREFIX lib/tuxpaint/plugins
+include  = bin/*, lib/*
+machine  = build
+
+[Build]
+requires = libpaper/devel, librsvg/devel, cairo/devel, fribidi/devel, sdl/devel
+           sdl-image/devel, sdl-mixer/devel, sdl-ttf/devel, sdl-pango/devel
+           env/devel, ds/devel, shell/devel
+           pkgconfig, make, gcc-c
+exec     = cp -r "$SRCDIR"/* . &&
+           make PREFIX=/ SUGAR=1 OPTFLAGS="%(cflags)s -I$PAPER_PATH/include"
+                PAPER_LIB="-L$PAPER_PATH/lib -lpaper" &&
+           make PREFIX=/ SUGAR=1 DESTDIR="$DISTDIR" install
+
+[Maintain]
+exec = rm -rf build; make release && mv build/*.tar.* .
--
cgit v0.9.1