4 files changed, 486 insertions, 63 deletions

diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile
index 16c666f0ca24..49cfd7ad90aa 100644
--- a/graphics/mypaint/Makefile
+++ b/graphics/mypaint/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mypaint
-PORTVERSION=	0.7.1
+PORTVERSION=	0.8.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.gna.org/mypaint/ \
 		http://mirror.amdmi3.ru/distfiles/
@@ -14,9 +14,11 @@ MASTER_SITES=	http://download.gna.org/mypaint/ \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Fast painting/scribbling program
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy \
-		swig:${PORTSDIR}/devel/swig13
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy \
+		${PYTHON_PKGNAMEPREFIX}protobuf>0:${PORTSDIR}/devel/py-protobuf
+BUILD_DEPENDS:=	${RUN_DEPENDS} \
+		swig:${PORTSDIR}/devel/swig13 \
+		protoc:${PORTSDIR}/devel/protobuf
 
 USE_BZIP2=	yes
 USE_GNOME=	glib20 pygtk2
@@ -24,4 +26,8 @@ USE_PYTHON=	yes
 USE_SCONS=	yes
 SCONS_ARGS=	prefix="${PREFIX}"
 
+post-install:
+	# scons won't install icons if ${PREFIX}/share/icons already exists
+	cd ${WRKSRC}/desktop && ${COPYTREE_SHARE} 'icons' ${PREFIX}/share
+
 .include <bsd.port.mk>
diff --git a/graphics/mypaint/distinfo b/graphics/mypaint/distinfo
index 0dd084a8d77e..bf5bba63064f 100644
--- a/graphics/mypaint/distinfo
+++ b/graphics/mypaint/distinfo
@@ -1,3 +1,3 @@
-MD5 (mypaint-0.7.1.tar.bz2) = c9e6c70cddce60330ea7aff36fe5a59f
-SHA256 (mypaint-0.7.1.tar.bz2) = b449ccf55d191a27efdb0efa95c56ff2b0d48709b369c96f6701b41cbabf1e2b
-SIZE (mypaint-0.7.1.tar.bz2) = 2846407
+MD5 (mypaint-0.8.0.tar.bz2) = a8454214112c963a41a8aa7e484617fc
+SHA256 (mypaint-0.8.0.tar.bz2) = f6bbe39fba192f797055f5a14ed371d9679a0f25d3b9513e7dae2391b24b5508
+SIZE (mypaint-0.8.0.tar.bz2) = 5841732
diff --git a/graphics/mypaint/files/patch-SConstruct b/graphics/mypaint/files/patch-SConstruct
index bd37f1814270..70c7c94b9145 100644
--- a/graphics/mypaint/files/patch-SConstruct
+++ b/graphics/mypaint/files/patch-SConstruct
@@ -1,18 +1,19 @@
---- SConstruct.orig	2009-06-04 14:34:58.000000000 +0400
-+++ SConstruct	2009-06-16 20:30:45.000000000 +0400
-@@ -31,13 +31,13 @@
-     optfile.close()
- opts = Options('options.cache', ARGUMENTS)
- opts.Add(PathOption('prefix', 'autotools-style installation prefix', '/usr/local', PathOption.PathAccept))
+--- SConstruct.orig	2010-01-29 14:17:02.000000000 +0300
++++ SConstruct	2010-01-29 19:33:39.000000000 +0300
+@@ -23,14 +23,14 @@
+ opts = Variables()
+ opts.Add(PathVariable('prefix', 'autotools-style installation prefix', '/usr/local', validator=PathVariable.PathIsDirCreate))
+ opts.Add(BoolVariable('debug', 'enable HEAVY_DEBUG and disable optimizations', False))
 -env = Environment(ENV=os.environ, options=opts)
 +env = Environment(ENV=os.environ, options=opts, **dict((k, v.split()) for k, v in ARGUMENTS.iteritems()))
+ if sys.platform == "win32":
+     env = Environment(tools=['mingw'], ENV=os.environ, options=opts)
  opts.Update(env)
- opts.Save('options.cache', env)
  
  env.ParseConfig('pkg-config --cflags --libs glib-2.0')
  
 -env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings')
 +env.Append(CXXFLAGS=['-Wall', '-Wno-sign-compare', '-Wno-write-strings'])
- #env.Append(CXXFLAGS=' -O0', LINKFLAGS=' -O0')
- #env.Append(CXXFLAGS=' -O3', LINKFLAGS=' -O3')
  
+ # Get the numpy include path (for numpy/arrayobject.h).
+ numpy_path = numpy.get_include()
diff --git a/graphics/mypaint/pkg-plist b/graphics/mypaint/pkg-plist
index 679fd36122e9..f0901ce3821e 100644
--- a/graphics/mypaint/pkg-plist
+++ b/graphics/mypaint/pkg-plist
@@ -1,6 +1,26 @@
 bin/mypaint
 lib/mypaint/_mypaintlib.so
 share/applications/mypaint.desktop
+share/icons/hicolor/16x16/apps/mypaint.png
+share/icons/hicolor/22x22/apps/mypaint.png
+share/icons/hicolor/24x24/apps/mypaint.png
+share/icons/hicolor/32x32/apps/mypaint.png
+share/icons/hicolor/48x48/apps/mypaint.png
+share/icons/hicolor/scalable/apps/mypaint.svg
+share/locale/cs/LC_MESSAGES/mypaint.mo
+share/locale/de/LC_MESSAGES/mypaint.mo
+share/locale/es/LC_MESSAGES/mypaint.mo
+share/locale/fr/LC_MESSAGES/mypaint.mo
+share/locale/hu/LC_MESSAGES/mypaint.mo
+share/locale/id/LC_MESSAGES/mypaint.mo
+share/locale/it/LC_MESSAGES/mypaint.mo
+share/locale/ja/LC_MESSAGES/mypaint.mo
+share/locale/nb/LC_MESSAGES/mypaint.mo
+share/locale/ru/LC_MESSAGES/mypaint.mo
+share/locale/sl/LC_MESSAGES/mypaint.mo
+share/locale/sv/LC_MESSAGES/mypaint.mo
+share/locale/zh_CN/LC_MESSAGES/mypaint.mo
+share/locale/zh_TW/LC_MESSAGES/mypaint.mo
 %%DATADIR%%/backgrounds/01_white.png
 %%DATADIR%%/backgrounds/02_black.png
 %%DATADIR%%/backgrounds/03_check1.png
@@ -10,6 +30,9 @@ share/applications/mypaint.desktop
 %%DATADIR%%/backgrounds/05_grey3.png
 %%DATADIR%%/backgrounds/10_soft_yellow.png
 %%DATADIR%%/backgrounds/11_weak_blue.png
+%%DATADIR%%/backgrounds/50_comicthumbs.png
+%%DATADIR%%/backgrounds/50_storyboard-template.png
+%%DATADIR%%/backgrounds/README
 %%DATADIR%%/backgrounds/canvas1_1.png
 %%DATADIR%%/backgrounds/canvas1_2.png
 %%DATADIR%%/backgrounds/canvas1_3.png
@@ -17,6 +40,7 @@ share/applications/mypaint.desktop
 %%DATADIR%%/backgrounds/canvas3_1.png
 %%DATADIR%%/backgrounds/canvas3_2.png
 %%DATADIR%%/backgrounds/canvas3_3.png
+%%DATADIR%%/backgrounds/default.png
 %%DATADIR%%/backgrounds/paper1_1.png
 %%DATADIR%%/backgrounds/paper1_10.png
 %%DATADIR%%/backgrounds/paper1_11.png
@@ -64,28 +88,277 @@ share/applications/mypaint.desktop
 %%DATADIR%%/backgrounds/pattern2.png
 %%DATADIR%%/backgrounds/squares2.png
 %%DATADIR%%/backgrounds/squares2_blue.png
-%%DATADIR%%/brushes/ab002.myb
-%%DATADIR%%/brushes/ab002_prev.png
-%%DATADIR%%/brushes/ab007.myb
-%%DATADIR%%/brushes/ab007_prev.png
+%%DATADIR%%/brushes/100%_Opaque.myb
+%%DATADIR%%/brushes/100%_Opaque_prev.png
+%%DATADIR%%/brushes/4B_pencil.myb
+%%DATADIR%%/brushes/4B_pencil_prev.png
+%%DATADIR%%/brushes/Airbrush.myb
+%%DATADIR%%/brushes/Airbrush_prev.png
+%%DATADIR%%/brushes/Blur_ramon.myb
+%%DATADIR%%/brushes/Blur_ramon_prev.png
+%%DATADIR%%/brushes/Brush_blur.myb
+%%DATADIR%%/brushes/Brush_blur_prev.png
+%%DATADIR%%/brushes/Charcoal_ramon.myb
+%%DATADIR%%/brushes/Charcoal_ramon_prev.png
+%%DATADIR%%/brushes/Classic_Paint.myb
+%%DATADIR%%/brushes/Classic_Paint_prev.png
+%%DATADIR%%/brushes/Clouds.myb
+%%DATADIR%%/brushes/Clouds_prev.png
+%%DATADIR%%/brushes/Delayed_Line.myb
+%%DATADIR%%/brushes/Delayed_Line_prev.png
+%%DATADIR%%/brushes/Dust.myb
+%%DATADIR%%/brushes/Dust_prev.png
+%%DATADIR%%/brushes/FX_blender_prev
+%%DATADIR%%/brushes/Glazing.myb
+%%DATADIR%%/brushes/Glazing_prev.png
+%%DATADIR%%/brushes/Glow_ramon.myb
+%%DATADIR%%/brushes/Glow_ramon_prev.png
+%%DATADIR%%/brushes/Grain.myb
+%%DATADIR%%/brushes/Grain_prev.png
+%%DATADIR%%/brushes/Grass_1.myb
+%%DATADIR%%/brushes/Grass_1_prev.png
+%%DATADIR%%/brushes/Grass_2.myb
+%%DATADIR%%/brushes/Grass_2_prev.png
+%%DATADIR%%/brushes/Grass_3.myb
+%%DATADIR%%/brushes/Grass_3_prev.png
+%%DATADIR%%/brushes/Grass_P.myb
+%%DATADIR%%/brushes/Grass_P_prev.png
+%%DATADIR%%/brushes/Hair_.myb
+%%DATADIR%%/brushes/Hair__prev.png
+%%DATADIR%%/brushes/HardSoft.myb
+%%DATADIR%%/brushes/HardSoft_prev.png
+%%DATADIR%%/brushes/Hard_Eraser.myb
+%%DATADIR%%/brushes/Hard_Eraser_prev.png
+%%DATADIR%%/brushes/Ico_Alias_Brush.myb
+%%DATADIR%%/brushes/Ico_Alias_Brush_prev.png
+%%DATADIR%%/brushes/Ico_Basic_Round.myb
+%%DATADIR%%/brushes/Ico_Basic_Round_prev.png
+%%DATADIR%%/brushes/Ico_Bubble_Blender.myb
+%%DATADIR%%/brushes/Ico_Bubble_Blender_prev.png
+%%DATADIR%%/brushes/Ico_Bubble_Brush.myb
+%%DATADIR%%/brushes/Ico_Bubble_Brush_prev.png
+%%DATADIR%%/brushes/Ico_Calligraphic_Pen.myb
+%%DATADIR%%/brushes/Ico_Calligraphic_Pen_noborder.myb
+%%DATADIR%%/brushes/Ico_Calligraphic_Pen_noborder_prev.png
+%%DATADIR%%/brushes/Ico_Calligraphic_Pen_prev.png
+%%DATADIR%%/brushes/Ico_Chaotic_Smudge.myb
+%%DATADIR%%/brushes/Ico_Chaotic_Smudge_prev.png
+%%DATADIR%%/brushes/Ico_Color_Smudge_+.myb
+%%DATADIR%%/brushes/Ico_Color_Smudge_+_prev.png
+%%DATADIR%%/brushes/Ico_Crazy_Line.myb
+%%DATADIR%%/brushes/Ico_Crazy_Line_prev.png
+%%DATADIR%%/brushes/Ico_Cutting_Flat.myb
+%%DATADIR%%/brushes/Ico_Cutting_Flat_prev.png
+%%DATADIR%%/brushes/Ico_Dry_Pen.myb
+%%DATADIR%%/brushes/Ico_Dry_Pen_prev.png
+%%DATADIR%%/brushes/Ico_Felt_pen.myb
+%%DATADIR%%/brushes/Ico_Felt_pen_prev.png
+%%DATADIR%%/brushes/Ico_Flake_Blender.myb
+%%DATADIR%%/brushes/Ico_Flake_Blender_02.myb
+%%DATADIR%%/brushes/Ico_Flake_Blender_02_prev.png
+%%DATADIR%%/brushes/Ico_Flake_Blender_prev.png
+%%DATADIR%%/brushes/Ico_Flake_Dropping.myb
+%%DATADIR%%/brushes/Ico_Flake_Dropping_prev.png
+%%DATADIR%%/brushes/Ico_Flat_Basic.myb
+%%DATADIR%%/brushes/Ico_Flat_Basic_prev.png
+%%DATADIR%%/brushes/Ico_Flat_Blender.myb
+%%DATADIR%%/brushes/Ico_Flat_Blender_prev.png
+%%DATADIR%%/brushes/Ico_Flat_Mix.myb
+%%DATADIR%%/brushes/Ico_Flat_Mix_prev.png
+%%DATADIR%%/brushes/Ico_Flat_Pen.myb
+%%DATADIR%%/brushes/Ico_Flat_Pen_prev.png
+%%DATADIR%%/brushes/Ico_Glitter_Smudge_B.myb
+%%DATADIR%%/brushes/Ico_Glitter_Smudge_B_prev.png
+%%DATADIR%%/brushes/Ico_Hard_Eraser.myb
+%%DATADIR%%/brushes/Ico_Hard_Eraser_prev.png
+%%DATADIR%%/brushes/Ico_Hard_Oil.myb
+%%DATADIR%%/brushes/Ico_Hard_Oil_prev.png
+%%DATADIR%%/brushes/Ico_Impressionism_01.myb
+%%DATADIR%%/brushes/Ico_Impressionism_01_prev.png
+%%DATADIR%%/brushes/Ico_Impressionism_02.myb
+%%DATADIR%%/brushes/Ico_Impressionism_02_prev.png
+%%DATADIR%%/brushes/Ico_Irregular_Tube.myb
+%%DATADIR%%/brushes/Ico_Irregular_Tube_prev.png
+%%DATADIR%%/brushes/Ico_Jittering_Water.myb
+%%DATADIR%%/brushes/Ico_Jittering_Water_prev.png
+%%DATADIR%%/brushes/Ico_Line_Dropping.myb
+%%DATADIR%%/brushes/Ico_Line_Dropping_prev.png
+%%DATADIR%%/brushes/Ico_Line_Sketcher.myb
+%%DATADIR%%/brushes/Ico_Line_Sketcher_prev.png
+%%DATADIR%%/brushes/Ico_Linear_Watercolor.myb
+%%DATADIR%%/brushes/Ico_Linear_Watercolor_prev.png
+%%DATADIR%%/brushes/Ico_Liquid_Pen_+.myb
+%%DATADIR%%/brushes/Ico_Liquid_Pen_+_prev.png
+%%DATADIR%%/brushes/Ico_Micro_Felt_Pen.myb
+%%DATADIR%%/brushes/Ico_Micro_Felt_Pen_prev.png
+%%DATADIR%%/brushes/Ico_Mod_Deevad_Basic.myb
+%%DATADIR%%/brushes/Ico_Mod_Deevad_Basic_prev.png
+%%DATADIR%%/brushes/Ico_NewBasic_+_MultiC.myb
+%%DATADIR%%/brushes/Ico_NewBasic_+_MultiC_prev.png
+%%DATADIR%%/brushes/Ico_New_Basic.myb
+%%DATADIR%%/brushes/Ico_New_Basic_B.myb
+%%DATADIR%%/brushes/Ico_New_Basic_B_prev.png
+%%DATADIR%%/brushes/Ico_New_Basic_prev.png
+%%DATADIR%%/brushes/Ico_OC_Brush.myb
+%%DATADIR%%/brushes/Ico_OC_Brush_prev.png
+%%DATADIR%%/brushes/Ico_OC_Hard_Pen.myb
+%%DATADIR%%/brushes/Ico_OC_Hard_Pen_prev.png
+%%DATADIR%%/brushes/Ico_OC_Pen.myb
+%%DATADIR%%/brushes/Ico_OC_Pen_prev.png
+%%DATADIR%%/brushes/Ico_Oil_Blender.myb
+%%DATADIR%%/brushes/Ico_Oil_Blender_B.myb
+%%DATADIR%%/brushes/Ico_Oil_Blender_B_prev.png
+%%DATADIR%%/brushes/Ico_Oil_Blender_C.myb
+%%DATADIR%%/brushes/Ico_Oil_Blender_C_prev.png
+%%DATADIR%%/brushes/Ico_Oil_Blender_prev.png
+%%DATADIR%%/brushes/Ico_Pastel_Stain.myb
+%%DATADIR%%/brushes/Ico_Pastel_Stain_prev.png
+%%DATADIR%%/brushes/Ico_Precise_Pen.myb
+%%DATADIR%%/brushes/Ico_Precise_Pen_02.myb
+%%DATADIR%%/brushes/Ico_Precise_Pen_02_prev.png
+%%DATADIR%%/brushes/Ico_Precise_Pen_prev.png
+%%DATADIR%%/brushes/Ico_Rigid_Pen.myb
+%%DATADIR%%/brushes/Ico_Rigid_Pen_prev.png
+%%DATADIR%%/brushes/Ico_Smudge_Glitter.myb
+%%DATADIR%%/brushes/Ico_Smudge_Glitter_prev.png
+%%DATADIR%%/brushes/Ico_Soft_Eraser.myb
+%%DATADIR%%/brushes/Ico_Soft_Eraser_prev.png
+%%DATADIR%%/brushes/Ico_Soft_Oil.myb
+%%DATADIR%%/brushes/Ico_Soft_Oil_prev.png
+%%DATADIR%%/brushes/Ico_Variable_Flat_Pen.myb
+%%DATADIR%%/brushes/Ico_Variable_Flat_Pen_prev.png
+%%DATADIR%%/brushes/Ico_Water_Line.myb
+%%DATADIR%%/brushes/Ico_Water_Line_prev.png
+%%DATADIR%%/brushes/Ico_Water_Mix.myb
+%%DATADIR%%/brushes/Ico_Water_Mix_prev.png
+%%DATADIR%%/brushes/Ico_Water_Splash.myb
+%%DATADIR%%/brushes/Ico_Water_Splash_prev.png
+%%DATADIR%%/brushes/Ico_Water_Stain.myb
+%%DATADIR%%/brushes/Ico_Water_Stain_B.myb
+%%DATADIR%%/brushes/Ico_Water_Stain_B_prev.png
+%%DATADIR%%/brushes/Ico_Water_Stain_prev.png
+%%DATADIR%%/brushes/Ico_Watercolor_01.myb
+%%DATADIR%%/brushes/Ico_Watercolor_01_prev.png
+%%DATADIR%%/brushes/Ico_Watercolor_Smudge.myb
+%%DATADIR%%/brushes/Ico_Watercolor_Smudge_prev.png
+%%DATADIR%%/brushes/Ico_Watery_Pen.myb
+%%DATADIR%%/brushes/Ico_Watery_Pen_02.myb
+%%DATADIR%%/brushes/Ico_Watery_Pen_02_prev.png
+%%DATADIR%%/brushes/Ico_Watery_Pen_prev.png
+%%DATADIR%%/brushes/Ico_Weak_Flat.myb
+%%DATADIR%%/brushes/Ico_Weak_Flat_prev.png
+%%DATADIR%%/brushes/Ico_Weak_Painting.myb
+%%DATADIR%%/brushes/Ico_Weak_Painting_prev.png
+%%DATADIR%%/brushes/Ico_Wet_Flat.myb
+%%DATADIR%%/brushes/Ico_Wet_Flat_prev.png
+%%DATADIR%%/brushes/Jitter.myb
+%%DATADIR%%/brushes/Jitter_prev.png
+%%DATADIR%%/brushes/Knife.myb
+%%DATADIR%%/brushes/Knife_prev.png
+%%DATADIR%%/brushes/Marker.myb
+%%DATADIR%%/brushes/Marker_prev.png
+%%DATADIR%%/brushes/Offset_Splats.myb
+%%DATADIR%%/brushes/Offset_Splats_prev.png
+%%DATADIR%%/brushes/P.Shade2.myb
+%%DATADIR%%/brushes/P.Shade2_prev.png
+%%DATADIR%%/brushes/P._Shade.myb
+%%DATADIR%%/brushes/P._Shade_prev.png
+%%DATADIR%%/brushes/PenBrush.myb
+%%DATADIR%%/brushes/PenBrush_prev.png
+%%DATADIR%%/brushes/RS_blendOP.myb
+%%DATADIR%%/brushes/RS_blendOP_prev.png
+%%DATADIR%%/brushes/Round.myb
+%%DATADIR%%/brushes/Round_Bl.myb
+%%DATADIR%%/brushes/Round_Bl_prev.png
+%%DATADIR%%/brushes/Round_prev.png
+%%DATADIR%%/brushes/Sketch_1.myb
+%%DATADIR%%/brushes/Sketch_1_prev.png
+%%DATADIR%%/brushes/Sketch_2.myb
+%%DATADIR%%/brushes/Sketch_2_prev.png
+%%DATADIR%%/brushes/Smear.myb
+%%DATADIR%%/brushes/Smear_prev.png
+%%DATADIR%%/brushes/Smudge_ramon.myb
+%%DATADIR%%/brushes/Smudge_ramon_prev.png
+%%DATADIR%%/brushes/Soft_Eraser.myb
+%%DATADIR%%/brushes/Soft_Eraser_prev.png
+%%DATADIR%%/brushes/Sparks.myb
+%%DATADIR%%/brushes/Sparks_prev.png
+%%DATADIR%%/brushes/Splats_1.myb
+%%DATADIR%%/brushes/Splats_1_prev.png
+%%DATADIR%%/brushes/Splats_2.myb
+%%DATADIR%%/brushes/Splats_2_prev.png
+%%DATADIR%%/brushes/Splats_3.myb
+%%DATADIR%%/brushes/Splats_3_prev.png
+%%DATADIR%%/brushes/Splats_4.myb
+%%DATADIR%%/brushes/Splats_4_prev.png
+%%DATADIR%%/brushes/Splats_5.myb
+%%DATADIR%%/brushes/Splats_5_prev.png
+%%DATADIR%%/brushes/Splatter-drop.myb
+%%DATADIR%%/brushes/Splatter-drop2.myb
+%%DATADIR%%/brushes/Splatter-drop2_prev.png
+%%DATADIR%%/brushes/Splatter-drop_prev.png
+%%DATADIR%%/brushes/Starfield.myb
+%%DATADIR%%/brushes/Starfield_prev.png
+%%DATADIR%%/brushes/Wet_Direction.myb
+%%DATADIR%%/brushes/Wet_Direction_prev.png
+%%DATADIR%%/brushes/Wet_Soft.myb
+%%DATADIR%%/brushes/Wet_Soft_prev.png
+%%DATADIR%%/brushes/Wet_Solid.myb
+%%DATADIR%%/brushes/Wet_Solid_prev.png
 %%DATADIR%%/brushes/ab009.myb
 %%DATADIR%%/brushes/ab009_prev.png
-%%DATADIR%%/brushes/ab023.myb
-%%DATADIR%%/brushes/ab023_prev.png
-%%DATADIR%%/brushes/ab026.myb
-%%DATADIR%%/brushes/ab026_prev.png
 %%DATADIR%%/brushes/ab028.myb
 %%DATADIR%%/brushes/ab028_prev.png
-%%DATADIR%%/brushes/ab033.myb
-%%DATADIR%%/brushes/ab033_prev.png
 %%DATADIR%%/brushes/ab043.myb
 %%DATADIR%%/brushes/ab043_prev.png
+%%DATADIR%%/brushes/acrylic-01-only-water.myb
+%%DATADIR%%/brushes/acrylic-01-only-water_prev.png
+%%DATADIR%%/brushes/acrylic-01-paint.myb
+%%DATADIR%%/brushes/acrylic-01-paint_prev.png
+%%DATADIR%%/brushes/acrylic-01-with-water.myb
+%%DATADIR%%/brushes/acrylic-01-with-water_prev.png
+%%DATADIR%%/brushes/acrylic-02-only-water.myb
+%%DATADIR%%/brushes/acrylic-02-only-water_prev.png
+%%DATADIR%%/brushes/acrylic-02-paint.myb
+%%DATADIR%%/brushes/acrylic-02-paint_prev.png
+%%DATADIR%%/brushes/acrylic-02-with-water.myb
+%%DATADIR%%/brushes/acrylic-02-with-water_prev.png
+%%DATADIR%%/brushes/acrylic-03-only-water.myb
+%%DATADIR%%/brushes/acrylic-03-only-water_prev.png
+%%DATADIR%%/brushes/acrylic-03-paint.myb
+%%DATADIR%%/brushes/acrylic-03-paint_prev.png
+%%DATADIR%%/brushes/acrylic-03-with-water.myb
+%%DATADIR%%/brushes/acrylic-03-with-water_prev.png
+%%DATADIR%%/brushes/acrylic-04-only-water.myb
+%%DATADIR%%/brushes/acrylic-04-only-water_prev.png
+%%DATADIR%%/brushes/acrylic-04-paint.myb
+%%DATADIR%%/brushes/acrylic-04-paint_prev.png
+%%DATADIR%%/brushes/acrylic-04-with-water.myb
+%%DATADIR%%/brushes/acrylic-04-with-water_prev.png
+%%DATADIR%%/brushes/acrylic-05-only-water.myb
+%%DATADIR%%/brushes/acrylic-05-only-water_prev.png
+%%DATADIR%%/brushes/acrylic-05-paint.myb
+%%DATADIR%%/brushes/acrylic-05-paint_prev.png
+%%DATADIR%%/brushes/acrylic-05-with-water.myb
+%%DATADIR%%/brushes/acrylic-05-with-water_prev.png
+%%DATADIR%%/brushes/airbrush-digital.myb
+%%DATADIR%%/brushes/airbrush-digital_prev.png
+%%DATADIR%%/brushes/airbrush-real-dirty.myb
+%%DATADIR%%/brushes/airbrush-real-dirty_prev.png
+%%DATADIR%%/brushes/airbrush-real.myb
+%%DATADIR%%/brushes/airbrush-real_prev.png
 %%DATADIR%%/brushes/aspec_fun_5.myb
 %%DATADIR%%/brushes/aspec_fun_5_prev.png
 %%DATADIR%%/brushes/aspect_fun_1.myb
 %%DATADIR%%/brushes/aspect_fun_1_prev.png
 %%DATADIR%%/brushes/aspect_fun_3.myb
 %%DATADIR%%/brushes/aspect_fun_3_prev.png
+%%DATADIR%%/brushes/ballpoint-pen.myb
+%%DATADIR%%/brushes/ballpoint-pen_prev.png
+%%DATADIR%%/brushes/basic-flat.myb
+%%DATADIR%%/brushes/basic-flat_prev.png
+%%DATADIR%%/brushes/basic-round.myb
+%%DATADIR%%/brushes/basic-round_prev.png
 %%DATADIR%%/brushes/basic.myb
 %%DATADIR%%/brushes/basic_prev.png
 %%DATADIR%%/brushes/bi000.myb
@@ -94,20 +367,28 @@ share/applications/mypaint.desktop
 %%DATADIR%%/brushes/bi001_prev.png
 %%DATADIR%%/brushes/bi003.myb
 %%DATADIR%%/brushes/bi003_prev.png
-%%DATADIR%%/brushes/bi004.myb
-%%DATADIR%%/brushes/bi004_prev.png
 %%DATADIR%%/brushes/bi006.myb
 %%DATADIR%%/brushes/bi006_prev.png
 %%DATADIR%%/brushes/bi010.myb
 %%DATADIR%%/brushes/bi010_prev.png
-%%DATADIR%%/brushes/bigcharcoal.myb
-%%DATADIR%%/brushes/bigcharcoal_prev.png
 %%DATADIR%%/brushes/blend+paint.myb
 %%DATADIR%%/brushes/blend+paint_prev.png
 %%DATADIR%%/brushes/blur.myb
 %%DATADIR%%/brushes/blur_prev.png
 %%DATADIR%%/brushes/bulk.myb
 %%DATADIR%%/brushes/bulk_prev.png
+%%DATADIR%%/brushes/charcoal-01.myb
+%%DATADIR%%/brushes/charcoal-01_prev.png
+%%DATADIR%%/brushes/charcoal-02.myb
+%%DATADIR%%/brushes/charcoal-02_prev.png
+%%DATADIR%%/brushes/charcoal-03.myb
+%%DATADIR%%/brushes/charcoal-03_prev.png
+%%DATADIR%%/brushes/charcoal-04.myb
+%%DATADIR%%/brushes/charcoal-04_prev.png
+%%DATADIR%%/brushes/charcoal-blur1.myb
+%%DATADIR%%/brushes/charcoal-blur1_prev.png
+%%DATADIR%%/brushes/charcoal-blur2.myb
+%%DATADIR%%/brushes/charcoal-blur2_prev.png
 %%DATADIR%%/brushes/charcoal.myb
 %%DATADIR%%/brushes/charcoal_prev.png
 %%DATADIR%%/brushes/coarse_bulk_1.myb
@@ -118,8 +399,32 @@ share/applications/mypaint.desktop
 %%DATADIR%%/brushes/coarse_bulk_3_prev.png
 %%DATADIR%%/brushes/coarse_bulk_4.myb
 %%DATADIR%%/brushes/coarse_bulk_4_prev.png
+%%DATADIR%%/brushes/decoration-01.myb
+%%DATADIR%%/brushes/decoration-01_prev.png
+%%DATADIR%%/brushes/decoration-02.myb
+%%DATADIR%%/brushes/decoration-02_prev.png
+%%DATADIR%%/brushes/decoration-03.myb
+%%DATADIR%%/brushes/decoration-03_prev.png
+%%DATADIR%%/brushes/decoration-04.myb
+%%DATADIR%%/brushes/decoration-04_prev.png
+%%DATADIR%%/brushes/decoration-05.myb
+%%DATADIR%%/brushes/decoration-05_prev.png
+%%DATADIR%%/brushes/decoration-06.myb
+%%DATADIR%%/brushes/decoration-06_prev.png
+%%DATADIR%%/brushes/decoration-07.myb
+%%DATADIR%%/brushes/decoration-07_prev.png
+%%DATADIR%%/brushes/decoration-08.myb
+%%DATADIR%%/brushes/decoration-08_prev.png
+%%DATADIR%%/brushes/decoration-09.myb
+%%DATADIR%%/brushes/decoration-09_prev.png
+%%DATADIR%%/brushes/detail-soft.myb
+%%DATADIR%%/brushes/detail-soft_prev.png
+%%DATADIR%%/brushes/details-hard.myb
+%%DATADIR%%/brushes/details-hard_prev.png
 %%DATADIR%%/brushes/dry_brush.myb
 %%DATADIR%%/brushes/dry_brush_prev.png
+%%DATADIR%%/brushes/fur.myb
+%%DATADIR%%/brushes/fur_prev.png
 %%DATADIR%%/brushes/glow.myb
 %%DATADIR%%/brushes/glow_prev.png
 %%DATADIR%%/brushes/hair.myb
@@ -128,9 +433,15 @@ share/applications/mypaint.desktop
 %%DATADIR%%/brushes/hard_sting_prev.png
 %%DATADIR%%/brushes/hue_fun.myb
 %%DATADIR%%/brushes/hue_fun_prev.png
+%%DATADIR%%/brushes/ink-fill.myb
+%%DATADIR%%/brushes/ink-fill_prev.png
+%%DATADIR%%/brushes/ink-pen.myb
+%%DATADIR%%/brushes/ink-pen_prev.png
 %%DATADIR%%/brushes/ink.myb
 %%DATADIR%%/brushes/ink_eraser.myb
 %%DATADIR%%/brushes/ink_eraser_prev.png
+%%DATADIR%%/brushes/ink_hard.myb
+%%DATADIR%%/brushes/ink_hard_prev.png
 %%DATADIR%%/brushes/ink_prev.png
 %%DATADIR%%/brushes/leaves.myb
 %%DATADIR%%/brushes/leaves_prev.png
@@ -176,23 +487,45 @@ share/applications/mypaint.desktop
 %%DATADIR%%/brushes/o398_prev.png
 %%DATADIR%%/brushes/o512.myb
 %%DATADIR%%/brushes/o512_prev.png
-%%DATADIR%%/brushes/o558.myb
-%%DATADIR%%/brushes/o558_prev.png
 %%DATADIR%%/brushes/o594.myb
 %%DATADIR%%/brushes/o594_prev.png
 %%DATADIR%%/brushes/o826.myb
 %%DATADIR%%/brushes/o826_prev.png
 %%DATADIR%%/brushes/o834.myb
 %%DATADIR%%/brushes/o834_prev.png
-%%DATADIR%%/brushes/o888.myb
-%%DATADIR%%/brushes/o888_prev.png
 %%DATADIR%%/brushes/o945.myb
 %%DATADIR%%/brushes/o945_prev.png
-%%DATADIR%%/brushes/old_b008.myb
-%%DATADIR%%/brushes/old_b008_prev.png
+%%DATADIR%%/brushes/oil-01-clean.myb
+%%DATADIR%%/brushes/oil-01-clean_prev.png
+%%DATADIR%%/brushes/oil-01-paint.myb
+%%DATADIR%%/brushes/oil-01-paint_prev.png
+%%DATADIR%%/brushes/oil-02-clean.myb
+%%DATADIR%%/brushes/oil-02-clean_prev.png
+%%DATADIR%%/brushes/oil-02-paint.myb
+%%DATADIR%%/brushes/oil-02-paint_prev.png
+%%DATADIR%%/brushes/oil-03-clean.myb
+%%DATADIR%%/brushes/oil-03-clean_prev.png
+%%DATADIR%%/brushes/oil-03-paint.myb
+%%DATADIR%%/brushes/oil-03-paint_prev.png
+%%DATADIR%%/brushes/oil-04-clean.myb
+%%DATADIR%%/brushes/oil-04-clean_prev.png
+%%DATADIR%%/brushes/oil-04-paint.myb
+%%DATADIR%%/brushes/oil-04-paint_prev.png
+%%DATADIR%%/brushes/oil-05-clean.myb
+%%DATADIR%%/brushes/oil-05-clean_prev.png
+%%DATADIR%%/brushes/oil-05-paint.myb
+%%DATADIR%%/brushes/oil-05-paint_prev.png
+%%DATADIR%%/brushes/oil-06-clean.myb
+%%DATADIR%%/brushes/oil-06-clean_prev.png
+%%DATADIR%%/brushes/oil-06-paint.myb
+%%DATADIR%%/brushes/oil-06-paint_prev.png
+%%DATADIR%%/brushes/oil-mop.myb
+%%DATADIR%%/brushes/oil-mop_prev.png
 %%DATADIR%%/brushes/order.conf
 %%DATADIR%%/brushes/painting_knife.myb
 %%DATADIR%%/brushes/painting_knife_prev.png
+%%DATADIR%%/brushes/pencil-2b-deevad.myb
+%%DATADIR%%/brushes/pencil-2b-deevad_prev.png
 %%DATADIR%%/brushes/pencil-2b.myb
 %%DATADIR%%/brushes/pencil-2b_prev.png
 %%DATADIR%%/brushes/pencil-6b.myb
@@ -201,10 +534,14 @@ share/applications/mypaint.desktop
 %%DATADIR%%/brushes/pencil-8b_prev.png
 %%DATADIR%%/brushes/pencil-blur.myb
 %%DATADIR%%/brushes/pencil-blur_prev.png
+%%DATADIR%%/brushes/pencil-color.myb
+%%DATADIR%%/brushes/pencil-color_prev.png
 %%DATADIR%%/brushes/pencil-h.myb
 %%DATADIR%%/brushes/pencil-h_prev.png
 %%DATADIR%%/brushes/pencil-hb.myb
 %%DATADIR%%/brushes/pencil-hb_prev.png
+%%DATADIR%%/brushes/pencil-mechanical.myb
+%%DATADIR%%/brushes/pencil-mechanical_prev.png
 %%DATADIR%%/brushes/pencil-rubber.myb
 %%DATADIR%%/brushes/pencil-rubber_prev.png
 %%DATADIR%%/brushes/pencil.myb
@@ -218,8 +555,6 @@ share/applications/mypaint.desktop
 %%DATADIR%%/brushes/redbrush_prev.png
 %%DATADIR%%/brushes/s000.myb
 %%DATADIR%%/brushes/s000_prev.png
-%%DATADIR%%/brushes/s002.myb
-%%DATADIR%%/brushes/s002_prev.png
 %%DATADIR%%/brushes/s003.myb
 %%DATADIR%%/brushes/s003_prev.png
 %%DATADIR%%/brushes/s004.myb
@@ -230,8 +565,6 @@ share/applications/mypaint.desktop
 %%DATADIR%%/brushes/s007_prev.png
 %%DATADIR%%/brushes/s008.myb
 %%DATADIR%%/brushes/s008_prev.png
-%%DATADIR%%/brushes/s009.myb
-%%DATADIR%%/brushes/s009_prev.png
 %%DATADIR%%/brushes/s011.myb
 %%DATADIR%%/brushes/s011_prev.png
 %%DATADIR%%/brushes/s014.myb
@@ -250,10 +583,18 @@ share/applications/mypaint.desktop
 %%DATADIR%%/brushes/s109_prev.png
 %%DATADIR%%/brushes/short_grass.myb
 %%DATADIR%%/brushes/short_grass_prev.png
-%%DATADIR%%/brushes/slow.myb
-%%DATADIR%%/brushes/slow_prev.png
+%%DATADIR%%/brushes/smudge-blur.myb
+%%DATADIR%%/brushes/smudge-blur_prev.png
+%%DATADIR%%/brushes/smudge-classic.myb
+%%DATADIR%%/brushes/smudge-classic_prev.png
 %%DATADIR%%/brushes/smudge.myb
 %%DATADIR%%/brushes/smudge_prev.png
+%%DATADIR%%/brushes/snow_1.myb
+%%DATADIR%%/brushes/snow_1_prev.png
+%%DATADIR%%/brushes/snow_2.myb
+%%DATADIR%%/brushes/snow_2_prev.png
+%%DATADIR%%/brushes/soft-large.myb
+%%DATADIR%%/brushes/soft-large_prev.png
 %%DATADIR%%/brushes/soft_sting.myb
 %%DATADIR%%/brushes/soft_sting_prev.png
 %%DATADIR%%/brushes/soft_water.myb
@@ -274,63 +615,138 @@ share/applications/mypaint.desktop
 %%DATADIR%%/brushes/splatter-06_prev.png
 %%DATADIR%%/brushes/subtle_pencil.myb
 %%DATADIR%%/brushes/subtle_pencil_prev.png
+%%DATADIR%%/brushes/texture-01.myb
+%%DATADIR%%/brushes/texture-01_prev.png
+%%DATADIR%%/brushes/texture-02.myb
+%%DATADIR%%/brushes/texture-02_prev.png
+%%DATADIR%%/brushes/texture-03.myb
+%%DATADIR%%/brushes/texture-03_prev.png
+%%DATADIR%%/brushes/texture-04.myb
+%%DATADIR%%/brushes/texture-04_prev.png
+%%DATADIR%%/brushes/texture-05.myb
+%%DATADIR%%/brushes/texture-05_prev.png
+%%DATADIR%%/brushes/texture-06.myb
+%%DATADIR%%/brushes/texture-06_prev.png
+%%DATADIR%%/brushes/texture-07.myb
+%%DATADIR%%/brushes/texture-07_prev.png
+%%DATADIR%%/brushes/texture-08.myb
+%%DATADIR%%/brushes/texture-08_prev.png
+%%DATADIR%%/brushes/texture-09.myb
+%%DATADIR%%/brushes/texture-09_prev.png
+%%DATADIR%%/brushes/texture-10.myb
+%%DATADIR%%/brushes/texture-10_prev.png
+%%DATADIR%%/brushes/texture-11.myb
+%%DATADIR%%/brushes/texture-11_prev.png
+%%DATADIR%%/brushes/texture-12.myb
+%%DATADIR%%/brushes/texture-12_prev.png
+%%DATADIR%%/brushes/texture-tree.myb
+%%DATADIR%%/brushes/texture-tree_prev.png
+%%DATADIR%%/brushes/textured-angle.myb
+%%DATADIR%%/brushes/textured-angle_prev.png
+%%DATADIR%%/brushes/textured-charcoal.myb
+%%DATADIR%%/brushes/textured-charcoal_prev.png
+%%DATADIR%%/brushes/textured-grain.myb
+%%DATADIR%%/brushes/textured-grain_prev.png
 %%DATADIR%%/brushes/textured_ink.myb
 %%DATADIR%%/brushes/textured_ink_prev.png
+%%DATADIR%%/brushes/tree.myb
+%%DATADIR%%/brushes/tree_2.myb
+%%DATADIR%%/brushes/tree_2_prev.png
+%%DATADIR%%/brushes/tree_prev.png
+%%DATADIR%%/brushes/water-01.myb
+%%DATADIR%%/brushes/water-01_prev.png
+%%DATADIR%%/brushes/water-02.myb
+%%DATADIR%%/brushes/water-02_prev.png
+%%DATADIR%%/brushes/water-03.myb
+%%DATADIR%%/brushes/water-03_prev.png
+%%DATADIR%%/brushes/water-04.myb
+%%DATADIR%%/brushes/water-04_prev.png
+%%DATADIR%%/brushes/water-05.myb
+%%DATADIR%%/brushes/water-05_prev.png
+%%DATADIR%%/brushes/water-06.myb
+%%DATADIR%%/brushes/water-06_prev.png
+%%DATADIR%%/brushes/watercolor-01-paint.myb
+%%DATADIR%%/brushes/watercolor-01-paint_prev.png
+%%DATADIR%%/brushes/watercolor-01-water.myb
+%%DATADIR%%/brushes/watercolor-01-water_prev.png
+%%DATADIR%%/brushes/watercolor-02-paint.myb
+%%DATADIR%%/brushes/watercolor-02-paint_prev.png
+%%DATADIR%%/brushes/watercolor-02-water.myb
+%%DATADIR%%/brushes/watercolor-02-water_prev.png
+%%DATADIR%%/brushes/wet-flat.myb
+%%DATADIR%%/brushes/wet-flat_prev.png
+%%DATADIR%%/brushes/wet-round.myb
+%%DATADIR%%/brushes/wet-round_prev.png
+%%DATADIR%%/brushes/wet_airbrush.myb
+%%DATADIR%%/brushes/wet_airbrush_prev.png
+%%DATADIR%%/brushes/wet_round.myb
+%%DATADIR%%/brushes/wet_round_prev.png
 %%DATADIR%%/brushlib/__init__.py
 %%DATADIR%%/brushlib/brushsettings.py
 %%DATADIR%%/brushlib/generate.py
-%%DATADIR%%/desktop/16x16/mypaint.png
-%%DATADIR%%/desktop/22x22/mypaint.png
-%%DATADIR%%/desktop/24x24/mypaint.png
-%%DATADIR%%/desktop/32x32/mypaint.png
-%%DATADIR%%/desktop/48x48/mypaint.png
-%%DATADIR%%/desktop/mypaint.desktop
-%%DATADIR%%/desktop/mypaint.ico
-%%DATADIR%%/desktop/mypaint_48.png
-%%DATADIR%%/desktop/scalable/mypaint.svg
-%%DATADIR%%/desktop/svg/16.svg
-%%DATADIR%%/desktop/svg/22.svg
-%%DATADIR%%/desktop/svg/32.svg
 %%DATADIR%%/gui/__init__.py
 %%DATADIR%%/gui/application.py
 %%DATADIR%%/gui/backgroundwindow.py
+%%DATADIR%%/gui/brushcreationwidget.py
+%%DATADIR%%/gui/brushmanager.py
 %%DATADIR%%/gui/brushselectionwindow.py
 %%DATADIR%%/gui/brushsettingswindow.py
+%%DATADIR%%/gui/colorhistory.py
+%%DATADIR%%/gui/colorpicker.py
+%%DATADIR%%/gui/colorsamplerwindow.py
 %%DATADIR%%/gui/colorselectionwindow.py
+%%DATADIR%%/gui/cursor.py
+%%DATADIR%%/gui/dialogs.py
 %%DATADIR%%/gui/drawwindow.py
+%%DATADIR%%/gui/filehandling.py
 %%DATADIR%%/gui/functionwindow.py
 %%DATADIR%%/gui/gtkexcepthook.py
 %%DATADIR%%/gui/historypopup.py
 %%DATADIR%%/gui/keyboard.py
+%%DATADIR%%/gui/layerswindow.py
 %%DATADIR%%/gui/main.py
+%%DATADIR%%/gui/menu.xml
 %%DATADIR%%/gui/pixbuflist.py
 %%DATADIR%%/gui/settingswindow.py
 %%DATADIR%%/gui/stategroup.py
 %%DATADIR%%/gui/tileddrawwidget.py
 %%DATADIR%%/lib/__init__.py
+%%DATADIR%%/lib/backgroundsurface.py
 %%DATADIR%%/lib/brush.py
 %%DATADIR%%/lib/command.py
 %%DATADIR%%/lib/document.py
 %%DATADIR%%/lib/helpers.py
+%%DATADIR%%/lib/idletask.py
 %%DATADIR%%/lib/layer.py
 %%DATADIR%%/lib/mypaintlib.py
 %%DATADIR%%/lib/pixbufsurface.py
-%%DATADIR%%/lib/serialize.py
 %%DATADIR%%/lib/stroke.py
+%%DATADIR%%/lib/strokemap.py
+%%DATADIR%%/lib/strokemap_pb2.py
 %%DATADIR%%/lib/tiledsurface.py
+%%DATADIR%%/pixmaps/cursor_color_picker.png
+%%DATADIR%%/pixmaps/mypaint_logo.png
+%%DATADIR%%/pixmaps/plus.png
+@dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%/gui
-@dirrm %%DATADIR%%/desktop/svg
-@dirrm %%DATADIR%%/desktop/scalable
-@dirrm %%DATADIR%%/desktop/48x48
-@dirrm %%DATADIR%%/desktop/32x32
-@dirrm %%DATADIR%%/desktop/24x24
-@dirrm %%DATADIR%%/desktop/22x22
-@dirrm %%DATADIR%%/desktop/16x16
-@dirrm %%DATADIR%%/desktop
 @dirrm %%DATADIR%%/brushlib
 @dirrm %%DATADIR%%/brushes
 @dirrm %%DATADIR%%/backgrounds
 @dirrm %%DATADIR%%
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrmtry share/applications
 @dirrm lib/mypaint