5 files changed, 229 insertions, 111 deletions

diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile
index 43fd8d031908..a64118748899 100644
--- a/graphics/mypaint/Makefile
+++ b/graphics/mypaint/Makefile
@@ -6,18 +6,22 @@
 #
 
 PORTNAME=	mypaint
-PORTVERSION=	0.5.1
+PORTVERSION=	0.7.0
 CATEGORIES=	graphics
-MASTER_SITES=	http://people.ee.ethz.ch/~mrenold/mypaint/ CENKES
+MASTER_SITES=	http://download.gna.org/mypaint/ \
+		http://mirror.amdmi3.ru/distfiles/
 
 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
+
 USE_BZIP2=	yes
-USE_GNOME=	pygtk2
-USE_GMAKE=	yes
+USE_GNOME=	glib20 pygtk2
 USE_PYTHON=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-static
+USE_SCONS=	yes
+SCONS_ARGS=	prefix="${PREFIX}"
 
 .include <bsd.port.mk>
diff --git a/graphics/mypaint/distinfo b/graphics/mypaint/distinfo
index 99b0a07bbacc..566c9411817e 100644
--- a/graphics/mypaint/distinfo
+++ b/graphics/mypaint/distinfo
@@ -1,3 +1,3 @@
-MD5 (mypaint-0.5.1.tar.bz2) = e1fba553c5ef82edabf760c3206c31f5
-SHA256 (mypaint-0.5.1.tar.bz2) = 4333316042d263422cf1b876aa1458dacafa2a722240e6ac8771657ccbf9a875
-SIZE (mypaint-0.5.1.tar.bz2) = 2569334
+MD5 (mypaint-0.7.0.tar.bz2) = 98113770396e944c25293e84f80095f4
+SHA256 (mypaint-0.7.0.tar.bz2) = 73feabd376e7c8189662dc40a7a41c742781730d8145612499f854116110076d
+SIZE (mypaint-0.7.0.tar.bz2) = 2670458
diff --git a/graphics/mypaint/files/patch-SConstruct b/graphics/mypaint/files/patch-SConstruct
new file mode 100644
index 000000000000..bd37f1814270
--- /dev/null
+++ b/graphics/mypaint/files/patch-SConstruct
@@ -0,0 +1,18 @@
+--- 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))
+-env = Environment(ENV=os.environ, options=opts)
++env = Environment(ENV=os.environ, options=opts, **dict((k, v.split()) for k, v in ARGUMENTS.iteritems()))
+ 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')
+ 
diff --git a/graphics/mypaint/pkg-descr b/graphics/mypaint/pkg-descr
index 2ef34fa211de..8aaef5d67ed1 100644
--- a/graphics/mypaint/pkg-descr
+++ b/graphics/mypaint/pkg-descr
@@ -4,5 +4,5 @@ collection. There is a complex interface for creating your own brushes,
 focusing on brush dynamics (changes with speed, pressure, or randomly).
 The canvas size is unlimited and undo is supported, but not layers.
 
-WWW: http://people.ee.ethz.ch/~mrenold/mypaint/
+WWW: http://mypaint.intilinux.com/
 Author: Martin Renold <martinxyz@gmx.ch>
diff --git a/graphics/mypaint/pkg-plist b/graphics/mypaint/pkg-plist
index 04c4e643c945..20f59056d7b1 100644
--- a/graphics/mypaint/pkg-plist
+++ b/graphics/mypaint/pkg-plist
@@ -1,46 +1,93 @@
 bin/mypaint
-%%PYTHON_SITELIBDIR%%/mypaint/mydrawwidget.la
-%%PYTHON_SITELIBDIR%%/mypaint/mydrawwidget.so
-%%PYTHON_SITELIBDIR%%/mypaint/mydrawwidget.so.0
+lib/mypaint/_mypaintlib.so
 share/applications/mypaint.desktop
-%%DATADIR%%/brushes/ab001.myb
-%%DATADIR%%/brushes/ab001_prev.png
+%%DATADIR%%/backgrounds/01_white.png
+%%DATADIR%%/backgrounds/02_black.png
+%%DATADIR%%/backgrounds/03_check1.png
+%%DATADIR%%/backgrounds/03_check2.png
+%%DATADIR%%/backgrounds/04_grey1.png
+%%DATADIR%%/backgrounds/04_grey2.png
+%%DATADIR%%/backgrounds/05_grey3.png
+%%DATADIR%%/backgrounds/10_soft_yellow.png
+%%DATADIR%%/backgrounds/11_weak_blue.png
+%%DATADIR%%/backgrounds/canvas1_1.png
+%%DATADIR%%/backgrounds/canvas1_2.png
+%%DATADIR%%/backgrounds/canvas1_3.png
+%%DATADIR%%/backgrounds/canvas2_1.png
+%%DATADIR%%/backgrounds/canvas3_1.png
+%%DATADIR%%/backgrounds/canvas3_2.png
+%%DATADIR%%/backgrounds/canvas3_3.png
+%%DATADIR%%/backgrounds/paper1_1.png
+%%DATADIR%%/backgrounds/paper1_10.png
+%%DATADIR%%/backgrounds/paper1_11.png
+%%DATADIR%%/backgrounds/paper1_12.png
+%%DATADIR%%/backgrounds/paper1_13.png
+%%DATADIR%%/backgrounds/paper1_2.png
+%%DATADIR%%/backgrounds/paper1_3.png
+%%DATADIR%%/backgrounds/paper1_4.png
+%%DATADIR%%/backgrounds/paper1_5.png
+%%DATADIR%%/backgrounds/paper1_6.png
+%%DATADIR%%/backgrounds/paper1_7.png
+%%DATADIR%%/backgrounds/paper1_8.png
+%%DATADIR%%/backgrounds/paper1_9.png
+%%DATADIR%%/backgrounds/paper2_1.png
+%%DATADIR%%/backgrounds/paper2_2.png
+%%DATADIR%%/backgrounds/paper2_3.png
+%%DATADIR%%/backgrounds/paper2_4.png
+%%DATADIR%%/backgrounds/paper2_5.png
+%%DATADIR%%/backgrounds/paper3_1.png
+%%DATADIR%%/backgrounds/paper3_2.png
+%%DATADIR%%/backgrounds/paper3_3.png
+%%DATADIR%%/backgrounds/paper3_4.png
+%%DATADIR%%/backgrounds/paper3_5.png
+%%DATADIR%%/backgrounds/paper3_6.png
+%%DATADIR%%/backgrounds/paper3_7.png
+%%DATADIR%%/backgrounds/paper4_1.png
+%%DATADIR%%/backgrounds/paper4_2.png
+%%DATADIR%%/backgrounds/paper5_1.png
+%%DATADIR%%/backgrounds/paper5_2.png
+%%DATADIR%%/backgrounds/paper5_3.png
+%%DATADIR%%/backgrounds/paper6_1.png
+%%DATADIR%%/backgrounds/paper6_2.png
+%%DATADIR%%/backgrounds/paper6_3.png
+%%DATADIR%%/backgrounds/paper6_4.png
+%%DATADIR%%/backgrounds/paper7_1.png
+%%DATADIR%%/backgrounds/paper7_10.png
+%%DATADIR%%/backgrounds/paper7_2.png
+%%DATADIR%%/backgrounds/paper7_3.png
+%%DATADIR%%/backgrounds/paper7_4.png
+%%DATADIR%%/backgrounds/paper7_5.png
+%%DATADIR%%/backgrounds/paper7_6.png
+%%DATADIR%%/backgrounds/paper7_7.png
+%%DATADIR%%/backgrounds/paper7_8.png
+%%DATADIR%%/backgrounds/paper7_9.png
+%%DATADIR%%/backgrounds/pattern2.png
+%%DATADIR%%/backgrounds/squares2.png
+%%DATADIR%%/backgrounds/squares2_blue.png
 %%DATADIR%%/brushes/ab002.myb
 %%DATADIR%%/brushes/ab002_prev.png
-%%DATADIR%%/brushes/ab003.myb
-%%DATADIR%%/brushes/ab003_prev.png
-%%DATADIR%%/brushes/ab006.myb
-%%DATADIR%%/brushes/ab006_prev.png
 %%DATADIR%%/brushes/ab007.myb
 %%DATADIR%%/brushes/ab007_prev.png
 %%DATADIR%%/brushes/ab009.myb
 %%DATADIR%%/brushes/ab009_prev.png
-%%DATADIR%%/brushes/ab011.myb
-%%DATADIR%%/brushes/ab011_prev.png
-%%DATADIR%%/brushes/ab020.myb
-%%DATADIR%%/brushes/ab020_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/ab029.myb
-%%DATADIR%%/brushes/ab029_prev.png
 %%DATADIR%%/brushes/ab033.myb
 %%DATADIR%%/brushes/ab033_prev.png
 %%DATADIR%%/brushes/ab043.myb
 %%DATADIR%%/brushes/ab043_prev.png
-%%DATADIR%%/brushes/aold_b000.myb
-%%DATADIR%%/brushes/aold_b000_prev.png
-%%DATADIR%%/brushes/aold_b003.myb
-%%DATADIR%%/brushes/aold_b003_prev.png
-%%DATADIR%%/brushes/aold_b004.myb
-%%DATADIR%%/brushes/aold_b004_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/basic.myb
 %%DATADIR%%/brushes/basic_prev.png
-%%DATADIR%%/brushes/bigcharcoal.myb
-%%DATADIR%%/brushes/bigcharcoal_prev.png
 %%DATADIR%%/brushes/bi000.myb
 %%DATADIR%%/brushes/bi000_prev.png
 %%DATADIR%%/brushes/bi001.myb
@@ -53,48 +100,64 @@ share/applications/mypaint.desktop
 %%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.myb
 %%DATADIR%%/brushes/charcoal_prev.png
+%%DATADIR%%/brushes/coarse_bulk_1.myb
+%%DATADIR%%/brushes/coarse_bulk_1_prev.png
+%%DATADIR%%/brushes/coarse_bulk_2.myb
+%%DATADIR%%/brushes/coarse_bulk_2_prev.png
+%%DATADIR%%/brushes/coarse_bulk_3.myb
+%%DATADIR%%/brushes/coarse_bulk_3_prev.png
+%%DATADIR%%/brushes/coarse_bulk_4.myb
+%%DATADIR%%/brushes/coarse_bulk_4_prev.png
+%%DATADIR%%/brushes/dry_brush.myb
+%%DATADIR%%/brushes/dry_brush_prev.png
+%%DATADIR%%/brushes/glow.myb
+%%DATADIR%%/brushes/glow_prev.png
+%%DATADIR%%/brushes/hair.myb
+%%DATADIR%%/brushes/hair_prev.png
+%%DATADIR%%/brushes/hard_sting.myb
+%%DATADIR%%/brushes/hard_sting_prev.png
+%%DATADIR%%/brushes/hue_fun.myb
+%%DATADIR%%/brushes/hue_fun_prev.png
 %%DATADIR%%/brushes/ink.myb
+%%DATADIR%%/brushes/ink_eraser.myb
+%%DATADIR%%/brushes/ink_eraser_prev.png
 %%DATADIR%%/brushes/ink_prev.png
+%%DATADIR%%/brushes/leaves.myb
+%%DATADIR%%/brushes/leaves_prev.png
+%%DATADIR%%/brushes/long_grass.myb
+%%DATADIR%%/brushes/long_grass_prev.png
 %%DATADIR%%/brushes/loosedots.myb
 %%DATADIR%%/brushes/loosedots_prev.png
-%%DATADIR%%/brushes/o000.myb
-%%DATADIR%%/brushes/o000_prev.png
+%%DATADIR%%/brushes/modelling.myb
+%%DATADIR%%/brushes/modelling_prev.png
 %%DATADIR%%/brushes/o001.myb
 %%DATADIR%%/brushes/o001_prev.png
-%%DATADIR%%/brushes/o006.myb
-%%DATADIR%%/brushes/o006_prev.png
-%%DATADIR%%/brushes/o007.myb
-%%DATADIR%%/brushes/o007_prev.png
 %%DATADIR%%/brushes/o009.myb
 %%DATADIR%%/brushes/o009_prev.png
-%%DATADIR%%/brushes/o011.myb
-%%DATADIR%%/brushes/o011_prev.png
 %%DATADIR%%/brushes/o014.myb
 %%DATADIR%%/brushes/o014_prev.png
 %%DATADIR%%/brushes/o017.myb
 %%DATADIR%%/brushes/o017_prev.png
-%%DATADIR%%/brushes/o020.myb
-%%DATADIR%%/brushes/o020_prev.png
 %%DATADIR%%/brushes/o022.myb
 %%DATADIR%%/brushes/o022_prev.png
 %%DATADIR%%/brushes/o028.myb
 %%DATADIR%%/brushes/o028_prev.png
-%%DATADIR%%/brushes/o031.myb
-%%DATADIR%%/brushes/o031_prev.png
 %%DATADIR%%/brushes/o032.myb
 %%DATADIR%%/brushes/o032_prev.png
-%%DATADIR%%/brushes/o033.myb
-%%DATADIR%%/brushes/o033_prev.png
 %%DATADIR%%/brushes/o300.myb
 %%DATADIR%%/brushes/o300_prev.png
-%%DATADIR%%/brushes/o312.myb
-%%DATADIR%%/brushes/o312_prev.png
+%%DATADIR%%/brushes/o388.myb
+%%DATADIR%%/brushes/o388_prev.png
 %%DATADIR%%/brushes/o397.myb
 %%DATADIR%%/brushes/o397_prev.png
 %%DATADIR%%/brushes/o398.myb
@@ -103,10 +166,8 @@ share/applications/mypaint.desktop
 %%DATADIR%%/brushes/o512_prev.png
 %%DATADIR%%/brushes/o558.myb
 %%DATADIR%%/brushes/o558_prev.png
-%%DATADIR%%/brushes/o665.myb
-%%DATADIR%%/brushes/o665_prev.png
-%%DATADIR%%/brushes/o748.myb
-%%DATADIR%%/brushes/o748_prev.png
+%%DATADIR%%/brushes/o594.myb
+%%DATADIR%%/brushes/o594_prev.png
 %%DATADIR%%/brushes/o826.myb
 %%DATADIR%%/brushes/o826_prev.png
 %%DATADIR%%/brushes/o834.myb
@@ -117,24 +178,40 @@ share/applications/mypaint.desktop
 %%DATADIR%%/brushes/o945_prev.png
 %%DATADIR%%/brushes/old_b008.myb
 %%DATADIR%%/brushes/old_b008_prev.png
-%%DATADIR%%/brushes/old_b024.myb
-%%DATADIR%%/brushes/old_b024_prev.png
 %%DATADIR%%/brushes/order.conf
+%%DATADIR%%/brushes/painting_knife.myb
+%%DATADIR%%/brushes/painting_knife_prev.png
+%%DATADIR%%/brushes/pencil-2b.myb
+%%DATADIR%%/brushes/pencil-2b_prev.png
+%%DATADIR%%/brushes/pencil-6b.myb
+%%DATADIR%%/brushes/pencil-6b_prev.png
+%%DATADIR%%/brushes/pencil-8b.myb
+%%DATADIR%%/brushes/pencil-8b_prev.png
+%%DATADIR%%/brushes/pencil-blur.myb
+%%DATADIR%%/brushes/pencil-blur_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-rubber.myb
+%%DATADIR%%/brushes/pencil-rubber_prev.png
 %%DATADIR%%/brushes/pencil.myb
 %%DATADIR%%/brushes/pencil_prev.png
+%%DATADIR%%/brushes/pick_and_drag.myb
+%%DATADIR%%/brushes/pick_and_drag_prev.png
+%%DATADIR%%/brushes/pointy_ink.myb
+%%DATADIR%%/brushes/pointy_ink_prev.png
 %%DATADIR%%/brushes/prev-template.xcf.gz
+%%DATADIR%%/brushes/redbrush.myb
+%%DATADIR%%/brushes/redbrush_prev.png
 %%DATADIR%%/brushes/s000.myb
 %%DATADIR%%/brushes/s000_prev.png
-%%DATADIR%%/brushes/s001.myb
-%%DATADIR%%/brushes/s001_prev.png
 %%DATADIR%%/brushes/s002.myb
 %%DATADIR%%/brushes/s002_prev.png
 %%DATADIR%%/brushes/s003.myb
 %%DATADIR%%/brushes/s003_prev.png
 %%DATADIR%%/brushes/s004.myb
 %%DATADIR%%/brushes/s004_prev.png
-%%DATADIR%%/brushes/s005.myb
-%%DATADIR%%/brushes/s005_prev.png
 %%DATADIR%%/brushes/s006.myb
 %%DATADIR%%/brushes/s006_prev.png
 %%DATADIR%%/brushes/s007.myb
@@ -143,74 +220,93 @@ share/applications/mypaint.desktop
 %%DATADIR%%/brushes/s008_prev.png
 %%DATADIR%%/brushes/s009.myb
 %%DATADIR%%/brushes/s009_prev.png
-%%DATADIR%%/brushes/s010.myb
-%%DATADIR%%/brushes/s010_prev.png
 %%DATADIR%%/brushes/s011.myb
 %%DATADIR%%/brushes/s011_prev.png
-%%DATADIR%%/brushes/s012.myb
-%%DATADIR%%/brushes/s012_prev.png
-%%DATADIR%%/brushes/s013.myb
-%%DATADIR%%/brushes/s013_prev.png
 %%DATADIR%%/brushes/s014.myb
 %%DATADIR%%/brushes/s014_prev.png
 %%DATADIR%%/brushes/s015.myb
 %%DATADIR%%/brushes/s015_prev.png
-%%DATADIR%%/brushes/s016.myb
-%%DATADIR%%/brushes/s016_prev.png
 %%DATADIR%%/brushes/s018.myb
 %%DATADIR%%/brushes/s018_prev.png
-%%DATADIR%%/brushes/s019.myb
-%%DATADIR%%/brushes/s019_prev.png
 %%DATADIR%%/brushes/s020.myb
 %%DATADIR%%/brushes/s020_prev.png
 %%DATADIR%%/brushes/s021.myb
 %%DATADIR%%/brushes/s021_prev.png
 %%DATADIR%%/brushes/s023.myb
 %%DATADIR%%/brushes/s023_prev.png
+%%DATADIR%%/brushes/s109.myb
+%%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.myb
 %%DATADIR%%/brushes/smudge_prev.png
-%%DATADIR%%/python/application.py
-%%DATADIR%%/python/application.pyc
-%%DATADIR%%/python/application.pyo
-%%DATADIR%%/python/brush.py
-%%DATADIR%%/python/brush.pyc
-%%DATADIR%%/python/brush.pyo
-%%DATADIR%%/python/brushselectionwindow.py
-%%DATADIR%%/python/brushselectionwindow.pyc
-%%DATADIR%%/python/brushselectionwindow.pyo
-%%DATADIR%%/python/brushsettings.py
-%%DATADIR%%/python/brushsettings.pyc
-%%DATADIR%%/python/brushsettings.pyo
-%%DATADIR%%/python/brushsettingswindow.py
-%%DATADIR%%/python/brushsettingswindow.pyc
-%%DATADIR%%/python/brushsettingswindow.pyo
-%%DATADIR%%/python/colorselectionwindow.py
-%%DATADIR%%/python/colorselectionwindow.pyc
-%%DATADIR%%/python/colorselectionwindow.pyo
-%%DATADIR%%/python/command.py
-%%DATADIR%%/python/command.pyc
-%%DATADIR%%/python/command.pyo
-%%DATADIR%%/python/document.py
-%%DATADIR%%/python/document.pyc
-%%DATADIR%%/python/document.pyo
-%%DATADIR%%/python/drawwindow.py
-%%DATADIR%%/python/drawwindow.pyc
-%%DATADIR%%/python/drawwindow.pyo
-%%DATADIR%%/python/functionwindow.py
-%%DATADIR%%/python/functionwindow.pyc
-%%DATADIR%%/python/functionwindow.pyo
-%%DATADIR%%/python/helpers.py
-%%DATADIR%%/python/helpers.pyc
-%%DATADIR%%/python/helpers.pyo
-%%DATADIR%%/python/infinitemydrawwidget.py
-%%DATADIR%%/python/infinitemydrawwidget.pyc
-%%DATADIR%%/python/infinitemydrawwidget.pyo
-%%DATADIR%%/python/settingswindow.py
-%%DATADIR%%/python/settingswindow.pyc
-%%DATADIR%%/python/settingswindow.pyo
-share/pixmaps/mypaint_48.png
-@dirrm %%PYTHON_SITELIBDIR%%/mypaint
+%%DATADIR%%/brushes/soft_sting.myb
+%%DATADIR%%/brushes/soft_sting_prev.png
+%%DATADIR%%/brushes/soft_water.myb
+%%DATADIR%%/brushes/soft_water_prev.png
+%%DATADIR%%/brushes/solid_water.myb
+%%DATADIR%%/brushes/solid_water_prev.png
+%%DATADIR%%/brushes/subtle_pencil.myb
+%%DATADIR%%/brushes/subtle_pencil_prev.png
+%%DATADIR%%/brushes/textured_ink.myb
+%%DATADIR%%/brushes/textured_ink_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/brushselectionwindow.py
+%%DATADIR%%/gui/brushsettingswindow.py
+%%DATADIR%%/gui/colorselectionwindow.py
+%%DATADIR%%/gui/drawwindow.py
+%%DATADIR%%/gui/functionwindow.py
+%%DATADIR%%/gui/gtkexcepthook.py
+%%DATADIR%%/gui/historypopup.py
+%%DATADIR%%/gui/keyboard.py
+%%DATADIR%%/gui/main.py
+%%DATADIR%%/gui/pixbuflist.py
+%%DATADIR%%/gui/settingswindow.py
+%%DATADIR%%/gui/stategroup.py
+%%DATADIR%%/gui/tileddrawwidget.py
+%%DATADIR%%/lib/__init__.py
+%%DATADIR%%/lib/brush.py
+%%DATADIR%%/lib/command.py
+%%DATADIR%%/lib/document.py
+%%DATADIR%%/lib/helpers.py
+%%DATADIR%%/lib/layer.py
+%%DATADIR%%/lib/mypaintlib.py
+%%DATADIR%%/lib/pixbufsurface.py
+%%DATADIR%%/lib/serialize.py
+%%DATADIR%%/lib/stroke.py
+%%DATADIR%%/lib/tiledsurface.py
+@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%%/python
+@dirrm %%DATADIR%%/backgrounds
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
+@dirrm lib/mypaint