6 files changed, 387 insertions, 254 deletions

diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index fb73d32d8ac1..b86c88edeacf 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	2.0.6
-PORTREVISION=	1
+PORTVERSION=	2.2.0
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -30,7 +29,7 @@ LIB_DEPENDS=	aa.1:${PORTSDIR}/graphics/aalib \
 
 CONFLICTS=	gimp-1.*
 
-SHLIBVER?=	0
+SHLIBVER?=	200
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -51,8 +50,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 
 GIMP_DISTFILE=	${DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
-MAN1=		gimp.1 gimp-2.0.1 gimptool-2.0.1 gimp-remote.1 gimp-remote-2.0.1
-MAN5=		gimprc.5 gimprc-2.0.5
+MAN1=	gimp.1 gimp-2.2.1 gimp-remote.1 gimp-remote-2.2.1 gimptool-2.0.1
+MAN5=	gimprc.5 gimprc-2.2.5
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
@@ -76,13 +75,18 @@ LIB_DEPENDS+=		gimpprint.2:${PORTSDIR}/print/gimp-print
 PLIST_SUB+=		PRINT=""
 .endif
 
+.if defined(WITH_MP)
+CONFIGURE_ARGS+=	--enable-mp
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mgnomepanel}!=""
-USE_GNOME+=		gnomepanel
+USE_GNOME+=		gnomepanel desktopfileutils
 CONFIGURE_ARGS+=	--with-desktop-dir=${X11BASE}/share/gnome
 PKGNAMESUFFIX=		-gnome
 PLIST_SUB+=		GNOMEPANEL:=""
+GNOME_ENABLED=		yes
 .else
 PLIST_SUB+=		GNOMEPANEL:="@comment "
 .endif
@@ -102,6 +106,12 @@ pre-everything::
 	@${ECHO_MSG} "	WITH_PYTHON=yes		Turns on Python-Fu support"
 	@${ECHO_MSG} "	WITHOUT_PRINT=yes	Turns off GIMP printing"
 	@${ECHO_MSG} "	WITH_HTML_HELP_BROWSER=yes	Turns on the GIMP help browser"
+	@${ECHO_MSG} "	WITH_MP=yes 		Turns on multiple-processor support"
 	@${ECHO_MSG} ""
 
+.if defined(GNOME_ENABLED)
+post-install:
+	@${X11BASE}/bin/update-desktop-database
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index 5ec5cda7d15f..649f4bb700b1 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1,2 +1,2 @@
-MD5 (gimp-2.0.6.tar.bz2) = 632b9ec629ba7c48d292069c37a1a6c1
-SIZE (gimp-2.0.6.tar.bz2) = 14097124
+MD5 (gimp-2.2.0.tar.bz2) = 7fa66cfd3a2a67f95c3c80307e46e4dd
+SIZE (gimp-2.2.0.tar.bz2) = 13806207
diff --git a/graphics/gimp-app/files/patch-ae b/graphics/gimp-app/files/patch-ae
deleted file mode 100644
index 52f6bc219576..000000000000
--- a/graphics/gimp-app/files/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- plug-ins/common/plugindetails.c.orig	Wed Jan 30 17:25:54 2002
-+++ plug-ins/common/plugindetails.c	Fri May 17 20:45:33 2002
-@@ -27,6 +27,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <time.h>
-+#include <sys/types.h>
- 
- #ifdef __GNUC__
- #warning GTK_DISABLE_DEPRECATED
diff --git a/graphics/gimp-app/files/patch-configure b/graphics/gimp-app/files/patch-configure
index 3fd4a72a783d..6dab9ee3a629 100644
--- a/graphics/gimp-app/files/patch-configure
+++ b/graphics/gimp-app/files/patch-configure
@@ -1,13 +1,15 @@
---- configure.orig	Sun Mar  7 02:08:10 2004
-+++ configure	Sun Mar  7 02:48:14 2004
-@@ -32869,8 +32870,8 @@
+--- configure.orig	Sun Nov 21 08:44:04 2004
++++ configure	Sun Nov 21 08:46:24 2004
+@@ -33676,9 +33676,9 @@
  fi
  fi;
  
 -gimpdatadir="$datadir/$PACKAGE/2.0"
 -gimpplugindir="$libdir/$PACKAGE/2.0"
+-gimpsysconfdir="$sysconfdir/$PACKAGE/2.0"
 +gimpdatadir="$datadir/$PACKAGE"
-+gimpplugindir="$libexecdir/$PACKAGE/2.0"
- gimpsysconfdir="$sysconfdir/$PACKAGE/2.0"
++gimpplugindir="$libexecdir/$PACKAGE/2.2"
++gimpsysconfdir="$sysconfdir/$PACKAGE/2.2"
  
  localedir='${prefix}/${DATADIRNAME}/locale'
+ 
diff --git a/graphics/gimp-app/files/patch-gimptool-2.0.in b/graphics/gimp-app/files/patch-gimptool-2.0.in
index 776632d73c8b..e4ed3c228dda 100644
--- a/graphics/gimp-app/files/patch-gimptool-2.0.in
+++ b/graphics/gimp-app/files/patch-gimptool-2.0.in
@@ -1,5 +1,5 @@
 
-$FreeBSD: /tmp/pcvs/ports/graphics/gimp-app/files/Attic/patch-gimptool-2.0.in,v 1.1 2004-01-20 08:26:58 bland Exp $
+$FreeBSD: /tmp/pcvs/ports/graphics/gimp-app/files/Attic/patch-gimptool-2.0.in,v 1.2 2004-12-24 18:39:50 pav Exp $
 
 --- gimptool-2.0.in.orig	Tue Jan 15 12:21:05 2002
 +++ gimptool-2.0.in	Fri May 17 20:46:18 2002
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 6c50792404c4..f0a7fbceb8f5 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -1,16 +1,20 @@
 bin/gimp
-bin/gimp-2.0
+bin/gimp-2.2
 bin/gimp-remote
-bin/gimp-remote-2.0
+bin/gimp-remote-2.2
 bin/gimptool-2.0
-etc/gimp/2.0/gimprc
-etc/gimp/2.0/gtkrc
-etc/gimp/2.0/ps-menurc
-etc/gimp/2.0/sessionrc
-etc/gimp/2.0/templaterc
-etc/gimp/2.0/unitrc
+etc/gimp/2.2/controllerrc
+etc/gimp/2.2/gimprc
+etc/gimp/2.2/gtkrc
+etc/gimp/2.2/ps-menurc
+etc/gimp/2.2/sessionrc
+etc/gimp/2.2/templaterc
+etc/gimp/2.2/unitrc
 include/gimp-2.0/libgimp/gimp.h
 include/gimp-2.0/libgimp/gimp_pdb.h
+include/gimp-2.0/libgimp/gimpaspectpreview.h
+include/gimp-2.0/libgimp/gimpbrush_pdb.h
+include/gimp-2.0/libgimp/gimpbrushes.h
 include/gimp-2.0/libgimp/gimpbrushes_pdb.h
 include/gimp-2.0/libgimp/gimpbrushmenu.h
 include/gimp-2.0/libgimp/gimpbrushselect.h
@@ -19,10 +23,14 @@ include/gimp-2.0/libgimp/gimpchannel.h
 include/gimp-2.0/libgimp/gimpchannel_pdb.h
 include/gimp-2.0/libgimp/gimpcolor_pdb.h
 include/gimp-2.0/libgimp/gimpcompat.h
+include/gimp-2.0/libgimp/gimpcontext_pdb.h
 include/gimp-2.0/libgimp/gimpconvert_pdb.h
 include/gimp-2.0/libgimp/gimpdisplay_pdb.h
 include/gimp-2.0/libgimp/gimpdrawable.h
 include/gimp-2.0/libgimp/gimpdrawable_pdb.h
+include/gimp-2.0/libgimp/gimpdrawablecombobox.h
+include/gimp-2.0/libgimp/gimpdrawablepreview.h
+include/gimp-2.0/libgimp/gimpdrawabletransform_pdb.h
 include/gimp-2.0/libgimp/gimpedit_pdb.h
 include/gimp-2.0/libgimp/gimpenums.h
 include/gimp-2.0/libgimp/gimpexport.h
@@ -33,7 +41,9 @@ include/gimp-2.0/libgimp/gimpfonts_pdb.h
 include/gimp-2.0/libgimp/gimpfontselect.h
 include/gimp-2.0/libgimp/gimpfontselect_pdb.h
 include/gimp-2.0/libgimp/gimpgimprc_pdb.h
+include/gimp-2.0/libgimp/gimpgradient_pdb.h
 include/gimp-2.0/libgimp/gimpgradientmenu.h
+include/gimp-2.0/libgimp/gimpgradients.h
 include/gimp-2.0/libgimp/gimpgradients_pdb.h
 include/gimp-2.0/libgimp/gimpgradientselect.h
 include/gimp-2.0/libgimp/gimpgradientselect_pdb.h
@@ -41,26 +51,38 @@ include/gimp-2.0/libgimp/gimpguides_pdb.h
 include/gimp-2.0/libgimp/gimphelp_pdb.h
 include/gimp-2.0/libgimp/gimpimage.h
 include/gimp-2.0/libgimp/gimpimage_pdb.h
+include/gimp-2.0/libgimp/gimpimagecombobox.h
 include/gimp-2.0/libgimp/gimplayer.h
 include/gimp-2.0/libgimp/gimplayer_pdb.h
 include/gimp-2.0/libgimp/gimpmenu.h
 include/gimp-2.0/libgimp/gimpmessage_pdb.h
 include/gimp-2.0/libgimp/gimpmisc_pdb.h
 include/gimp-2.0/libgimp/gimppainttools_pdb.h
+include/gimp-2.0/libgimp/gimppalette.h
 include/gimp-2.0/libgimp/gimppalette_pdb.h
+include/gimp-2.0/libgimp/gimppalettemenu.h
+include/gimp-2.0/libgimp/gimppalettes.h
 include/gimp-2.0/libgimp/gimppalettes_pdb.h
+include/gimp-2.0/libgimp/gimppaletteselect.h
 include/gimp-2.0/libgimp/gimppaletteselect_pdb.h
 include/gimp-2.0/libgimp/gimpparasite_pdb.h
 include/gimp-2.0/libgimp/gimppaths_pdb.h
+include/gimp-2.0/libgimp/gimppattern_pdb.h
 include/gimp-2.0/libgimp/gimppatternmenu.h
+include/gimp-2.0/libgimp/gimppatterns.h
 include/gimp-2.0/libgimp/gimppatterns_pdb.h
 include/gimp-2.0/libgimp/gimppatternselect.h
 include/gimp-2.0/libgimp/gimppatternselect_pdb.h
+include/gimp-2.0/libgimp/gimppixbuf.h
 include/gimp-2.0/libgimp/gimppixelfetcher.h
 include/gimp-2.0/libgimp/gimppixelrgn.h
+include/gimp-2.0/libgimp/gimpplugin.h
 include/gimp-2.0/libgimp/gimpplugin_pdb.h
 include/gimp-2.0/libgimp/gimpproceduraldb.h
 include/gimp-2.0/libgimp/gimpproceduraldb_pdb.h
+include/gimp-2.0/libgimp/gimpprogress.h
+include/gimp-2.0/libgimp/gimpprogress_pdb.h
+include/gimp-2.0/libgimp/gimpprogressbar.h
 include/gimp-2.0/libgimp/gimpregioniterator.h
 include/gimp-2.0/libgimp/gimpselection.h
 include/gimp-2.0/libgimp/gimpselection_pdb.h
@@ -74,10 +96,13 @@ include/gimp-2.0/libgimp/gimpuitypes.h
 include/gimp-2.0/libgimp/gimpundo_pdb.h
 include/gimp-2.0/libgimp/gimpunit_pdb.h
 include/gimp-2.0/libgimpbase/gimpbase.h
+include/gimp-2.0/libgimpbase/gimpbaseenums.h
 include/gimp-2.0/libgimpbase/gimpbasetypes.h
+include/gimp-2.0/libgimpbase/gimpchecks.h
 include/gimp-2.0/libgimpbase/gimpdatafiles.h
 include/gimp-2.0/libgimpbase/gimpenv.h
 include/gimp-2.0/libgimpbase/gimplimits.h
+include/gimp-2.0/libgimpbase/gimpmemsize.h
 include/gimp-2.0/libgimpbase/gimpparasite.h
 include/gimp-2.0/libgimpbase/gimpparasiteio.h
 include/gimp-2.0/libgimpbase/gimpsignal.h
@@ -107,31 +132,244 @@ include/gimp-2.0/libgimpthumb/gimpthumb-utils.h
 include/gimp-2.0/libgimpthumb/gimpthumb.h
 include/gimp-2.0/libgimpthumb/gimpthumbnail.h
 include/gimp-2.0/libgimpwidgets/gimpbutton.h
+include/gimp-2.0/libgimpwidgets/gimpcellrenderercolor.h
+include/gimp-2.0/libgimpwidgets/gimpcellrenderertoggle.h
 include/gimp-2.0/libgimpwidgets/gimpchainbutton.h
 include/gimp-2.0/libgimpwidgets/gimpcolorarea.h
 include/gimp-2.0/libgimpwidgets/gimpcolorbutton.h
 include/gimp-2.0/libgimpwidgets/gimpcolordisplay.h
 include/gimp-2.0/libgimpwidgets/gimpcolordisplaystack.h
+include/gimp-2.0/libgimpwidgets/gimpcolorhexentry.h
 include/gimp-2.0/libgimpwidgets/gimpcolornotebook.h
 include/gimp-2.0/libgimpwidgets/gimpcolorscale.h
 include/gimp-2.0/libgimpwidgets/gimpcolorscales.h
 include/gimp-2.0/libgimpwidgets/gimpcolorselect.h
 include/gimp-2.0/libgimpwidgets/gimpcolorselection.h
 include/gimp-2.0/libgimpwidgets/gimpcolorselector.h
+include/gimp-2.0/libgimpwidgets/gimpcontroller.h
 include/gimp-2.0/libgimpwidgets/gimpdialog.h
 include/gimp-2.0/libgimpwidgets/gimpfileentry.h
+include/gimp-2.0/libgimpwidgets/gimpframe.h
 include/gimp-2.0/libgimpwidgets/gimphelpui.h
+include/gimp-2.0/libgimpwidgets/gimpintcombobox.h
+include/gimp-2.0/libgimpwidgets/gimpintstore.h
 include/gimp-2.0/libgimpwidgets/gimpmemsizeentry.h
 include/gimp-2.0/libgimpwidgets/gimpoffsetarea.h
+include/gimp-2.0/libgimpwidgets/gimpoldwidgets.h
 include/gimp-2.0/libgimpwidgets/gimppatheditor.h
 include/gimp-2.0/libgimpwidgets/gimppickbutton.h
 include/gimp-2.0/libgimpwidgets/gimppixmap.h
+include/gimp-2.0/libgimpwidgets/gimppreview.h
+include/gimp-2.0/libgimpwidgets/gimppreviewarea.h
 include/gimp-2.0/libgimpwidgets/gimpquerybox.h
+include/gimp-2.0/libgimpwidgets/gimpscrolledpreview.h
 include/gimp-2.0/libgimpwidgets/gimpsizeentry.h
 include/gimp-2.0/libgimpwidgets/gimpstock.h
 include/gimp-2.0/libgimpwidgets/gimpunitmenu.h
 include/gimp-2.0/libgimpwidgets/gimpwidgets.h
 include/gimp-2.0/libgimpwidgets/gimpwidgetstypes.h
+libexec/gimp/2.2/environ/default.env
+%%PYTHON:%%libexec/gimp/2.2/environ/pygimp.env
+libexec/gimp/2.2/modules/libcdisplay_colorblind.so
+libexec/gimp/2.2/modules/libcdisplay_gamma.so
+libexec/gimp/2.2/modules/libcdisplay_highcontrast.so
+libexec/gimp/2.2/modules/libcdisplay_proof.so
+libexec/gimp/2.2/modules/libcolorsel_cmyk.so
+libexec/gimp/2.2/modules/libcolorsel_triangle.so
+libexec/gimp/2.2/modules/libcolorsel_water.so
+libexec/gimp/2.2/modules/libcontroller_midi.so
+libexec/gimp/2.2/plug-ins/AlienMap2
+libexec/gimp/2.2/plug-ins/CEL
+libexec/gimp/2.2/plug-ins/CML_explorer
+libexec/gimp/2.2/plug-ins/FractalExplorer
+libexec/gimp/2.2/plug-ins/Lighting
+libexec/gimp/2.2/plug-ins/MapObject
+libexec/gimp/2.2/plug-ins/aa
+libexec/gimp/2.2/plug-ins/align_layers
+libexec/gimp/2.2/plug-ins/animationplay
+libexec/gimp/2.2/plug-ins/animoptimize
+libexec/gimp/2.2/plug-ins/apply_lens
+libexec/gimp/2.2/plug-ins/autocrop
+libexec/gimp/2.2/plug-ins/autostretch_hsv
+libexec/gimp/2.2/plug-ins/blinds
+libexec/gimp/2.2/plug-ins/blur
+libexec/gimp/2.2/plug-ins/bmp
+libexec/gimp/2.2/plug-ins/borderaverage
+libexec/gimp/2.2/plug-ins/bumpmap
+libexec/gimp/2.2/plug-ins/c_astretch
+libexec/gimp/2.2/plug-ins/cartoon
+libexec/gimp/2.2/plug-ins/ccanalyze
+libexec/gimp/2.2/plug-ins/channel_mixer
+libexec/gimp/2.2/plug-ins/checkerboard
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/clothify.py
+libexec/gimp/2.2/plug-ins/color_enhance
+libexec/gimp/2.2/plug-ins/colorify
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/colorhtml.py
+libexec/gimp/2.2/plug-ins/colortoalpha
+libexec/gimp/2.2/plug-ins/compose
+libexec/gimp/2.2/plug-ins/compressor
+libexec/gimp/2.2/plug-ins/convmatrix
+libexec/gimp/2.2/plug-ins/csource
+libexec/gimp/2.2/plug-ins/cubism
+libexec/gimp/2.2/plug-ins/curve_bend
+libexec/gimp/2.2/plug-ins/decompose
+libexec/gimp/2.2/plug-ins/deinterlace
+libexec/gimp/2.2/plug-ins/depthmerge
+libexec/gimp/2.2/plug-ins/despeckle
+libexec/gimp/2.2/plug-ins/destripe
+libexec/gimp/2.2/plug-ins/dicom
+libexec/gimp/2.2/plug-ins/diffraction
+libexec/gimp/2.2/plug-ins/displace
+libexec/gimp/2.2/plug-ins/dog
+libexec/gimp/2.2/plug-ins/edge
+libexec/gimp/2.2/plug-ins/emboss
+libexec/gimp/2.2/plug-ins/engrave
+libexec/gimp/2.2/plug-ins/exchange
+libexec/gimp/2.2/plug-ins/faxg3
+libexec/gimp/2.2/plug-ins/film
+libexec/gimp/2.2/plug-ins/fits
+libexec/gimp/2.2/plug-ins/flame
+libexec/gimp/2.2/plug-ins/flarefx
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/foggify.py
+libexec/gimp/2.2/plug-ins/fp
+libexec/gimp/2.2/plug-ins/fractaltrace
+libexec/gimp/2.2/plug-ins/gauss
+libexec/gimp/2.2/plug-ins/gbr
+libexec/gimp/2.2/plug-ins/gee
+libexec/gimp/2.2/plug-ins/gee_zoom
+libexec/gimp/2.2/plug-ins/gfig
+libexec/gimp/2.2/plug-ins/gflare
+libexec/gimp/2.2/plug-ins/gfli
+libexec/gimp/2.2/plug-ins/gif
+libexec/gimp/2.2/plug-ins/gifload
+libexec/gimp/2.2/plug-ins/gih
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/gimpcons.py
+libexec/gimp/2.2/plug-ins/gimpressionist
+libexec/gimp/2.2/plug-ins/glasstile
+libexec/gimp/2.2/plug-ins/glob
+libexec/gimp/2.2/plug-ins/gqbist
+libexec/gimp/2.2/plug-ins/gradmap
+libexec/gimp/2.2/plug-ins/grid
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/gtkcons.py
+libexec/gimp/2.2/plug-ins/gtm
+libexec/gimp/2.2/plug-ins/guillotine
+libexec/gimp/2.2/plug-ins/header
+libexec/gimp/2.2/plug-ins/help
+%%HELPBROWSER:%%libexec/gimp/2.2/plug-ins/helpbrowser
+libexec/gimp/2.2/plug-ins/hot
+libexec/gimp/2.2/plug-ins/ifscompose
+libexec/gimp/2.2/plug-ins/illusion
+libexec/gimp/2.2/plug-ins/imagemap
+libexec/gimp/2.2/plug-ins/iwarp
+libexec/gimp/2.2/plug-ins/jigsaw
+libexec/gimp/2.2/plug-ins/jpeg
+libexec/gimp/2.2/plug-ins/laplace
+libexec/gimp/2.2/plug-ins/lic
+libexec/gimp/2.2/plug-ins/mail
+libexec/gimp/2.2/plug-ins/mapcolor
+libexec/gimp/2.2/plug-ins/max_rgb
+libexec/gimp/2.2/plug-ins/maze
+libexec/gimp/2.2/plug-ins/mblur
+libexec/gimp/2.2/plug-ins/mng
+libexec/gimp/2.2/plug-ins/mosaic
+libexec/gimp/2.2/plug-ins/neon
+libexec/gimp/2.2/plug-ins/newsprint
+libexec/gimp/2.2/plug-ins/nlfilt
+libexec/gimp/2.2/plug-ins/noisify
+libexec/gimp/2.2/plug-ins/normalize
+libexec/gimp/2.2/plug-ins/nova
+libexec/gimp/2.2/plug-ins/oilify
+libexec/gimp/2.2/plug-ins/pagecurl
+libexec/gimp/2.2/plug-ins/papertile
+libexec/gimp/2.2/plug-ins/pat
+libexec/gimp/2.2/plug-ins/pcx
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/pdbbrowse.py
+libexec/gimp/2.2/plug-ins/photocopy
+libexec/gimp/2.2/plug-ins/pix
+libexec/gimp/2.2/plug-ins/pixelize
+libexec/gimp/2.2/plug-ins/plasma
+libexec/gimp/2.2/plug-ins/plugin-browser
+libexec/gimp/2.2/plug-ins/png
+libexec/gimp/2.2/plug-ins/pnm
+libexec/gimp/2.2/plug-ins/polar
+libexec/gimp/2.2/plug-ins/postscript
+%%PRINT%%libexec/gimp/2.2/plug-ins/print
+libexec/gimp/2.2/plug-ins/procedure-browser
+libexec/gimp/2.2/plug-ins/psd
+libexec/gimp/2.2/plug-ins/psd_save
+libexec/gimp/2.2/plug-ins/psp
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/py-slice.py
+libexec/gimp/2.2/plug-ins/randomize
+libexec/gimp/2.2/plug-ins/raw
+libexec/gimp/2.2/plug-ins/rcm
+libexec/gimp/2.2/plug-ins/retinex
+libexec/gimp/2.2/plug-ins/ripple
+libexec/gimp/2.2/plug-ins/rotate
+libexec/gimp/2.2/plug-ins/sample_colorize
+libexec/gimp/2.2/plug-ins/scatter_hsv
+libexec/gimp/2.2/plug-ins/screenshot
+libexec/gimp/2.2/plug-ins/script-fu
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/shadow_bevel.py
+libexec/gimp/2.2/plug-ins/sel2path
+libexec/gimp/2.2/plug-ins/sel_gauss
+libexec/gimp/2.2/plug-ins/semiflatten
+libexec/gimp/2.2/plug-ins/sgi
+libexec/gimp/2.2/plug-ins/sharpen
+libexec/gimp/2.2/plug-ins/shift
+libexec/gimp/2.2/plug-ins/sinus
+libexec/gimp/2.2/plug-ins/smooth_palette
+libexec/gimp/2.2/plug-ins/snoise
+libexec/gimp/2.2/plug-ins/sobel
+libexec/gimp/2.2/plug-ins/softglow
+libexec/gimp/2.2/plug-ins/sparkle
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/sphere.py
+libexec/gimp/2.2/plug-ins/spheredesigner
+libexec/gimp/2.2/plug-ins/spread
+libexec/gimp/2.2/plug-ins/struc
+libexec/gimp/2.2/plug-ins/sunras
+libexec/gimp/2.2/plug-ins/svg
+libexec/gimp/2.2/plug-ins/tga
+libexec/gimp/2.2/plug-ins/threshold_alpha
+libexec/gimp/2.2/plug-ins/tiff
+libexec/gimp/2.2/plug-ins/tile
+libexec/gimp/2.2/plug-ins/tileit
+libexec/gimp/2.2/plug-ins/tiler
+libexec/gimp/2.2/plug-ins/uniteditor
+libexec/gimp/2.2/plug-ins/unsharp
+libexec/gimp/2.2/plug-ins/url
+libexec/gimp/2.2/plug-ins/video
+libexec/gimp/2.2/plug-ins/vinvert
+libexec/gimp/2.2/plug-ins/vpropagate
+libexec/gimp/2.2/plug-ins/warp
+libexec/gimp/2.2/plug-ins/waves
+libexec/gimp/2.2/plug-ins/webbrowser
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/whirlpinch.py
+libexec/gimp/2.2/plug-ins/whirlpinch
+libexec/gimp/2.2/plug-ins/wind
+libexec/gimp/2.2/plug-ins/winicon
+libexec/gimp/2.2/plug-ins/wmf
+libexec/gimp/2.2/plug-ins/xbm
+libexec/gimp/2.2/plug-ins/xjt
+libexec/gimp/2.2/plug-ins/xpm
+libexec/gimp/2.2/plug-ins/xwd
+libexec/gimp/2.2/plug-ins/zealouscrop
+%%PYTHON:%%libexec/gimp/2.2/python/gimpenums.py
+%%PYTHON:%%libexec/gimp/2.2/python/gimpenums.pyc
+%%PYTHON:%%libexec/gimp/2.2/python/gimpenums.pyo
+%%PYTHON:%%libexec/gimp/2.2/python/gimpfu.py
+%%PYTHON:%%libexec/gimp/2.2/python/gimpfu.pyc
+%%PYTHON:%%libexec/gimp/2.2/python/gimpfu.pyo
+%%PYTHON:%%libexec/gimp/2.2/python/gimpmodule.so
+%%PYTHON:%%libexec/gimp/2.2/python/gimpplugin.py
+%%PYTHON:%%libexec/gimp/2.2/python/gimpplugin.pyc
+%%PYTHON:%%libexec/gimp/2.2/python/gimpplugin.pyo
+%%PYTHON:%%libexec/gimp/2.2/python/gimpprocbrowsermodule.so
+%%PYTHON:%%libexec/gimp/2.2/python/gimpshelf.py
+%%PYTHON:%%libexec/gimp/2.2/python/gimpshelf.pyc
+%%PYTHON:%%libexec/gimp/2.2/python/gimpshelf.pyo
+%%PYTHON:%%libexec/gimp/2.2/python/gimpui.py
+%%PYTHON:%%libexec/gimp/2.2/python/gimpui.pyc
+%%PYTHON:%%libexec/gimp/2.2/python/gimpui.pyo
 lib/libgimp-2.0.a
 lib/libgimp-2.0.so
 lib/libgimp-2.0.so.%%SHLIBVER%%
@@ -159,217 +397,30 @@ lib/libgimpwidgets-2.0.so.%%SHLIBVER%%
 libdata/pkgconfig/gimp-2.0.pc
 libdata/pkgconfig/gimpthumb-2.0.pc
 libdata/pkgconfig/gimpui-2.0.pc
-libexec/gimp/2.0/environ/default.env
-%%PYTHON:%%libexec/gimp/2.0/environ/pygimp.env
-libexec/gimp/2.0/modules/libcdisplay_colorblind.so
-libexec/gimp/2.0/modules/libcdisplay_gamma.so
-libexec/gimp/2.0/modules/libcdisplay_highcontrast.so
-libexec/gimp/2.0/modules/libcdisplay_proof.so
-libexec/gimp/2.0/modules/libcolorsel_cmyk.so
-libexec/gimp/2.0/modules/libcolorsel_triangle.so
-libexec/gimp/2.0/modules/libcolorsel_water.so
-libexec/gimp/2.0/plug-ins/AlienMap
-libexec/gimp/2.0/plug-ins/AlienMap2
-libexec/gimp/2.0/plug-ins/CEL
-libexec/gimp/2.0/plug-ins/CML_explorer
-libexec/gimp/2.0/plug-ins/FractalExplorer
-libexec/gimp/2.0/plug-ins/Lighting
-libexec/gimp/2.0/plug-ins/MapObject
-libexec/gimp/2.0/plug-ins/aa
-libexec/gimp/2.0/plug-ins/align_layers
-libexec/gimp/2.0/plug-ins/animationplay
-libexec/gimp/2.0/plug-ins/animoptimize
-libexec/gimp/2.0/plug-ins/apply_lens
-libexec/gimp/2.0/plug-ins/autocrop
-libexec/gimp/2.0/plug-ins/autostretch_hsv
-libexec/gimp/2.0/plug-ins/blinds
-libexec/gimp/2.0/plug-ins/blur
-libexec/gimp/2.0/plug-ins/bmp
-libexec/gimp/2.0/plug-ins/borderaverage
-libexec/gimp/2.0/plug-ins/bumpmap
-libexec/gimp/2.0/plug-ins/bz2
-libexec/gimp/2.0/plug-ins/c_astretch
-libexec/gimp/2.0/plug-ins/ccanalyze
-libexec/gimp/2.0/plug-ins/channel_mixer
-libexec/gimp/2.0/plug-ins/checkerboard
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/clothify.py
-libexec/gimp/2.0/plug-ins/color_enhance
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/colorhtml.py
-libexec/gimp/2.0/plug-ins/colorify
-libexec/gimp/2.0/plug-ins/colortoalpha
-libexec/gimp/2.0/plug-ins/compose
-libexec/gimp/2.0/plug-ins/convmatrix
-libexec/gimp/2.0/plug-ins/csource
-libexec/gimp/2.0/plug-ins/cubism
-libexec/gimp/2.0/plug-ins/curve_bend
-libexec/gimp/2.0/plug-ins/dbbrowser
-libexec/gimp/2.0/plug-ins/decompose
-libexec/gimp/2.0/plug-ins/deinterlace
-libexec/gimp/2.0/plug-ins/depthmerge
-libexec/gimp/2.0/plug-ins/despeckle
-libexec/gimp/2.0/plug-ins/destripe
-libexec/gimp/2.0/plug-ins/dicom
-libexec/gimp/2.0/plug-ins/diffraction
-libexec/gimp/2.0/plug-ins/displace
-libexec/gimp/2.0/plug-ins/edge
-libexec/gimp/2.0/plug-ins/emboss
-libexec/gimp/2.0/plug-ins/engrave
-libexec/gimp/2.0/plug-ins/exchange
-libexec/gimp/2.0/plug-ins/faxg3
-libexec/gimp/2.0/plug-ins/film
-libexec/gimp/2.0/plug-ins/fits
-libexec/gimp/2.0/plug-ins/flame
-libexec/gimp/2.0/plug-ins/flarefx
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/foggify.py
-libexec/gimp/2.0/plug-ins/fp
-libexec/gimp/2.0/plug-ins/fractaltrace
-libexec/gimp/2.0/plug-ins/gauss_iir
-libexec/gimp/2.0/plug-ins/gauss_rle
-libexec/gimp/2.0/plug-ins/gbr
-libexec/gimp/2.0/plug-ins/gee
-libexec/gimp/2.0/plug-ins/gee_zoom
-libexec/gimp/2.0/plug-ins/gfig
-libexec/gimp/2.0/plug-ins/gflare
-libexec/gimp/2.0/plug-ins/gfli
-libexec/gimp/2.0/plug-ins/gicon
-libexec/gimp/2.0/plug-ins/gif
-libexec/gimp/2.0/plug-ins/gifload
-libexec/gimp/2.0/plug-ins/gih
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/gimpcons.py
-libexec/gimp/2.0/plug-ins/gimpressionist
-libexec/gimp/2.0/plug-ins/glasstile
-libexec/gimp/2.0/plug-ins/gqbist
-libexec/gimp/2.0/plug-ins/gradmap
-libexec/gimp/2.0/plug-ins/grid
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/gtkcons.py
-libexec/gimp/2.0/plug-ins/gtm
-libexec/gimp/2.0/plug-ins/guillotine
-libexec/gimp/2.0/plug-ins/gz
-libexec/gimp/2.0/plug-ins/header
-libexec/gimp/2.0/plug-ins/help
-%%HELPBROWSER:%%libexec/gimp/2.0/plug-ins/helpbrowser
-libexec/gimp/2.0/plug-ins/hot
-libexec/gimp/2.0/plug-ins/hrz
-libexec/gimp/2.0/plug-ins/ifscompose
-libexec/gimp/2.0/plug-ins/illusion
-libexec/gimp/2.0/plug-ins/imagemap
-libexec/gimp/2.0/plug-ins/iwarp
-libexec/gimp/2.0/plug-ins/jigsaw
-libexec/gimp/2.0/plug-ins/jpeg
-libexec/gimp/2.0/plug-ins/laplace
-libexec/gimp/2.0/plug-ins/lic
-libexec/gimp/2.0/plug-ins/mail
-libexec/gimp/2.0/plug-ins/mapcolor
-libexec/gimp/2.0/plug-ins/max_rgb
-libexec/gimp/2.0/plug-ins/maze
-libexec/gimp/2.0/plug-ins/mblur
-libexec/gimp/2.0/plug-ins/mng
-libexec/gimp/2.0/plug-ins/mosaic
-libexec/gimp/2.0/plug-ins/newsprint
-libexec/gimp/2.0/plug-ins/nlfilt
-libexec/gimp/2.0/plug-ins/noisify
-libexec/gimp/2.0/plug-ins/normalize
-libexec/gimp/2.0/plug-ins/nova
-libexec/gimp/2.0/plug-ins/oilify
-libexec/gimp/2.0/plug-ins/pagecurl
-libexec/gimp/2.0/plug-ins/papertile
-libexec/gimp/2.0/plug-ins/pat
-libexec/gimp/2.0/plug-ins/pcx
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/pdbbrowse.py
-libexec/gimp/2.0/plug-ins/pix
-libexec/gimp/2.0/plug-ins/pixelize
-libexec/gimp/2.0/plug-ins/plasma
-libexec/gimp/2.0/plug-ins/plugindetails
-libexec/gimp/2.0/plug-ins/png
-libexec/gimp/2.0/plug-ins/pnm
-libexec/gimp/2.0/plug-ins/polar
-libexec/gimp/2.0/plug-ins/postscript
-%%PRINT%%libexec/gimp/2.0/plug-ins/print
-libexec/gimp/2.0/plug-ins/psd
-libexec/gimp/2.0/plug-ins/psd_save
-libexec/gimp/2.0/plug-ins/psp
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/py-slice.py
-libexec/gimp/2.0/plug-ins/randomize
-libexec/gimp/2.0/plug-ins/rcm
-libexec/gimp/2.0/plug-ins/ripple
-libexec/gimp/2.0/plug-ins/rotate
-libexec/gimp/2.0/plug-ins/sample_colorize
-libexec/gimp/2.0/plug-ins/scatter_hsv
-libexec/gimp/2.0/plug-ins/screenshot
-libexec/gimp/2.0/plug-ins/script-fu
-libexec/gimp/2.0/plug-ins/sel2path
-libexec/gimp/2.0/plug-ins/sel_gauss
-libexec/gimp/2.0/plug-ins/semiflatten
-libexec/gimp/2.0/plug-ins/sgi
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/shadow_bevel.py
-libexec/gimp/2.0/plug-ins/sharpen
-libexec/gimp/2.0/plug-ins/shift
-libexec/gimp/2.0/plug-ins/sinus
-libexec/gimp/2.0/plug-ins/smooth_palette
-libexec/gimp/2.0/plug-ins/snoise
-libexec/gimp/2.0/plug-ins/sobel
-libexec/gimp/2.0/plug-ins/sparkle
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/sphere.py
-libexec/gimp/2.0/plug-ins/spheredesigner
-libexec/gimp/2.0/plug-ins/spread
-libexec/gimp/2.0/plug-ins/struc
-libexec/gimp/2.0/plug-ins/sunras
-libexec/gimp/2.0/plug-ins/svg
-libexec/gimp/2.0/plug-ins/tga
-libexec/gimp/2.0/plug-ins/threshold_alpha
-libexec/gimp/2.0/plug-ins/tiff
-libexec/gimp/2.0/plug-ins/tile
-libexec/gimp/2.0/plug-ins/tileit
-libexec/gimp/2.0/plug-ins/tiler
-libexec/gimp/2.0/plug-ins/uniteditor
-libexec/gimp/2.0/plug-ins/unsharp
-libexec/gimp/2.0/plug-ins/url
-libexec/gimp/2.0/plug-ins/video
-libexec/gimp/2.0/plug-ins/vinvert
-libexec/gimp/2.0/plug-ins/vpropagate
-libexec/gimp/2.0/plug-ins/warp
-libexec/gimp/2.0/plug-ins/waves
-libexec/gimp/2.0/plug-ins/webbrowser
-libexec/gimp/2.0/plug-ins/whirlpinch
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/whirlpinch.py
-libexec/gimp/2.0/plug-ins/wind
-libexec/gimp/2.0/plug-ins/wmf
-libexec/gimp/2.0/plug-ins/xbm
-libexec/gimp/2.0/plug-ins/xjt
-libexec/gimp/2.0/plug-ins/xpm
-libexec/gimp/2.0/plug-ins/xwd
-libexec/gimp/2.0/plug-ins/zealouscrop
-%%PYTHON:%%libexec/gimp/2.0/python/gimpenums.py
-%%PYTHON:%%libexec/gimp/2.0/python/gimpenums.pyc
-%%PYTHON:%%libexec/gimp/2.0/python/gimpenums.pyo
-%%PYTHON:%%libexec/gimp/2.0/python/gimpfu.py
-%%PYTHON:%%libexec/gimp/2.0/python/gimpfu.pyc
-%%PYTHON:%%libexec/gimp/2.0/python/gimpfu.pyo
-%%PYTHON:%%libexec/gimp/2.0/python/gimpmodule.so
-%%PYTHON:%%libexec/gimp/2.0/python/gimpplugin.py
-%%PYTHON:%%libexec/gimp/2.0/python/gimpplugin.pyc
-%%PYTHON:%%libexec/gimp/2.0/python/gimpplugin.pyo
-%%PYTHON:%%libexec/gimp/2.0/python/gimpshelf.py
-%%PYTHON:%%libexec/gimp/2.0/python/gimpshelf.pyc
-%%PYTHON:%%libexec/gimp/2.0/python/gimpshelf.pyo
-%%PYTHON:%%libexec/gimp/2.0/python/gimpui.py
-%%PYTHON:%%libexec/gimp/2.0/python/gimpui.pyc
-%%PYTHON:%%libexec/gimp/2.0/python/gimpui.pyo
 share/aclocal/gimp-2.0.m4
+%%DOCSDIR%%/libgimp/GimpAspectPreview.html
+%%DOCSDIR%%/libgimp/GimpDrawablePreview.html
+%%DOCSDIR%%/libgimp/GimpProgressBar.html
 %%DOCSDIR%%/libgimp/gimpdefinitions.html
 %%DOCSDIR%%/libgimp/home.png
 %%DOCSDIR%%/libgimp/index.html
 %%DOCSDIR%%/libgimp/index.sgml
 %%DOCSDIR%%/libgimp/left.png
+%%DOCSDIR%%/libgimp/libgimp-data.html
+%%DOCSDIR%%/libgimp/libgimp-general.html
 %%DOCSDIR%%/libgimp/libgimp-gimp.html
+%%DOCSDIR%%/libgimp/libgimp-gimpbrush.html
 %%DOCSDIR%%/libgimp/libgimp-gimpbrushes.html
 %%DOCSDIR%%/libgimp/libgimp-gimpbrushmenu.html
 %%DOCSDIR%%/libgimp/libgimp-gimpbrushselect.html
 %%DOCSDIR%%/libgimp/libgimp-gimpchannel.html
 %%DOCSDIR%%/libgimp/libgimp-gimpcolor.html
+%%DOCSDIR%%/libgimp/libgimp-gimpcontext.html
 %%DOCSDIR%%/libgimp/libgimp-gimpconvert.html
 %%DOCSDIR%%/libgimp/libgimp-gimpdisplay.html
 %%DOCSDIR%%/libgimp/libgimp-gimpdrawable.html
+%%DOCSDIR%%/libgimp/libgimp-gimpdrawablecombobox.html
+%%DOCSDIR%%/libgimp/libgimp-gimpdrawabletransform.html
 %%DOCSDIR%%/libgimp/libgimp-gimpedit.html
 %%DOCSDIR%%/libgimp/libgimp-gimpenums.html
 %%DOCSDIR%%/libgimp/libgimp-gimpexport.html
@@ -379,25 +430,32 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimp/libgimp-gimpfonts.html
 %%DOCSDIR%%/libgimp/libgimp-gimpfontselect.html
 %%DOCSDIR%%/libgimp/libgimp-gimpgimprc.html
+%%DOCSDIR%%/libgimp/libgimp-gimpgradient.html
 %%DOCSDIR%%/libgimp/libgimp-gimpgradientmenu.html
 %%DOCSDIR%%/libgimp/libgimp-gimpgradients.html
 %%DOCSDIR%%/libgimp/libgimp-gimpgradientselect.html
 %%DOCSDIR%%/libgimp/libgimp-gimpguides.html
 %%DOCSDIR%%/libgimp/libgimp-gimphelp.html
 %%DOCSDIR%%/libgimp/libgimp-gimpimage.html
+%%DOCSDIR%%/libgimp/libgimp-gimpimagecombobox.html
 %%DOCSDIR%%/libgimp/libgimp-gimplayer.html
 %%DOCSDIR%%/libgimp/libgimp-gimpmenu.html
 %%DOCSDIR%%/libgimp/libgimp-gimpmessage.html
 %%DOCSDIR%%/libgimp/libgimp-gimppalette.html
+%%DOCSDIR%%/libgimp/libgimp-gimppalettemenu.html
 %%DOCSDIR%%/libgimp/libgimp-gimppalettes.html
+%%DOCSDIR%%/libgimp/libgimp-gimppaletteselect.html
 %%DOCSDIR%%/libgimp/libgimp-gimppaths.html
+%%DOCSDIR%%/libgimp/libgimp-gimppattern.html
 %%DOCSDIR%%/libgimp/libgimp-gimppatternmenu.html
 %%DOCSDIR%%/libgimp/libgimp-gimppatterns.html
 %%DOCSDIR%%/libgimp/libgimp-gimppatternselect.html
+%%DOCSDIR%%/libgimp/libgimp-gimppixbuf.html
 %%DOCSDIR%%/libgimp/libgimp-gimppixelfetcher.html
 %%DOCSDIR%%/libgimp/libgimp-gimppixelrgn.html
 %%DOCSDIR%%/libgimp/libgimp-gimpplugin.html
 %%DOCSDIR%%/libgimp/libgimp-gimpproceduraldb.html
+%%DOCSDIR%%/libgimp/libgimp-gimpprogress.html
 %%DOCSDIR%%/libgimp/libgimp-gimpregioniterator.html
 %%DOCSDIR%%/libgimp/libgimp-gimpselection.html
 %%DOCSDIR%%/libgimp/libgimp-gimptexttool.html
@@ -405,8 +463,11 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimp/libgimp-gimptools.html
 %%DOCSDIR%%/libgimp/libgimp-gimpui.html
 %%DOCSDIR%%/libgimp/libgimp-gimpundo.html
+%%DOCSDIR%%/libgimp/libgimp-image.html
+%%DOCSDIR%%/libgimp/libgimp-selectors.html
 %%DOCSDIR%%/libgimp/libgimp.devhelp
 %%DOCSDIR%%/libgimp/libgimp.html
+%%DOCSDIR%%/libgimp/libgimpui-hierarchy.html
 %%DOCSDIR%%/libgimp/libgimpui.html
 %%DOCSDIR%%/libgimp/right.png
 %%DOCSDIR%%/libgimp/up.png
@@ -414,10 +475,13 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpbase/index.html
 %%DOCSDIR%%/libgimpbase/index.sgml
 %%DOCSDIR%%/libgimpbase/left.png
+%%DOCSDIR%%/libgimpbase/libgimpbase-gimpbaseenums.html
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimpbasetypes.html
+%%DOCSDIR%%/libgimpbase/libgimpbase-gimpchecks.html
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimpdatafiles.html
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimpenv.html
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimplimits.html
+%%DOCSDIR%%/libgimpbase/libgimpbase-gimpmemsize.html
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimpparasite.html
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimpparasiteio.html
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimpprotocol.html
@@ -479,24 +543,33 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpthumb/right.png
 %%DOCSDIR%%/libgimpthumb/up.png
 %%DOCSDIR%%/libgimpwidgets/GimpButton.html
+%%DOCSDIR%%/libgimpwidgets/GimpCellRendererColor.html
+%%DOCSDIR%%/libgimpwidgets/GimpCellRendererToggle.html
 %%DOCSDIR%%/libgimpwidgets/GimpChainButton.html
 %%DOCSDIR%%/libgimpwidgets/GimpColorArea.html
 %%DOCSDIR%%/libgimpwidgets/GimpColorButton.html
 %%DOCSDIR%%/libgimpwidgets/GimpColorDisplay.html
 %%DOCSDIR%%/libgimpwidgets/GimpColorDisplayStack.html
+%%DOCSDIR%%/libgimpwidgets/GimpColorHexEntry.html
 %%DOCSDIR%%/libgimpwidgets/GimpColorNotebook.html
 %%DOCSDIR%%/libgimpwidgets/GimpColorScale.html
 %%DOCSDIR%%/libgimpwidgets/GimpColorScales.html
 %%DOCSDIR%%/libgimpwidgets/GimpColorSelect.html
 %%DOCSDIR%%/libgimpwidgets/GimpColorSelection.html
 %%DOCSDIR%%/libgimpwidgets/GimpColorSelector.html
+%%DOCSDIR%%/libgimpwidgets/GimpController.html
 %%DOCSDIR%%/libgimpwidgets/GimpDialog.html
 %%DOCSDIR%%/libgimpwidgets/GimpFileEntry.html
+%%DOCSDIR%%/libgimpwidgets/GimpFrame.html
+%%DOCSDIR%%/libgimpwidgets/GimpIntComboBox.html
+%%DOCSDIR%%/libgimpwidgets/GimpIntStore.html
 %%DOCSDIR%%/libgimpwidgets/GimpMemsizeEntry.html
 %%DOCSDIR%%/libgimpwidgets/GimpOffsetArea.html
 %%DOCSDIR%%/libgimpwidgets/GimpPathEditor.html
 %%DOCSDIR%%/libgimpwidgets/GimpPickButton.html
 %%DOCSDIR%%/libgimpwidgets/GimpPixmap.html
+%%DOCSDIR%%/libgimpwidgets/GimpPreview.html
+%%DOCSDIR%%/libgimpwidgets/GimpPreviewArea.html
 %%DOCSDIR%%/libgimpwidgets/GimpSizeEntry.html
 %%DOCSDIR%%/libgimpwidgets/GimpUnitMenu.html
 %%DOCSDIR%%/libgimpwidgets/home.png
@@ -505,10 +578,15 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/left.png
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpHelpUI.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpQueryBox.html
+%%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpScrolledPreview.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpStock.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpWidgets.html
+%%DOCSDIR%%/libgimpwidgets/libgimpwidgets-cell-renderers.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-colordisplay.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-colorselector.html
+%%DOCSDIR%%/libgimpwidgets/libgimpwidgets-controller.html
+%%DOCSDIR%%/libgimpwidgets/libgimpwidgets-deprecated.html
+%%DOCSDIR%%/libgimpwidgets/libgimpwidgets-gimpoldwidgets.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-hierarchy.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-utils.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-widgets.html
@@ -518,6 +596,8 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/stock-cap-butt-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-cap-round-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-cap-square-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-center-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-center-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-channel-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-channel-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-channel-32.png
@@ -550,6 +630,7 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/stock-channels-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-char-picker-22.png
 %%DOCSDIR%%/libgimpwidgets/stock-close-12.png
+%%DOCSDIR%%/libgimpwidgets/stock-color-pick-from-screen-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-color-picker-black-18.png
 %%DOCSDIR%%/libgimpwidgets/stock-color-picker-gray-18.png
 %%DOCSDIR%%/libgimpwidgets/stock-color-picker-white-18.png
@@ -575,6 +656,7 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/stock-floating-selection-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-floating-selection-32.png
 %%DOCSDIR%%/libgimpwidgets/stock-floating-selection-48.png
+%%DOCSDIR%%/libgimpwidgets/stock-frame-64.png
 %%DOCSDIR%%/libgimpwidgets/stock-gradient-bilinear-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-gradient-conical-asymmetric-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-gradient-conical-symmetric-16.png
@@ -648,6 +730,8 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/stock-paths-22.png
 %%DOCSDIR%%/libgimpwidgets/stock-plugin-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-portrait-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-print-resolution-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-print-resolution-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-qmask-off-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-qmask-on-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-question-64.png
@@ -671,6 +755,9 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/stock-selection-subtract-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-selection-to-channel-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-selection-to-path-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-shape-circle-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-shape-diamond-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-shape-square-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-swap-colors-12.png
 %%DOCSDIR%%/libgimpwidgets/stock-template-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-template-24.png
@@ -779,6 +866,7 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/stock-wilber-48.png
 %%DOCSDIR%%/libgimpwidgets/stock-wilber-64.png
 %%DOCSDIR%%/libgimpwidgets/stock-wilber-eek-64.png
+%%DOCSDIR%%/libgimpwidgets/stock-zoom-follow-window-12.png
 %%DOCSDIR%%/libgimpwidgets/up.png
 share/gimp/brushes/10x10square.gbr
 share/gimp/brushes/10x10squareBlur.gbr
@@ -1050,15 +1138,44 @@ share/gimp/gradients/Wood_1.ggr
 share/gimp/gradients/Wood_2.ggr
 share/gimp/gradients/Yellow_Contrast.ggr
 share/gimp/gradients/Yellow_Orange.ggr
-share/gimp/images/gimp_logo.png
-share/gimp/images/gimp_splash.png
+share/gimp/images/gimp-splash.png
+share/gimp/images/gimp-logo.png
 share/gimp/images/wilber-devel-icon.png
 share/gimp/images/wilber-icon.png
 share/gimp/images/wilber-tips.png
 share/gimp/images/wilber-wizard.png
+share/gimp/menus/brushes-menu.xml
+share/gimp/menus/buffers-menu.xml
+share/gimp/menus/channels-menu.xml
+share/gimp/menus/colormap-editor-menu.xml
+share/gimp/menus/dockable-menu.xml
+share/gimp/menus/documents-menu.xml
+share/gimp/menus/error-console-menu.xml
+share/gimp/menus/fonts-menu.xml
+share/gimp/menus/gradient-editor-menu.xml
+share/gimp/menus/gradients-menu.xml
+share/gimp/menus/image-menu.xml
+share/gimp/menus/images-menu.xml
+share/gimp/menus/layers-menu.xml
+share/gimp/menus/palette-editor-menu.xml
+share/gimp/menus/palettes-menu.xml
+share/gimp/menus/patterns-menu.xml
+share/gimp/menus/qmask-menu.xml
+share/gimp/menus/selection-editor-menu.xml
+share/gimp/menus/templates-menu.xml
+share/gimp/menus/text-editor-toolbar.xml
+share/gimp/menus/tool-options-menu.xml
+share/gimp/menus/toolbox-menu.xml
+share/gimp/menus/tools-menu.xml
+share/gimp/menus/vectors-menu.xml
 share/gimp/misc/gimp.applications
 share/gimp/misc/gimp.desktop
 share/gimp/misc/gimp.keys
+%%GNOMEPANEL:%%share/gnome/application-registry/gimp-2.2.applications
+%%GNOMEPANEL:%%share/gnome/applications/gimp-2.2.desktop
+%%GNOMEPANEL:%%@exec update-desktop-database > /dev/null || /usr/bin/true
+%%GNOMEPANEL:%%share/gnome/mime-info/gimp-2.2.keys
+%%GNOMEPANEL:%%share/gnome/pixmaps/gnome-gimp.png
 share/gimp/palettes/Bears.gpl
 share/gimp/palettes/Bgold.gpl
 share/gimp/palettes/Blues.gpl
@@ -1208,6 +1325,10 @@ share/gimp/scripts/glowing-logo.scm
 share/gimp/scripts/gradient-bevel-logo.scm
 share/gimp/scripts/gradient-example.scm
 share/gimp/scripts/grid-system.scm
+share/gimp/scripts/guides-from-selection.scm
+share/gimp/scripts/guides-new-percent.scm
+share/gimp/scripts/guides-new.scm
+share/gimp/scripts/guides-remove-all.scm
 share/gimp/scripts/hsv-graph.scm
 share/gimp/scripts/i26-gunya2.scm
 share/gimp/scripts/image-structure.scm
@@ -1245,6 +1366,7 @@ share/gimp/scripts/starscape-logo.scm
 share/gimp/scripts/swirltile.scm
 share/gimp/scripts/swirly-pattern.scm
 share/gimp/scripts/t-o-p-logo.scm
+share/gimp/scripts/test-sphere.scm
 share/gimp/scripts/text-circle.scm
 share/gimp/scripts/textured-logo.scm
 share/gimp/scripts/tileblur.scm
@@ -1257,6 +1379,7 @@ share/gimp/scripts/web-browser.scm
 share/gimp/scripts/xach-effect.scm
 share/gimp/themes/Default/gtkrc
 share/gimp/themes/Default/imagerc
+share/gimp/themes/Default/images/preferences/controllers.png
 share/gimp/themes/Default/images/preferences/default-comment.png
 share/gimp/themes/Default/images/preferences/default-grid.png
 share/gimp/themes/Default/images/preferences/display.png
@@ -1281,12 +1404,16 @@ share/gimp/themes/Default/images/preferences/interface.png
 share/gimp/themes/Default/images/preferences/monitor.png
 share/gimp/themes/Default/images/preferences/new-image.png
 share/gimp/themes/Default/images/preferences/session.png
+share/gimp/themes/Default/images/preferences/theme.png
 share/gimp/themes/Default/images/preferences/tool-options.png
+share/gimp/themes/Default/images/preferences/toolbox.png
 share/gimp/themes/Default/images/preferences/window-management.png
 share/gimp/themes/Default/images/stock-anchor-16.png
 share/gimp/themes/Default/images/stock-cap-butt-16.png
 share/gimp/themes/Default/images/stock-cap-round-16.png
 share/gimp/themes/Default/images/stock-cap-square-16.png
+share/gimp/themes/Default/images/stock-center-16.png
+share/gimp/themes/Default/images/stock-center-24.png
 share/gimp/themes/Default/images/stock-channel-16.png
 share/gimp/themes/Default/images/stock-channel-24.png
 share/gimp/themes/Default/images/stock-channel-32.png
@@ -1319,6 +1446,7 @@ share/gimp/themes/Default/images/stock-channels-16.png
 share/gimp/themes/Default/images/stock-channels-24.png
 share/gimp/themes/Default/images/stock-char-picker-22.png
 share/gimp/themes/Default/images/stock-close-12.png
+share/gimp/themes/Default/images/stock-color-pick-from-screen-16.png
 share/gimp/themes/Default/images/stock-color-picker-black-18.png
 share/gimp/themes/Default/images/stock-color-picker-gray-18.png
 share/gimp/themes/Default/images/stock-color-picker-white-18.png
@@ -1344,6 +1472,7 @@ share/gimp/themes/Default/images/stock-floating-selection-16.png
 share/gimp/themes/Default/images/stock-floating-selection-24.png
 share/gimp/themes/Default/images/stock-floating-selection-32.png
 share/gimp/themes/Default/images/stock-floating-selection-48.png
+share/gimp/themes/Default/images/stock-frame-64.png
 share/gimp/themes/Default/images/stock-gradient-bilinear-16.png
 share/gimp/themes/Default/images/stock-gradient-conical-asymmetric-16.png
 share/gimp/themes/Default/images/stock-gradient-conical-symmetric-16.png
@@ -1417,6 +1546,8 @@ share/gimp/themes/Default/images/stock-paths-16.png
 share/gimp/themes/Default/images/stock-paths-22.png
 share/gimp/themes/Default/images/stock-plugin-16.png
 share/gimp/themes/Default/images/stock-portrait-16.png
+share/gimp/themes/Default/images/stock-print-resolution-16.png
+share/gimp/themes/Default/images/stock-print-resolution-24.png
 share/gimp/themes/Default/images/stock-qmask-off-16.png
 share/gimp/themes/Default/images/stock-qmask-on-16.png
 share/gimp/themes/Default/images/stock-question-64.png
@@ -1440,6 +1571,9 @@ share/gimp/themes/Default/images/stock-selection-stroke-16.png
 share/gimp/themes/Default/images/stock-selection-subtract-16.png
 share/gimp/themes/Default/images/stock-selection-to-channel-16.png
 share/gimp/themes/Default/images/stock-selection-to-path-16.png
+share/gimp/themes/Default/images/stock-shape-circle-16.png
+share/gimp/themes/Default/images/stock-shape-diamond-16.png
+share/gimp/themes/Default/images/stock-shape-square-16.png
 share/gimp/themes/Default/images/stock-swap-colors-12.png
 share/gimp/themes/Default/images/stock-template-16.png
 share/gimp/themes/Default/images/stock-template-24.png
@@ -1546,11 +1680,9 @@ share/gimp/themes/Default/images/stock-web-24.png
 share/gimp/themes/Default/images/stock-wilber-16.png
 share/gimp/themes/Default/images/stock-wilber-64.png
 share/gimp/themes/Default/images/stock-wilber-eek-64.png
+share/gimp/themes/Default/images/stock-zoom-follow-window-12.png
 share/gimp/themes/Small/gtkrc
 share/gimp/tips/gimp-tips.xml
-%%GNOMEPANEL:%%share/gnome/application-registry/gimp-2.0.applications
-%%GNOMEPANEL:%%share/gnome/applications/gimp-2.0.desktop
-%%GNOMEPANEL:%%share/gnome/mime-info/gimp-2.0.keys
 share/locale/ca/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/ca/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ca/LC_MESSAGES/gimp20-std-plug-ins.mo
@@ -1651,6 +1783,10 @@ share/locale/no/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/no/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/no/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/no/LC_MESSAGES/gimp20.mo
+share/locale/pa/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/pa/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/pa/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/pa/LC_MESSAGES/gimp20.mo
 share/locale/pl/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/pl/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/pl/LC_MESSAGES/gimp20-std-plug-ins.mo
@@ -1675,10 +1811,6 @@ share/locale/sk/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/sk/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/sk/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/sk/LC_MESSAGES/gimp20.mo
-share/locale/sq/LC_MESSAGES/gimp20-libgimp.mo
-share/locale/sq/LC_MESSAGES/gimp20-script-fu.mo
-share/locale/sq/LC_MESSAGES/gimp20-std-plug-ins.mo
-share/locale/sq/LC_MESSAGES/gimp20.mo
 share/locale/sr/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/sr/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/sr/LC_MESSAGES/gimp20-std-plug-ins.mo
@@ -1715,14 +1847,6 @@ share/locale/zh_TW/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20.mo
-@dirrm %%DOCSDIR%%/libgimpwidgets
-@dirrm %%DOCSDIR%%/libgimpthumb
-@dirrm %%DOCSDIR%%/libgimpmodule
-@dirrm %%DOCSDIR%%/libgimpmath
-@dirrm %%DOCSDIR%%/libgimpcolor
-@dirrm %%DOCSDIR%%/libgimpbase
-@dirrm %%DOCSDIR%%/libgimp
-@dirrm %%DOCSDIR%%
 @dirrm share/gimp/tips
 @dirrm share/gimp/themes/Small
 @dirrm share/gimp/themes/Default/images/preferences
@@ -1734,6 +1858,7 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm share/gimp/patterns
 @dirrm share/gimp/palettes
 @dirrm share/gimp/misc
+@dirrm share/gimp/menus
 @dirrm share/gimp/images
 @dirrm share/gimp/gradients
 @dirrm share/gimp/gimpressionist/Presets
@@ -1746,11 +1871,19 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm share/gimp/fonts
 @dirrm share/gimp/brushes
 @dirrm share/gimp
-%%PYTHON:%%@dirrm libexec/gimp/2.0/python
-@dirrm libexec/gimp/2.0/plug-ins
-@dirrm libexec/gimp/2.0/modules
-@dirrm libexec/gimp/2.0/environ
-@dirrm libexec/gimp/2.0
+@dirrm %%DOCSDIR%%/libgimpwidgets
+@dirrm %%DOCSDIR%%/libgimpthumb
+@dirrm %%DOCSDIR%%/libgimpmodule
+@dirrm %%DOCSDIR%%/libgimpmath
+@dirrm %%DOCSDIR%%/libgimpcolor
+@dirrm %%DOCSDIR%%/libgimpbase
+@dirrm %%DOCSDIR%%/libgimp
+@dirrm %%DOCSDIR%%
+@dirrm libexec/gimp/2.2/plug-ins
+%%PYTHON:%%@dirrm libexec/gimp/2.2/python
+@dirrm libexec/gimp/2.2/modules
+@dirrm libexec/gimp/2.2/environ
+@dirrm libexec/gimp/2.2
 @dirrm libexec/gimp
 @dirrm include/gimp-2.0/libgimpwidgets
 @dirrm include/gimp-2.0/libgimpthumb
@@ -1760,5 +1893,6 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm include/gimp-2.0/libgimpbase
 @dirrm include/gimp-2.0/libgimp
 @dirrm include/gimp-2.0
-@dirrm etc/gimp/2.0
+@dirrm etc/gimp/2.2
 @dirrm etc/gimp
+%%GNOMEPANEL:%%@unexec update-desktop-database > /dev/null || /usr/bin/true