9 files changed, 84 insertions, 74 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2801d6e
--- /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.*
+.sweets
+build/*
diff --git a/0sugar/TuxPaint.activity/NEWS b/0sugar/TuxPaint.activity/NEWS
deleted file mode 100644
index 481b461..0000000
--- a/0sugar/TuxPaint.activity/NEWS
+++ /dev/null
@@ -1,13 +0,0 @@
-v4 2010-05-12
-~~~~~~~~~~~~~
-* 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
-
-v3 2009-05-31
-~~~~~~~~~~~~~
-* Pick up existed TuxPaint bundle
-* 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
deleted file mode 100644
index 6051ae0..0000000
--- a/0sugar/TuxPaint.activity/activity/activity.info
+++ /dev/null
@@ -1,9 +0,0 @@
-[Activity]
-name = Tux Paint
-bundle_id = org.tuxpaint
-license = GPLv2
-icon = icon
-exec = .0sugar/launch tuxpaint --nolockfile
-activity_version = 4
-mime_types = image/png
-requires = tuxpaint
diff --git a/0sugar/TuxPaint.activity/setup.py b/0sugar/TuxPaint.activity/setup.py
deleted file mode 100755
index 9fe7f6d..0000000
--- a/0sugar/TuxPaint.activity/setup.py
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/env python
-
-from sugar.activity import bundlebuilder
-bundlebuilder.start()
diff --git a/0sugar/service.info b/0sugar/service.info
deleted file mode 100644
index aa47581..0000000
--- a/0sugar/service.info
+++ /dev/null
@@ -1,48 +0,0 @@
-[DEFAULT]
-uid       = tuxpaint
-summary   = Drawing program designed for young children
-license   = GPLv2
-homepage  = http://www.tuxpaint.org/
-
-[Service]
-category  = Education;Art
-icon      = data/images/tuxpaint-icon.svg
-requires  = libpaper, librsvg, cairo, fribidi
-            sdl, sdl-image, sdl-mixer, sdl-ttf, sdl-pango
-            env, ds, shell
-binding   = PATH bin
-            TUXPAINT_DATA_PREFIX share/tuxpaint
-            TUXPAINT_LOCALEDIR share/locale
-            TUXPAINT_MAGIC_PREFIX lib/tuxpaint/plugins
-recipe    = bin, data
-
-[data]
-exclude   = bin/*, lib/*
-
-[bin]
-main      = bin/tuxpaint
-include   = bin/*, lib/*
-arch      = 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      = cd "$SRCDIR" &&
-            make PREFIX=/ SUGAR=1 OPTFLAGS="$CFLAGS -I$PAPER_PATH/include"
-                PAPER_LIB="-L$PAPER_PATH/lib -lpaper" &&
-            make PREFIX=/ SUGAR=1 DESTDIR="$DISTDIR" install
-
-[Maintain]
-exec      = version=$(echo $(grep ^VER_VERSION Makefile | awk -F= '{print $2}')) &&
-            test "$version" &&
-            rm -rf .0sugar/tuxpaint-$version &&
-            mkdir -p .0sugar/tuxpaint-$version/obj &&
-            find . -follow \( -wholename '*/CVS' -o -name .thumbs
-                -o -name .cvsignore -o -name 'dummy.o' -o -name 'build'
-                -o -name '.#*' -o -name obj -o -name '*.mo' -o -path ./tuxpaint
-                -o -name '*.tar.*' -o -name .git -o -name .0sugar \) -prune
-                -o -type f
-                -exec cp --parents -dp {} .0sugar/tuxpaint-$version/ \; &&
-            tar cjpf tuxpaint-$version.tar.bz2 -C .0sugar tuxpaint-$version
diff --git a/activity/NEWS b/activity/NEWS
new file mode 100644
index 0000000..957eb59
--- /dev/null
+++ b/activity/NEWS
@@ -0,0 +1,21 @@
+v5 2010-06-10
+~~~~~~~~~~~~~
+* Revert save button to save current image (not keep)
+* Revert open button to import image from the Journal
+* Save image preview in Journal objects
+* Set correct MIME type for created Journal objects
+* List of MIME types supported my activity
+
+v4 2010-05-12
+~~~~~~~~~~~~~
+* 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
+
+v3 2009-05-31
+~~~~~~~~~~~~~
+* Pick up existed TuxPaint bundle
+* Update tuxpaint to 0.9.20 version
+* Include x86_64 binaries to bundle
diff --git a/0sugar/TuxPaint.activity/activity/icon.svg b/activity/activity-icon.svg
index cf7ed1d..cf7ed1d 100644
--- a/0sugar/TuxPaint.activity/activity/icon.svg
+++ b/activity/activity-icon.svg
diff --git a/activity/activity.info b/activity/activity.info
new file mode 100644
index 0000000..a6b4c52
--- /dev/null
+++ b/activity/activity.info
@@ -0,0 +1,46 @@
+[DEFAULT]
+depends   = base/libpaper; base/librsvg; base/cairo; base/fribidi; base/sdl
+            base/sdl-image; base/sdl-mixer; base/sdl-ttf; base/sdl-pango
+            sdk/polyol
+
+[Activity]
+implement = tuxpaint
+name      = Tux Paint
+summary   = Drawing program designed for young children
+description = Tux Paint is a free, award-winning drawing program for children
+            ages 3 to 12 (for example, preschool and K-6). It combines an
+            easy-to-use interface, fun sound effects, and an encouraging
+            cartoon mascot who guides children as they use the program.
+license   = GPLv2
+homepage  = http://www.tuxpaint.org/
+category  = Education; Art
+icon      = activity-icon
+
+version   = 0.9.22
+stability = stable
+
+requires  = %(depends)s
+exec      = activity/tuxpaint
+mime_types = image/bmp;image/gif;image/jpeg;image/png;image/tiff
+
+# activity.info original options
+activity_version = 5
+bundle_id = org.tuxpaint
+
+[Application]
+binding   = TUXPAINT_DATA_PREFIX share/tuxpaint
+            TUXPAINT_LOCALEDIR share/locale
+            TUXPAINT_MAGIC_PREFIX lib/tuxpaint/plugins
+exec      = bin/tuxpaint --nolockfile
+
+[Archive]
+arch      = any
+
+[Build]
+requires  = %(depends)s; base/pkg-config; base/make; base/gcc-c; base/gperf
+make      = make PREFIX=%(PREFIX)s SUGAR=1 OPTFLAGS="%(CFLAGS)s"
+install   = make PREFIX=%(PREFIX)s SUGAR=1 DESTDIR=%(DESTDIR)s install
+
+[Source]
+exclude   = CVS; *.patch; *.o; /build; obj/*.c; *.mo; /tuxpaint; *.tar.*;
+            /tuxpaint-stamps**; lockfile.dat
diff --git a/activity/tuxpaint b/activity/tuxpaint
new file mode 100755
index 0000000..52bec2d
--- /dev/null
+++ b/activity/tuxpaint
@@ -0,0 +1,6 @@
+#!/bin/sh
+export LD_LIBRARY_PATH=lib:$LD_LIBRARY_PATH
+export TUXPAINT_DATA_PREFIX=share/tuxpaint
+export TUXPAINT_LOCALEDIR=share/locale
+export TUXPAINT_MAGIC_PREFIX=lib/tuxpaint/plugins
+exec bin/tuxpaint --nolockfile "$@"