Update to 2.4.0

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9868 df743ca5-7f9a-e211-a948-0013205c9059

10 files changed, 759 insertions, 536 deletions

diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 7776d1703..fdcf36241 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -3,14 +3,14 @@
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/gimp-app/Makefile,v 1.15 2007/09/19 01:55:23 mezz Exp $
+#   $MCom: ports/graphics/gimp-app-devel/Makefile,v 1.18 2007/10/02 12:29:55 ahze Exp $
 #
 
 PORTNAME=	gimp-app
-PORTVERSION=	2.2.17
-PORTREVISION=	2
-PORTEPOCH=	1
-CATEGORIES=	graphics gnome
+DISTVERSION=	2.4.0
+PORTREVISION?=	0
+PORTEPOCH?=	1
+CATEGORIES?=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		http://gimp.mirrors.hoobly.com/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/grafik/gimp/%SUBDIR%/ \
@@ -19,69 +19,70 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		http://www.mirrorservice.org/sites/ftp.gimp.org/pub/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/%SUBDIR%,}
 MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}
-DISTNAME=	gimp-${PORTVERSION}
+DISTNAME=	gimp-${DISTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNU Image Manipulation Program
 
-LIB_DEPENDS=	wmf.2:${PORTSDIR}/graphics/libwmf \
+LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif \
+		wmf.2:${PORTSDIR}/graphics/libwmf \
+		poppler-glib.2:${PORTSDIR}/graphics/poppler-gtk \
 		aa.1:${PORTSDIR}/graphics/aalib \
-		exif.12:${PORTSDIR}/graphics/libexif \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		tiff.4:${PORTSDIR}/graphics/tiff
-
-CONFLICTS=	gimp-1.* gimpshop-[0-9]* gimp-app-devel-[0-9]*
-
-SHLIBVER?=	200
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		lcms.1:${PORTSDIR}/graphics/lcms
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2 desktopfileutils
-WANT_GNOME=	yes
-USE_GETTEXT=	yes
+USE_AUTOTOOLS=	libtool:15
+USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2 ltverhack desktopfileutils
 USE_LDCONFIG=	yes
-PLIST_SUB=	SHLIBVER="${SHLIBVER}"
-CONFIGURE_ARGS=	--disable-perl \
+INSTALLS_ICONS=	yes
+LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
+CONFIGURE_ARGS?=--disable-perl \
 		--with-html-dir=${PREFIX}/share/doc/gimp \
-		--docdir=${PREFIX}/share/doc/gimp \
 		--disable-gtk-doc \
-		--enable-static \
-		--disable-print \
-		--with-desktop-dir=${LOCALBASE}/share
+		--without-print \
+		--disable-python \
+		--with-desktop-dir=${PREFIX}/share \
+		--docdir=${PREFIX}/share/doc/gimp \
+		--enable-default-binary
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-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
-
-OPTIONS=	DEBUG "debugging" off \
-		PYTHON "Python-Fu support" off \
-		RSVG "SVG format support" on \
-		HTML_HELP_BROWSER "GIMP help browser" on \
-		MP "multiple processor support" off
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		GIMP_THREAD_LIBS=${PTHREAD_LIBS}
+
+.if !defined(GIMP_SLAVE)
+OPTIONS?=	DEBUG "debugging" off \
+		DBUS "D-BUS support" on \
+		GNOMEVFS "Use GNOME VFS for the URI plug-in" on \
+		HELPBROWSER "internal help browser" on \
+		MP "multiple processor support" off \
+		RSVG "SVG format support" on
+.endif
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug
-.endif
+.if defined(GIMP_SLAVE)
+PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config
+GIMP_LIBS=	`${PKG_CONFIG} --libs gimp-2.0`
+GIMP_THUMB_LIBS=`${PKG_CONFIG} --libs gimpthumb-2.0`
+GIMP_UI_LIBS=	`${PKG_CONFIG} --libs gimpui-2.0`
+
+LIB_DEPENDS+=	gimp-2.0.0:${PORTSDIR}/graphics/gimp-app-devel
 
-.if defined(WITH_PYTHON)
-USE_PYTHON=		yes
-# we need to manually include this, because USE_PYTHON is defined
-# after including bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.python.mk"
-USE_GNOME+=		pygtk2
-CONFIGURE_ARGS+=	--enable-python
-PLIST_SUB+=		PYTHON:=""
 .else
-CONFIGURE_ARGS+=	--disable-python
-PLIST_SUB+=		PYTHON:="@comment "
-.endif
+
+MAN1+=	gimp-2.4.1 gimp-remote-2.4.1 gimptool-2.0.1
+MAN5+=	gimprc-2.4.5
+MLINKS=	gimp-2.4.1 gimp.1 \
+	gimp-2.4.1 gimp-console-2.4.1 \
+	gimp-console-2.4.1 gimp-console.1 \
+	gimp-remote-2.4.1 gimp-remote.1 \
+	gimprc-2.4.5 gimprc.5
 
 .if defined(WITHOUT_RSVG)
 CONFIGURE_ARGS+=	--without-librsvg
@@ -91,32 +92,62 @@ USE_GNOME+=		librsvg2
 PLIST_SUB+=		SVG=""
 .endif
 
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug
+.endif
+
 .if defined(WITH_MP)
 CONFIGURE_ARGS+=	--enable-mp
+.else
+CONFIGURE_ARGS+=	--disable-mp
 .endif
 
-.if ${HAVE_GNOME:Mgnomepanel}!=""
-USE_GNOME+=		gnomepanel
-CONFIGURE_ENV+=		GIMP_THREAD_LIBS=${PTHREAD_LIBS}
-PLIST_SUB+=		GNOMEPANEL:=""
-GNOME_ENABLED=		yes
+.if ${HAVE_GNOME:Mgnomehier}!="" || defined(WITH_GNOME)
+USE_GNOME+=		desktopfileutils gnomehier
+PLIST_SUB+=		GNOME=""
 .else
-PLIST_SUB+=		GNOMEPANEL:="@comment "
-CONFIGURE_ENV+=		GIMP_THREAD_LIBS=${PTHREAD_LIBS}
+PLIST_SUB+=		GNOME="@comment "
 .endif
 
-.if defined(WITH_HTML_HELP_BROWSER)
+.if defined(WITH_HELPBROWSER)
 USE_GNOME+=		libgtkhtml
-PLIST_SUB+=		HELPBROWSER:=""
+CONFIGURE_ARGS+=	--with-gtkhtml2
+PLIST_SUB+=		HELPBROWSER=""
 .else
-PLIST_SUB+=		HELPBROWSER:="@comment "
-post-patch:
-	@${REINPLACE_CMD} -e 's|\(have_gtkhtml2=\)yes|\1no|' ${WRKSRC}/configure
+CONFIGURE_ARGS+=	--without-gtkhtml2
+PLIST_SUB+=		HELPBROWSER="@comment "
+.endif
+
+.if defined(WITH_DBUS)
+LIB_DEPENDS+=		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+CONFIGURE_ARGS+=	--with-dbus
+.else
+CONFIGURE_ARGS+=	--without-dbus
+.endif
+
+.if defined(WITH_GNOMEVFS) || ${HAVE_GNOME:Mgnomevfs2}!=""
+LIB_DEPENDS+=	gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
+USE_GNOME+=	gnomevfs2
+.endif
+
 .endif
 
-.if defined(GNOME_ENABLED)
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%GIMP_LIBS%%|${GIMP_LIBS}|; \
+		s|%%GIMP_THUMB_LIBS%%|${GIMP_THUMB_LIBS}|; \
+		s|%%GIMP_UI_LIBS%%|${GIMP_UI_LIBS}|' \
+			${WRKSRC}/plug-ins/pygimp/Makefile.in
+	@${REINPLACE_CMD} -e 's|"libpng"|"libpng12"|' \
+		${WRKSRC}/configure
+
 post-install:
-	@-update-desktop-database
+.if !defined(GIMP_SLAVE)
+.if ${HAVE_GNOME:Mgnomehier}!="" || defined(WITH_GNOME)
+	${MKDIR} ${PREFIX}/share/mime-info ${PREFIX}/share/application-registry
+	${INSTALL_DATA} ${WRKSRC}/desktop/gimp.applications ${PREFIX}/share/application-registry
+	${INSTALL_DATA} ${WRKSRC}/desktop/gimp.keys ${PREFIX}/share/mime-info
 .endif
+.endif
+	@-update-desktop-database
 
 .include <bsd.port.post.mk>
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index ae0dda79b..2f4cdf59f 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-2.2.17.tar.bz2) = 4f509ed4a605452d88e04045ff388d58
-SHA256 (gimp-2.2.17.tar.bz2) = 8a4d3b28b3a11ea7564df09c8990d1c90bc3dd713b1dde0737e08603854b01b4
-SIZE (gimp-2.2.17.tar.bz2) = 13102077
+MD5 (gimp-2.4.0.tar.bz2) = 35fecf14cd5237065aef624b93030d5e
+SHA256 (gimp-2.4.0.tar.bz2) = ddeafb632050bba9163416c4a18c4cb8706b922c0fa99a0c216176584826a9dc
+SIZE (gimp-2.4.0.tar.bz2) = 17617876
diff --git a/graphics/gimp-app/files/patch-aa b/graphics/gimp-app/files/patch-aa
deleted file mode 100644
index 411ac92c9..000000000
--- a/graphics/gimp-app/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- app/main.c.orig	Sun Oct  5 09:16:02 2003
-+++ app/main.c	Mon Oct  6 12:14:34 2003
-@@ -23,6 +23,7 @@
- #include <signal.h>
- #include <string.h>
- #include <sys/types.h>
-+#include <floatingpoint.h>
- 
- #ifdef HAVE_SYS_WAIT_H
- #include <sys/wait.h>
-@@ -113,6 +114,9 @@
-   /* Initialize variables */
- 
-   full_prog_name = argv[0];
-+
-+  /* Ignore floating point exceptions */
-+  fpsetmask(0);
- 
-   /* Initialize i18n support */
- 
diff --git a/graphics/gimp-app/files/patch-configure b/graphics/gimp-app/files/patch-configure
index da42f67f8..1a89a1cc2 100644
--- a/graphics/gimp-app/files/patch-configure
+++ b/graphics/gimp-app/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sun Mar  6 15:30:12 2005
-+++ configure	Sun Mar  6 15:33:57 2005
-@@ -25925,6 +25925,7 @@
+--- configure.orig	Thu Nov 23 15:16:53 2006
++++ configure	Sun Dec 31 19:29:32 2006
+@@ -29404,6 +29404,7 @@
      if test "x$enable_gtktest" = "xyes" ; then
        ac_save_CFLAGS="$CFLAGS"
        ac_save_LIBS="$LIBS"
@@ -8,9 +8,9 @@
        CFLAGS="$CFLAGS $GTK_CFLAGS"
        LIBS="$GTK_LIBS $LIBS"
        rm -f conf.gtktest
-@@ -33865,9 +33866,9 @@
+@@ -38514,9 +38515,9 @@
  fi
- fi;
+ 
  
 -gimpdatadir="$datadir/$PACKAGE/2.0"
 -gimpplugindir="$libdir/$PACKAGE/2.0"
@@ -19,5 +19,5 @@
 +gimpplugindir="$libexecdir/$PACKAGE/2.2"
 +gimpsysconfdir="$sysconfdir/$PACKAGE/2.2"
  
- localedir='${prefix}/${DATADIRNAME}/locale'
+ 
  
diff --git a/graphics/gimp-app/files/patch-desktop_Makefile.in b/graphics/gimp-app/files/patch-desktop_Makefile.in
new file mode 100644
index 000000000..62da49282
--- /dev/null
+++ b/graphics/gimp-app/files/patch-desktop_Makefile.in
@@ -0,0 +1,33 @@
+--- desktop/Makefile.in.orig	Mon Jan  1 02:31:10 2007
++++ desktop/Makefile.in	Mon Jan  1 02:33:44 2007
+@@ -65,8 +65,7 @@
+ 	"$(DESTDIR)$(icons16dir)" "$(DESTDIR)$(icons22dir)" \
+ 	"$(DESTDIR)$(icons24dir)" "$(DESTDIR)$(icons32dir)" \
+ 	"$(DESTDIR)$(icons48dir)" "$(DESTDIR)$(icons64dir)" \
+-	"$(DESTDIR)$(iconsscalabledir)" "$(DESTDIR)$(mimeinfodir)" \
+-	"$(DESTDIR)$(registrydir)"
++	"$(DESTDIR)$(iconsscalabledir)"
+ applicationsDATA_INSTALL = $(INSTALL_DATA)
+ icons16DATA_INSTALL = $(INSTALL_DATA)
+ icons22DATA_INSTALL = $(INSTALL_DATA)
+@@ -79,8 +78,7 @@
+ registryDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(applications_DATA) $(icons16_DATA) $(icons22_DATA) \
+ 	$(icons24_DATA) $(icons32_DATA) $(icons48_DATA) \
+-	$(icons64_DATA) $(iconsscalable_DATA) $(mimeinfo_DATA) \
+-	$(registry_DATA)
++	$(icons64_DATA) $(iconsscalable_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ AA = @AA@
+ ACLOCAL = @ACLOCAL@
+@@ -445,10 +443,6 @@
+ desktop_files = $(desktop_in_files:.desktop.in.in=.desktop)
+ @DESKTOP_DATADIR_TRUE@applicationsdir = $(DESKTOP_DATADIR)/applications
+ @DESKTOP_DATADIR_TRUE@applications_DATA = $(desktop_files)
+-@DESKTOP_DATADIR_TRUE@mimeinfodir = $(DESKTOP_DATADIR)/mime-info
+-@DESKTOP_DATADIR_TRUE@mimeinfo_DATA = gimp.keys
+-@DESKTOP_DATADIR_TRUE@registrydir = $(DESKTOP_DATADIR)/application-registry
+-@DESKTOP_DATADIR_TRUE@registry_DATA = gimp.applications
+ @DESKTOP_DATADIR_TRUE@icons16dir = $(DESKTOP_DATADIR)/icons/hicolor/16x16/apps
+ @DESKTOP_DATADIR_TRUE@icons16_DATA = 16x16/gimp.png
+ @DESKTOP_DATADIR_TRUE@icons22dir = $(DESKTOP_DATADIR)/icons/hicolor/22x22/apps
diff --git a/graphics/gimp-app/files/patch-am b/graphics/gimp-app/files/patch-libgimp_gimp.c
index 45c58cbe5..a1bb86bbf 100644
--- a/graphics/gimp-app/files/patch-am
+++ b/graphics/gimp-app/files/patch-libgimp_gimp.c
@@ -1,6 +1,6 @@
---- libgimp/gimp.c.orig	Fri May 12 12:37:27 2000
-+++ libgimp/gimp.c	Thu May 18 16:42:21 2000
-@@ -26,6 +26,7 @@
+--- libgimp/gimp.c.orig	Fri Sep  1 06:14:32 2006
++++ libgimp/gimp.c	Sun Dec 31 15:56:37 2006
+@@ -29,6 +29,7 @@
  #include <stdlib.h>
  #include <string.h>
  #include <sys/types.h>
@@ -8,12 +8,13 @@
  
  #ifdef HAVE_SYS_TIME_H
  #include <sys/time.h>
-@@ -211,6 +212,9 @@
-     }
+@@ -291,6 +292,9 @@
+   gimp_env_init (TRUE);
  
    progname = argv[0];
 +
 +  /* Ignore floating point exceptions */
 +  fpsetmask(0);
  
-   g_set_prgname (g_basename (progname));
+   basename = g_path_get_basename (progname);
+ 
diff --git a/graphics/gimp-app/files/patch-plug-ins_common_url.c b/graphics/gimp-app/files/patch-plug-ins_common_url.c
deleted file mode 100644
index bceff6df1..000000000
--- a/graphics/gimp-app/files/patch-plug-ins_common_url.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- plug-ins/common/url.c.orig	Wed Dec 28 13:56:48 2005
-+++ plug-ins/common/url.c	Wed Dec 28 13:58:33 2005
-@@ -186,10 +186,10 @@
-       putenv ("LANG=C");
- #endif
- 
--      execlp ("wget",
--              "wget", "-v", "-e", "server-response=off", "-T", TIMEOUT,
--              filename, "-O", tmpname, NULL);
--      g_message ("exec() failed: wget: %s", g_strerror (errno));
-+      execlp ("fetch",
-+              "fetch", "-T", TIMEOUT,
-+              filename, "-p", "-o", tmpname, NULL);
-+      g_message ("exec() failed: fetch: %s", g_strerror (errno));
-       g_free (tmpname);
-       _exit (127);
-     }
diff --git a/graphics/gimp-app/files/patch-plug-ins_print_print.c b/graphics/gimp-app/files/patch-plug-ins_print_print.c
deleted file mode 100644
index 36f4bf714..000000000
--- a/graphics/gimp-app/files/patch-plug-ins_print_print.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- plug-ins/print/print.c.orig	Tue Dec 26 07:43:54 2000
-+++ plug-ins/print/print.c	Tue Dec 26 07:44:07 2000
-@@ -1417,7 +1417,7 @@
- 
-     if (i < (sizeof(lpcs) / sizeof(lpcs[0])))
-     {
--      strcat(command, " status < /dev/null");
-+      strcat(command, " status all < /dev/null");
-       type = PRINTERS_LPC;
-     }
-     else
diff --git a/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in b/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in
new file mode 100644
index 000000000..efc3a8b31
--- /dev/null
+++ b/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in
@@ -0,0 +1,97 @@
+--- plug-ins/pygimp/Makefile.in.orig	Sun Dec 31 22:19:08 2006
++++ plug-ins/pygimp/Makefile.in	Sun Dec 31 22:22:17 2006
+@@ -64,10 +64,9 @@
+ 	"$(DESTDIR)$(pygimpdir)"
+ pygimpLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(pygimp_LTLIBRARIES)
+-am__DEPENDENCIES_1 =  \
+-	$(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
+-am__DEPENDENCIES_2 = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
+-am__DEPENDENCIES_3 = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
++am__DEPENDENCIES_1 = 
++am__DEPENDENCIES_2 = 
++am__DEPENDENCIES_3 = 
+ am__DEPENDENCIES_4 =
+ _gimpenums_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
+@@ -75,11 +74,10 @@
+ 	$(am__DEPENDENCIES_4)
+ am__gimpenums_la_OBJECTS = gimpenumsmodule.lo
+ _gimpenums_la_OBJECTS = $(am__gimpenums_la_OBJECTS)
+-am__DEPENDENCIES_5 =  \
+-	$(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la
+-am__DEPENDENCIES_6 = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
+-am__DEPENDENCIES_7 = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
+-am__DEPENDENCIES_8 = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
++am__DEPENDENCIES_5 =
++am__DEPENDENCIES_6 = 
++am__DEPENDENCIES_7 = 
++am__DEPENDENCIES_8 = 
+ _gimpui_la_DEPENDENCIES = $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ 	$(am__DEPENDENCIES_7) $(am__DEPENDENCIES_8) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+@@ -99,7 +97,7 @@
+ 	$(am__DEPENDENCIES_4) $(am__DEPENDENCIES_4)
+ am_gimpcolor_la_OBJECTS = gimpcolormodule.lo pygimp-colors.lo
+ gimpcolor_la_OBJECTS = $(am_gimpcolor_la_OBJECTS)
+-am__DEPENDENCIES_9 = $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la
++am__DEPENDENCIES_9 = 
+ gimpthumb_la_DEPENDENCIES = $(am__DEPENDENCIES_9) \
+ 	$(am__DEPENDENCIES_4) $(am__DEPENDENCIES_4)
+ am_gimpthumb_la_OBJECTS = gimpthumbmodule.lo gimpthumb.lo
+@@ -531,9 +529,7 @@
+ 	-export-symbols-regex initgimp
+ 
+ gimp_la_LIBADD = \
+-	$(libgimp)		\
+-	$(libgimpcolor)		\
+-	$(libgimpbase)		\
++	%%GIMP_LIBS%%		\
+ 	$(GLIB_LIBS)		\
+ 	$(PYLINK_LIBS)		\
+ 	$(RT_LIBS)
+@@ -545,9 +541,7 @@
+ 	-export-symbols-regex init_gimpenums
+ 
+ _gimpenums_la_LIBADD = \
+-	$(libgimp)		\
+-	$(libgimpcolor)		\
+-	$(libgimpbase)		\
++	%%GIMP_LIBS%%		\
+ 	$(GLIB_LIBS)		\
+ 	$(PYLINK_LIBS)		\
+ 	$(RT_LIBS)
+@@ -562,7 +556,7 @@
+ 	-export-symbols-regex initgimpcolor
+ 
+ gimpcolor_la_LIBADD = \
+-	$(libgimpcolor)		\
++	%%GIMP_LIBS%%		\
+ 	$(GLIB_LIBS)		\
+ 	$(PYLINK_LIBS)
+ 
+@@ -574,13 +568,8 @@
+ 	-export-symbols-regex init_gimpui
+ 
+ _gimpui_la_LIBADD = \
+-	$(libgimpui)		\
+-	$(libgimpwidgets)	\
+-	$(libgimpconfig)	\
+-	$(libgimpmath)		\
+-	$(libgimp)		\
+-	$(libgimpcolor)		\
+-	$(libgimpbase)		\
++	%%GIMP_LIBS%%		\
++	%%GIMP_UI_LIBS%%	\
+ 	$(GTK_LIBS)		\
+ 	$(PYLINK_LIBS)		\
+ 	$(RT_LIBS)		\
+@@ -594,7 +583,7 @@
+ 	-export-symbols-regex initgimpthumb
+ 
+ gimpthumb_la_LIBADD = \
+-	$(libgimpthumb)		\
++	%%GIMP_THUMB_LIBS%%	\
+ 	$(GDK_PIXBUF_LIBS)	\
+ 	$(PYLINK_LIBS)
+ 
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 9842ece64..aa4888347 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -1,11 +1,14 @@
 bin/gimp
-bin/gimp-2.2
+bin/gimp-2.4
+bin/gimp-console
+bin/gimp-console-2.4
 bin/gimp-remote
-bin/gimp-remote-2.2
+bin/gimp-remote-2.4
 bin/gimptool-2.0
 etc/gimp/2.2/controllerrc
 etc/gimp/2.2/gimprc
 etc/gimp/2.2/gtkrc
+etc/gimp/2.2/menurc
 etc/gimp/2.2/ps-menurc
 etc/gimp/2.2/sessionrc
 etc/gimp/2.2/templaterc
@@ -19,6 +22,8 @@ include/gimp-2.0/libgimp/gimpbrushes_pdb.h
 include/gimp-2.0/libgimp/gimpbrushmenu.h
 include/gimp-2.0/libgimp/gimpbrushselect.h
 include/gimp-2.0/libgimp/gimpbrushselect_pdb.h
+include/gimp-2.0/libgimp/gimpbrushselectbutton.h
+include/gimp-2.0/libgimp/gimpbuffer_pdb.h
 include/gimp-2.0/libgimp/gimpchannel.h
 include/gimp-2.0/libgimp/gimpchannel_pdb.h
 include/gimp-2.0/libgimp/gimpcolor_pdb.h
@@ -28,7 +33,6 @@ 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
@@ -40,6 +44,8 @@ include/gimp-2.0/libgimp/gimpfontmenu.h
 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/gimpfontselectbutton.h
+include/gimp-2.0/libgimp/gimpgimprc.h
 include/gimp-2.0/libgimp/gimpgimprc_pdb.h
 include/gimp-2.0/libgimp/gimpgradient_pdb.h
 include/gimp-2.0/libgimp/gimpgradientmenu.h
@@ -47,11 +53,14 @@ 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
+include/gimp-2.0/libgimp/gimpgradientselectbutton.h
+include/gimp-2.0/libgimp/gimpgrid_pdb.h
 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/gimpitemcombobox.h
 include/gimp-2.0/libgimp/gimplayer.h
 include/gimp-2.0/libgimp/gimplayer_pdb.h
 include/gimp-2.0/libgimp/gimpmenu.h
@@ -65,6 +74,7 @@ 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/gimppaletteselectbutton.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
@@ -73,17 +83,21 @@ 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/gimppatternselectbutton.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/gimpprocbrowserdialog.h
 include/gimp-2.0/libgimp/gimpproceduraldb.h
 include/gimp-2.0/libgimp/gimpproceduraldb_pdb.h
+include/gimp-2.0/libgimp/gimpprocview.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/gimpselectbutton.h
 include/gimp-2.0/libgimp/gimpselection.h
 include/gimp-2.0/libgimp/gimpselection_pdb.h
 include/gimp-2.0/libgimp/gimpselectiontools_pdb.h
@@ -95,16 +109,21 @@ include/gimp-2.0/libgimp/gimpui.h
 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/libgimp/gimpvectors_pdb.h
+include/gimp-2.0/libgimp/gimpzoompreview.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/gimpcpuaccel.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/gimpparam.h
 include/gimp-2.0/libgimpbase/gimpparasite.h
 include/gimp-2.0/libgimpbase/gimpparasiteio.h
+include/gimp-2.0/libgimpbase/gimprectangle.h
 include/gimp-2.0/libgimpbase/gimpsignal.h
 include/gimp-2.0/libgimpbase/gimpunit.h
 include/gimp-2.0/libgimpbase/gimputils.h
@@ -113,10 +132,25 @@ include/gimp-2.0/libgimpcolor/gimpadaptivesupersample.h
 include/gimp-2.0/libgimpcolor/gimpbilinear.h
 include/gimp-2.0/libgimpcolor/gimpcmyk.h
 include/gimp-2.0/libgimpcolor/gimpcolor.h
+include/gimp-2.0/libgimpcolor/gimpcolormanaged.h
 include/gimp-2.0/libgimpcolor/gimpcolorspace.h
 include/gimp-2.0/libgimpcolor/gimpcolortypes.h
+include/gimp-2.0/libgimpcolor/gimphsl.h
 include/gimp-2.0/libgimpcolor/gimphsv.h
 include/gimp-2.0/libgimpcolor/gimprgb.h
+include/gimp-2.0/libgimpconfig/gimpcolorconfig-enums.h
+include/gimp-2.0/libgimpconfig/gimpcolorconfig.h
+include/gimp-2.0/libgimpconfig/gimpconfig-deserialize.h
+include/gimp-2.0/libgimpconfig/gimpconfig-error.h
+include/gimp-2.0/libgimpconfig/gimpconfig-iface.h
+include/gimp-2.0/libgimpconfig/gimpconfig-params.h
+include/gimp-2.0/libgimpconfig/gimpconfig-path.h
+include/gimp-2.0/libgimpconfig/gimpconfig-serialize.h
+include/gimp-2.0/libgimpconfig/gimpconfig-utils.h
+include/gimp-2.0/libgimpconfig/gimpconfig.h
+include/gimp-2.0/libgimpconfig/gimpconfigtypes.h
+include/gimp-2.0/libgimpconfig/gimpconfigwriter.h
+include/gimp-2.0/libgimpconfig/gimpscanner.h
 include/gimp-2.0/libgimpmath/gimpmath.h
 include/gimp-2.0/libgimpmath/gimpmathtypes.h
 include/gimp-2.0/libgimpmath/gimpmatrix.h
@@ -131,6 +165,7 @@ include/gimp-2.0/libgimpthumb/gimpthumb-types.h
 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/gimpbrowser.h
 include/gimp-2.0/libgimpwidgets/gimpbutton.h
 include/gimp-2.0/libgimpwidgets/gimpcellrenderercolor.h
 include/gimp-2.0/libgimpwidgets/gimpcellrenderertoggle.h
@@ -141,6 +176,8 @@ 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/gimpcolorprofilecombobox.h
+include/gimp-2.0/libgimpwidgets/gimpcolorprofilestore.h
 include/gimp-2.0/libgimpwidgets/gimpcolorscale.h
 include/gimp-2.0/libgimpwidgets/gimpcolorscales.h
 include/gimp-2.0/libgimpwidgets/gimpcolorselect.h
@@ -148,29 +185,78 @@ 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/gimpenumcombobox.h
+include/gimp-2.0/libgimpwidgets/gimpenumlabel.h
+include/gimp-2.0/libgimpwidgets/gimpenumstore.h
+include/gimp-2.0/libgimpwidgets/gimpenumwidgets.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/gimphintbox.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/gimpnumberpairentry.h
 include/gimp-2.0/libgimpwidgets/gimpoffsetarea.h
 include/gimp-2.0/libgimpwidgets/gimpoldwidgets.h
+include/gimp-2.0/libgimpwidgets/gimppageselector.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/gimppropwidgets.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/gimpstringcombobox.h
 include/gimp-2.0/libgimpwidgets/gimpunitmenu.h
 include/gimp-2.0/libgimpwidgets/gimpwidgets.h
+include/gimp-2.0/libgimpwidgets/gimpwidgetsenums.h
 include/gimp-2.0/libgimpwidgets/gimpwidgetstypes.h
+include/gimp-2.0/libgimpwidgets/gimpzoommodel.h
+lib/libgimp-2.0.a
+lib/libgimp-2.0.la
+lib/libgimp-2.0.so
+lib/libgimp-2.0.so.0
+lib/libgimpbase-2.0.a
+lib/libgimpbase-2.0.la
+lib/libgimpbase-2.0.so
+lib/libgimpbase-2.0.so.0
+lib/libgimpcolor-2.0.a
+lib/libgimpcolor-2.0.la
+lib/libgimpcolor-2.0.so
+lib/libgimpcolor-2.0.so.0
+lib/libgimpconfig-2.0.a
+lib/libgimpconfig-2.0.la
+lib/libgimpconfig-2.0.so
+lib/libgimpconfig-2.0.so.0
+lib/libgimpmath-2.0.a
+lib/libgimpmath-2.0.la
+lib/libgimpmath-2.0.so
+lib/libgimpmath-2.0.so.0
+lib/libgimpmodule-2.0.a
+lib/libgimpmodule-2.0.la
+lib/libgimpmodule-2.0.so
+lib/libgimpmodule-2.0.so.0
+lib/libgimpthumb-2.0.a
+lib/libgimpthumb-2.0.la
+lib/libgimpthumb-2.0.so
+lib/libgimpthumb-2.0.so.0
+lib/libgimpui-2.0.a
+lib/libgimpui-2.0.la
+lib/libgimpui-2.0.so
+lib/libgimpui-2.0.so.0
+lib/libgimpwidgets-2.0.a
+lib/libgimpwidgets-2.0.la
+lib/libgimpwidgets-2.0.so
+lib/libgimpwidgets-2.0.so.0
+libdata/pkgconfig/gimp-2.0.pc
+libdata/pkgconfig/gimpthumb-2.0.pc
+libdata/pkgconfig/gimpui-2.0.pc
 libexec/gimp/2.2/environ/default.env
-%%PYTHON:%%libexec/gimp/2.2/environ/pygimp.env
-%%PYTHON:%%libexec/gimp/2.2/python/pygimp-logo.png
+libexec/gimp/2.2/interpreters/default.interp
 libexec/gimp/2.2/modules/libcdisplay_colorblind.a
 libexec/gimp/2.2/modules/libcdisplay_colorblind.la
 libexec/gimp/2.2/modules/libcdisplay_colorblind.so
@@ -180,6 +266,9 @@ libexec/gimp/2.2/modules/libcdisplay_gamma.so
 libexec/gimp/2.2/modules/libcdisplay_highcontrast.a
 libexec/gimp/2.2/modules/libcdisplay_highcontrast.la
 libexec/gimp/2.2/modules/libcdisplay_highcontrast.so
+libexec/gimp/2.2/modules/libcdisplay_lcms.a
+libexec/gimp/2.2/modules/libcdisplay_lcms.la
+libexec/gimp/2.2/modules/libcdisplay_lcms.so
 libexec/gimp/2.2/modules/libcdisplay_proof.a
 libexec/gimp/2.2/modules/libcdisplay_proof.la
 libexec/gimp/2.2/modules/libcdisplay_proof.so
@@ -205,6 +294,7 @@ 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/antialias
 libexec/gimp/2.2/plug-ins/apply_lens
 libexec/gimp/2.2/plug-ins/autocrop
 libexec/gimp/2.2/plug-ins/autostretch_hsv
@@ -218,10 +308,9 @@ 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/colorxhtml.py
+libexec/gimp/2.2/plug-ins/colormap-remap
 libexec/gimp/2.2/plug-ins/colortoalpha
 libexec/gimp/2.2/plug-ins/compose
 libexec/gimp/2.2/plug-ins/compressor
@@ -232,6 +321,7 @@ 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/desktop-link
 libexec/gimp/2.2/plug-ins/despeckle
 libexec/gimp/2.2/plug-ins/destripe
 libexec/gimp/2.2/plug-ins/dicom
@@ -247,7 +337,6 @@ 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
@@ -257,22 +346,20 @@ 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/gif-load
+libexec/gimp/2.2/plug-ins/gif-save
 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
+%%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
@@ -281,12 +368,15 @@ 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/lcms
+libexec/gimp/2.2/plug-ins/lens
 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/metadata
 libexec/gimp/2.2/plug-ins/mng
 libexec/gimp/2.2/plug-ins/mosaic
 libexec/gimp/2.2/plug-ins/neon
@@ -300,7 +390,6 @@ 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
@@ -309,15 +398,16 @@ 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/poppler
 libexec/gimp/2.2/plug-ins/postscript
 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/psd-load
+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/redeye
 libexec/gimp/2.2/plug-ins/retinex
 libexec/gimp/2.2/plug-ins/ripple
 libexec/gimp/2.2/plug-ins/rotate
@@ -325,7 +415,6 @@ 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
@@ -342,23 +431,23 @@ 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
-%%SVG%%libexec/gimp/2.2/plug-ins/svg
+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/tiff-load
+libexec/gimp/2.2/plug-ins/tiff-save
 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/uri
 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
@@ -368,71 +457,25 @@ 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.a
-%%PYTHON:%%libexec/gimp/2.2/python/gimpmodule.la
-%%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.a
-%%PYTHON:%%libexec/gimp/2.2/python/gimpprocbrowsermodule.la
-%%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.la
-lib/libgimp-2.0.so
-lib/libgimp-2.0.so.%%SHLIBVER%%
-lib/libgimpbase-2.0.a
-lib/libgimpbase-2.0.la
-lib/libgimpbase-2.0.so
-lib/libgimpbase-2.0.so.%%SHLIBVER%%
-lib/libgimpcolor-2.0.a
-lib/libgimpcolor-2.0.la
-lib/libgimpcolor-2.0.so
-lib/libgimpcolor-2.0.so.%%SHLIBVER%%
-lib/libgimpmath-2.0.a
-lib/libgimpmath-2.0.la
-lib/libgimpmath-2.0.so
-lib/libgimpmath-2.0.so.%%SHLIBVER%%
-lib/libgimpmodule-2.0.a
-lib/libgimpmodule-2.0.la
-lib/libgimpmodule-2.0.so
-lib/libgimpmodule-2.0.so.%%SHLIBVER%%
-lib/libgimpthumb-2.0.a
-lib/libgimpthumb-2.0.la
-lib/libgimpthumb-2.0.so
-lib/libgimpthumb-2.0.so.%%SHLIBVER%%
-lib/libgimpui-2.0.a
-lib/libgimpui-2.0.la
-lib/libgimpui-2.0.so
-lib/libgimpui-2.0.so.%%SHLIBVER%%
-lib/libgimpwidgets-2.0.a
-lib/libgimpwidgets-2.0.la
-lib/libgimpwidgets-2.0.so
-lib/libgimpwidgets-2.0.so.%%SHLIBVER%%
-libdata/pkgconfig/gimp-2.0.pc
-libdata/pkgconfig/gimpthumb-2.0.pc
-libdata/pkgconfig/gimpui-2.0.pc
 share/aclocal/gimp-2.0.m4
+share/applications/gimp.desktop
 share/doc/gimp/libgimp/GimpAspectPreview.html
+share/doc/gimp/libgimp/GimpBrushSelectButton.html
 share/doc/gimp/libgimp/GimpDrawablePreview.html
+share/doc/gimp/libgimp/GimpFontSelectButton.html
+share/doc/gimp/libgimp/GimpGradientSelectButton.html
+share/doc/gimp/libgimp/GimpImageComboBox.html
+share/doc/gimp/libgimp/GimpPaletteSelectButton.html
+share/doc/gimp/libgimp/GimpPatternSelectButton.html
+share/doc/gimp/libgimp/GimpProcBrowserDialog.html
 share/doc/gimp/libgimp/GimpProgressBar.html
-share/doc/gimp/libgimp/gimpdefinitions.html
+share/doc/gimp/libgimp/GimpSelectButton.html
+share/doc/gimp/libgimp/GimpZoomPreview.html
 share/doc/gimp/libgimp/home.png
 share/doc/gimp/libgimp/index.html
 share/doc/gimp/libgimp/index.sgml
 share/doc/gimp/libgimp/left.png
+share/doc/gimp/libgimp/libgimp-GimpItemComboBox.html
 share/doc/gimp/libgimp/libgimp-data.html
 share/doc/gimp/libgimp/libgimp-general.html
 share/doc/gimp/libgimp/libgimp-gimp.html
@@ -440,13 +483,13 @@ share/doc/gimp/libgimp/libgimp-gimpbrush.html
 share/doc/gimp/libgimp/libgimp-gimpbrushes.html
 share/doc/gimp/libgimp/libgimp-gimpbrushmenu.html
 share/doc/gimp/libgimp/libgimp-gimpbrushselect.html
+share/doc/gimp/libgimp/libgimp-gimpbuffer.html
 share/doc/gimp/libgimp/libgimp-gimpchannel.html
 share/doc/gimp/libgimp/libgimp-gimpcolor.html
 share/doc/gimp/libgimp/libgimp-gimpcontext.html
 share/doc/gimp/libgimp/libgimp-gimpconvert.html
 share/doc/gimp/libgimp/libgimp-gimpdisplay.html
 share/doc/gimp/libgimp/libgimp-gimpdrawable.html
-share/doc/gimp/libgimp/libgimp-gimpdrawablecombobox.html
 share/doc/gimp/libgimp/libgimp-gimpdrawabletransform.html
 share/doc/gimp/libgimp/libgimp-gimpedit.html
 share/doc/gimp/libgimp/libgimp-gimpenums.html
@@ -461,10 +504,10 @@ share/doc/gimp/libgimp/libgimp-gimpgradient.html
 share/doc/gimp/libgimp/libgimp-gimpgradientmenu.html
 share/doc/gimp/libgimp/libgimp-gimpgradients.html
 share/doc/gimp/libgimp/libgimp-gimpgradientselect.html
+share/doc/gimp/libgimp/libgimp-gimpgrid.html
 share/doc/gimp/libgimp/libgimp-gimpguides.html
 share/doc/gimp/libgimp/libgimp-gimphelp.html
 share/doc/gimp/libgimp/libgimp-gimpimage.html
-share/doc/gimp/libgimp/libgimp-gimpimagecombobox.html
 share/doc/gimp/libgimp/libgimp-gimplayer.html
 share/doc/gimp/libgimp/libgimp-gimpmenu.html
 share/doc/gimp/libgimp/libgimp-gimpmessage.html
@@ -482,6 +525,7 @@ share/doc/gimp/libgimp/libgimp-gimppixelfetcher.html
 share/doc/gimp/libgimp/libgimp-gimppixelrgn.html
 share/doc/gimp/libgimp/libgimp-gimpplugin.html
 share/doc/gimp/libgimp/libgimp-gimpproceduraldb.html
+share/doc/gimp/libgimp/libgimp-gimpprocview.html
 share/doc/gimp/libgimp/libgimp-gimpprogress.html
 share/doc/gimp/libgimp/libgimp-gimpregioniterator.html
 share/doc/gimp/libgimp/libgimp-gimpselection.html
@@ -490,7 +534,12 @@ share/doc/gimp/libgimp/libgimp-gimptile.html
 share/doc/gimp/libgimp/libgimp-gimptools.html
 share/doc/gimp/libgimp/libgimp-gimpui.html
 share/doc/gimp/libgimp/libgimp-gimpundo.html
+share/doc/gimp/libgimp/libgimp-gimpvectors.html
 share/doc/gimp/libgimp/libgimp-image.html
+share/doc/gimp/libgimp/libgimp-index-deprecated.html
+share/doc/gimp/libgimp/libgimp-index-new-in-2-2.html
+share/doc/gimp/libgimp/libgimp-index-new-in-2-4.html
+share/doc/gimp/libgimp/libgimp-index.html
 share/doc/gimp/libgimp/libgimp-selectors.html
 share/doc/gimp/libgimp/libgimp.devhelp
 share/doc/gimp/libgimp/libgimp.devhelp2
@@ -507,18 +556,23 @@ share/doc/gimp/libgimpbase/left.png
 share/doc/gimp/libgimpbase/libgimpbase-gimpbaseenums.html
 share/doc/gimp/libgimpbase/libgimpbase-gimpbasetypes.html
 share/doc/gimp/libgimpbase/libgimpbase-gimpchecks.html
+share/doc/gimp/libgimpbase/libgimpbase-gimpcpuaccel.html
 share/doc/gimp/libgimpbase/libgimpbase-gimpdatafiles.html
 share/doc/gimp/libgimpbase/libgimpbase-gimpenv.html
 share/doc/gimp/libgimpbase/libgimpbase-gimplimits.html
 share/doc/gimp/libgimpbase/libgimpbase-gimpmemsize.html
+share/doc/gimp/libgimpbase/libgimpbase-gimpparam.html
 share/doc/gimp/libgimpbase/libgimpbase-gimpparasite.html
 share/doc/gimp/libgimpbase/libgimpbase-gimpparasiteio.html
-share/doc/gimp/libgimpbase/libgimpbase-gimpprotocol.html
+share/doc/gimp/libgimpbase/libgimpbase-gimprectangle.html
 share/doc/gimp/libgimpbase/libgimpbase-gimpsignal.html
 share/doc/gimp/libgimpbase/libgimpbase-gimpunit.html
 share/doc/gimp/libgimpbase/libgimpbase-gimputils.html
 share/doc/gimp/libgimpbase/libgimpbase-gimpversion.html
-share/doc/gimp/libgimpbase/libgimpbase-gimpwire.html
+share/doc/gimp/libgimpbase/libgimpbase-index-deprecated.html
+share/doc/gimp/libgimpbase/libgimpbase-index-new-in-2-2.html
+share/doc/gimp/libgimpbase/libgimpbase-index-new-in-2-4.html
+share/doc/gimp/libgimpbase/libgimpbase-index.html
 share/doc/gimp/libgimpbase/libgimpbase.devhelp
 share/doc/gimp/libgimpbase/libgimpbase.devhelp2
 share/doc/gimp/libgimpbase/libgimpbase.html
@@ -529,31 +583,64 @@ share/doc/gimp/libgimpcolor/home.png
 share/doc/gimp/libgimpcolor/index.html
 share/doc/gimp/libgimpcolor/index.sgml
 share/doc/gimp/libgimpcolor/left.png
-share/doc/gimp/libgimpcolor/style.css
 share/doc/gimp/libgimpcolor/libgimpcolor-GimpAdaptiveSupersample.html
 share/doc/gimp/libgimpcolor/libgimpcolor-GimpBilinear.html
 share/doc/gimp/libgimpcolor/libgimpcolor-GimpCMYK.html
+share/doc/gimp/libgimpcolor/libgimpcolor-GimpColorManaged.html
 share/doc/gimp/libgimpcolor/libgimpcolor-GimpColorSpace.html
 share/doc/gimp/libgimpcolor/libgimpcolor-GimpHSV.html
 share/doc/gimp/libgimpcolor/libgimpcolor-GimpRGB.html
+share/doc/gimp/libgimpcolor/libgimpcolor-index-deprecated.html
+share/doc/gimp/libgimpcolor/libgimpcolor-index-new-in-2-2.html
+share/doc/gimp/libgimpcolor/libgimpcolor-index-new-in-2-4.html
+share/doc/gimp/libgimpcolor/libgimpcolor-index.html
 share/doc/gimp/libgimpcolor/libgimpcolor.devhelp
 share/doc/gimp/libgimpcolor/libgimpcolor.devhelp2
 share/doc/gimp/libgimpcolor/libgimpcolor.html
 share/doc/gimp/libgimpcolor/right.png
+share/doc/gimp/libgimpcolor/style.css
 share/doc/gimp/libgimpcolor/up.png
+share/doc/gimp/libgimpconfig/GimpColorConfig.html
+share/doc/gimp/libgimpconfig/home.png
+share/doc/gimp/libgimpconfig/index.html
+share/doc/gimp/libgimpconfig/index.sgml
+share/doc/gimp/libgimpconfig/left.png
+share/doc/gimp/libgimpconfig/libgimpconfig-GimpConfig.html
+share/doc/gimp/libgimpconfig/libgimpconfig-GimpConfigError.html
+share/doc/gimp/libgimpconfig/libgimpconfig-GimpConfigWriter.html
+share/doc/gimp/libgimpconfig/libgimpconfig-GimpScanner.html
+share/doc/gimp/libgimpconfig/libgimpconfig-gimpconfig-deserialize.html
+share/doc/gimp/libgimpconfig/libgimpconfig-gimpconfig-params.html
+share/doc/gimp/libgimpconfig/libgimpconfig-gimpconfig-path.html
+share/doc/gimp/libgimpconfig/libgimpconfig-gimpconfig-serialize.html
+share/doc/gimp/libgimpconfig/libgimpconfig-gimpconfig-utils.html
+share/doc/gimp/libgimpconfig/libgimpconfig-hierarchy.html
+share/doc/gimp/libgimpconfig/libgimpconfig-index-deprecated.html
+share/doc/gimp/libgimpconfig/libgimpconfig-index-new-in-2-4.html
+share/doc/gimp/libgimpconfig/libgimpconfig-index.html
+share/doc/gimp/libgimpconfig/libgimpconfig.devhelp
+share/doc/gimp/libgimpconfig/libgimpconfig.devhelp2
+share/doc/gimp/libgimpconfig/libgimpconfig.html
+share/doc/gimp/libgimpconfig/right.png
+share/doc/gimp/libgimpconfig/style.css
+share/doc/gimp/libgimpconfig/up.png
 share/doc/gimp/libgimpmath/home.png
 share/doc/gimp/libgimpmath/index.html
 share/doc/gimp/libgimpmath/index.sgml
 share/doc/gimp/libgimpmath/left.png
-share/doc/gimp/libgimpmath/style.css
 share/doc/gimp/libgimpmath/libgimpmath-GimpMD5.html
 share/doc/gimp/libgimpmath/libgimpmath-GimpMath.html
 share/doc/gimp/libgimpmath/libgimpmath-GimpMatrix.html
 share/doc/gimp/libgimpmath/libgimpmath-GimpVector.html
+share/doc/gimp/libgimpmath/libgimpmath-index-deprecated.html
+share/doc/gimp/libgimpmath/libgimpmath-index-new-in-2-2.html
+share/doc/gimp/libgimpmath/libgimpmath-index-new-in-2-4.html
+share/doc/gimp/libgimpmath/libgimpmath-index.html
 share/doc/gimp/libgimpmath/libgimpmath.devhelp
 share/doc/gimp/libgimpmath/libgimpmath.devhelp2
 share/doc/gimp/libgimpmath/libgimpmath.html
 share/doc/gimp/libgimpmath/right.png
+share/doc/gimp/libgimpmath/style.css
 share/doc/gimp/libgimpmath/up.png
 share/doc/gimp/libgimpmodule/GimpModule.html
 share/doc/gimp/libgimpmodule/GimpModuleDB.html
@@ -561,11 +648,15 @@ share/doc/gimp/libgimpmodule/home.png
 share/doc/gimp/libgimpmodule/index.html
 share/doc/gimp/libgimpmodule/index.sgml
 share/doc/gimp/libgimpmodule/left.png
-share/doc/gimp/libgimpmodule/style.css
+share/doc/gimp/libgimpmodule/libgimpmodule-index-deprecated.html
+share/doc/gimp/libgimpmodule/libgimpmodule-index-new-in-2-2.html
+share/doc/gimp/libgimpmodule/libgimpmodule-index-new-in-2-4.html
+share/doc/gimp/libgimpmodule/libgimpmodule-index.html
 share/doc/gimp/libgimpmodule/libgimpmodule.devhelp
 share/doc/gimp/libgimpmodule/libgimpmodule.devhelp2
 share/doc/gimp/libgimpmodule/libgimpmodule.html
 share/doc/gimp/libgimpmodule/right.png
+share/doc/gimp/libgimpmodule/style.css
 share/doc/gimp/libgimpmodule/up.png
 share/doc/gimp/libgimpthumb/GimpThumbnail.html
 share/doc/gimp/libgimpthumb/home.png
@@ -575,12 +666,17 @@ share/doc/gimp/libgimpthumb/left.png
 share/doc/gimp/libgimpthumb/libgimpthumb-gimpthumb-enums.html
 share/doc/gimp/libgimpthumb/libgimpthumb-gimpthumb-error.html
 share/doc/gimp/libgimpthumb/libgimpthumb-gimpthumb-utils.html
+share/doc/gimp/libgimpthumb/libgimpthumb-index-deprecated.html
+share/doc/gimp/libgimpthumb/libgimpthumb-index-new-in-2-2.html
+share/doc/gimp/libgimpthumb/libgimpthumb-index-new-in-2-4.html
+share/doc/gimp/libgimpthumb/libgimpthumb-index.html
 share/doc/gimp/libgimpthumb/libgimpthumb.devhelp
 share/doc/gimp/libgimpthumb/libgimpthumb.devhelp2
 share/doc/gimp/libgimpthumb/libgimpthumb.html
 share/doc/gimp/libgimpthumb/right.png
 share/doc/gimp/libgimpthumb/style.css
 share/doc/gimp/libgimpthumb/up.png
+share/doc/gimp/libgimpwidgets/GimpBrowser.html
 share/doc/gimp/libgimpwidgets/GimpButton.html
 share/doc/gimp/libgimpwidgets/GimpCellRendererColor.html
 share/doc/gimp/libgimpwidgets/GimpCellRendererToggle.html
@@ -591,6 +687,8 @@ share/doc/gimp/libgimpwidgets/GimpColorDisplay.html
 share/doc/gimp/libgimpwidgets/GimpColorDisplayStack.html
 share/doc/gimp/libgimpwidgets/GimpColorHexEntry.html
 share/doc/gimp/libgimpwidgets/GimpColorNotebook.html
+share/doc/gimp/libgimpwidgets/GimpColorProfileComboBox.html
+share/doc/gimp/libgimpwidgets/GimpColorProfileStore.html
 share/doc/gimp/libgimpwidgets/GimpColorScale.html
 share/doc/gimp/libgimpwidgets/GimpColorScales.html
 share/doc/gimp/libgimpwidgets/GimpColorSelect.html
@@ -598,26 +696,61 @@ share/doc/gimp/libgimpwidgets/GimpColorSelection.html
 share/doc/gimp/libgimpwidgets/GimpColorSelector.html
 share/doc/gimp/libgimpwidgets/GimpController.html
 share/doc/gimp/libgimpwidgets/GimpDialog.html
+share/doc/gimp/libgimpwidgets/GimpEnumComboBox.html
+share/doc/gimp/libgimpwidgets/GimpEnumLabel.html
+share/doc/gimp/libgimpwidgets/GimpEnumStore.html
 share/doc/gimp/libgimpwidgets/GimpFileEntry.html
 share/doc/gimp/libgimpwidgets/GimpFrame.html
 share/doc/gimp/libgimpwidgets/GimpIntComboBox.html
 share/doc/gimp/libgimpwidgets/GimpIntStore.html
 share/doc/gimp/libgimpwidgets/GimpMemsizeEntry.html
+share/doc/gimp/libgimpwidgets/GimpNumberPairEntry.html
 share/doc/gimp/libgimpwidgets/GimpOffsetArea.html
+share/doc/gimp/libgimpwidgets/GimpPageSelector.html
 share/doc/gimp/libgimpwidgets/GimpPathEditor.html
 share/doc/gimp/libgimpwidgets/GimpPickButton.html
 share/doc/gimp/libgimpwidgets/GimpPixmap.html
 share/doc/gimp/libgimpwidgets/GimpPreview.html
 share/doc/gimp/libgimpwidgets/GimpPreviewArea.html
+share/doc/gimp/libgimpwidgets/GimpScrolledPreview.html
 share/doc/gimp/libgimpwidgets/GimpSizeEntry.html
+share/doc/gimp/libgimpwidgets/GimpStringComboBox.html
 share/doc/gimp/libgimpwidgets/GimpUnitMenu.html
+share/doc/gimp/libgimpwidgets/GimpZoomModel.html
+share/doc/gimp/libgimpwidgets/gimp-browser.png
+share/doc/gimp/libgimpwidgets/gimp-button.png
+share/doc/gimp/libgimpwidgets/gimp-chain-button.png
+share/doc/gimp/libgimpwidgets/gimp-color-area.png
+share/doc/gimp/libgimpwidgets/gimp-color-button.png
+share/doc/gimp/libgimpwidgets/gimp-color-hex-entry.png
+share/doc/gimp/libgimpwidgets/gimp-color-profile-combo-box.png
+share/doc/gimp/libgimpwidgets/gimp-color-scale.png
+share/doc/gimp/libgimpwidgets/gimp-color-selection.png
+share/doc/gimp/libgimpwidgets/gimp-dialog.png
+share/doc/gimp/libgimpwidgets/gimp-enum-combo-box.png
+share/doc/gimp/libgimpwidgets/gimp-enum-label.png
+share/doc/gimp/libgimpwidgets/gimp-file-entry.png
+share/doc/gimp/libgimpwidgets/gimp-frame.png
+share/doc/gimp/libgimpwidgets/gimp-hint-box.png
+share/doc/gimp/libgimpwidgets/gimp-int-combo-box.png
+share/doc/gimp/libgimpwidgets/gimp-memsize-entry.png
+share/doc/gimp/libgimpwidgets/gimp-number-pair-entry.png
+share/doc/gimp/libgimpwidgets/gimp-offset-area.png
+share/doc/gimp/libgimpwidgets/gimp-page-selector.png
+share/doc/gimp/libgimpwidgets/gimp-path-editor.png
+share/doc/gimp/libgimpwidgets/gimp-pick-button.png
+share/doc/gimp/libgimpwidgets/gimp-preview-area.png
+share/doc/gimp/libgimpwidgets/gimp-string-combo-box.png
+share/doc/gimp/libgimpwidgets/gimp-unit-menu.png
 share/doc/gimp/libgimpwidgets/home.png
 share/doc/gimp/libgimpwidgets/index.html
 share/doc/gimp/libgimpwidgets/index.sgml
 share/doc/gimp/libgimpwidgets/left.png
+share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpEnumWidgets.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpHelpUI.html
+share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpHintBox.html
+share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpPropWidgets.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpQueryBox.html
-share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpScrolledPreview.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpStock.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpWidgets.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-cell-renderers.html
@@ -625,8 +758,13 @@ share/doc/gimp/libgimpwidgets/libgimpwidgets-colordisplay.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-colorselector.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-controller.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-deprecated.html
+share/doc/gimp/libgimpwidgets/libgimpwidgets-gallery.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-gimpoldwidgets.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-hierarchy.html
+share/doc/gimp/libgimpwidgets/libgimpwidgets-index-deprecated.html
+share/doc/gimp/libgimpwidgets/libgimpwidgets-index-new-in-2-2.html
+share/doc/gimp/libgimpwidgets/libgimpwidgets-index-new-in-2-4.html
+share/doc/gimp/libgimpwidgets/libgimpwidgets-index.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-utils.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-widgets.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets.devhelp
@@ -675,9 +813,23 @@ share/doc/gimp/libgimpwidgets/stock-color-picker-black-18.png
 share/doc/gimp/libgimpwidgets/stock-color-picker-gray-18.png
 share/doc/gimp/libgimpwidgets/stock-color-picker-white-18.png
 share/doc/gimp/libgimpwidgets/stock-color-triangle-16.png
+share/doc/gimp/libgimpwidgets/stock-colormap-16.png
+share/doc/gimp/libgimpwidgets/stock-colormap-24.png
+share/doc/gimp/libgimpwidgets/stock-controller-16.png
+share/doc/gimp/libgimpwidgets/stock-controller-24.png
+share/doc/gimp/libgimpwidgets/stock-controller-keyboard-16.png
+share/doc/gimp/libgimpwidgets/stock-controller-keyboard-24.png
+share/doc/gimp/libgimpwidgets/stock-controller-linux-input-16.png
+share/doc/gimp/libgimpwidgets/stock-controller-linux-input-24.png
+share/doc/gimp/libgimpwidgets/stock-controller-midi-16.png
+share/doc/gimp/libgimpwidgets/stock-controller-midi-24.png
+share/doc/gimp/libgimpwidgets/stock-controller-wheel-16.png
+share/doc/gimp/libgimpwidgets/stock-controller-wheel-24.png
 share/doc/gimp/libgimpwidgets/stock-convert-grayscale-16.png
 share/doc/gimp/libgimpwidgets/stock-convert-indexed-16.png
 share/doc/gimp/libgimpwidgets/stock-convert-rgb-16.png
+share/doc/gimp/libgimpwidgets/stock-cursor-16.png
+share/doc/gimp/libgimpwidgets/stock-cursor-24.png
 share/doc/gimp/libgimpwidgets/stock-curve-free-16.png
 share/doc/gimp/libgimpwidgets/stock-curve-smooth-16.png
 share/doc/gimp/libgimpwidgets/stock-default-colors-12.png
@@ -685,6 +837,16 @@ share/doc/gimp/libgimpwidgets/stock-device-status-16.png
 share/doc/gimp/libgimpwidgets/stock-device-status-24.png
 share/doc/gimp/libgimpwidgets/stock-display-filter-16.png
 share/doc/gimp/libgimpwidgets/stock-display-filter-24.png
+share/doc/gimp/libgimpwidgets/stock-display-filter-colorblind-16.png
+share/doc/gimp/libgimpwidgets/stock-display-filter-colorblind-24.png
+share/doc/gimp/libgimpwidgets/stock-display-filter-contrast-16.png
+share/doc/gimp/libgimpwidgets/stock-display-filter-contrast-24.png
+share/doc/gimp/libgimpwidgets/stock-display-filter-gamma-16.png
+share/doc/gimp/libgimpwidgets/stock-display-filter-gamma-24.png
+share/doc/gimp/libgimpwidgets/stock-display-filter-lcms-16.png
+share/doc/gimp/libgimpwidgets/stock-display-filter-lcms-24.png
+share/doc/gimp/libgimpwidgets/stock-display-filter-proof-16.png
+share/doc/gimp/libgimpwidgets/stock-display-filter-proof-24.png
 share/doc/gimp/libgimpwidgets/stock-duplicate-16.png
 share/doc/gimp/libgimpwidgets/stock-edit-16.png
 share/doc/gimp/libgimpwidgets/stock-error-64.png
@@ -717,6 +879,7 @@ share/doc/gimp/libgimpwidgets/stock-gravity-south-east-24.png
 share/doc/gimp/libgimpwidgets/stock-gravity-south-west-24.png
 share/doc/gimp/libgimpwidgets/stock-gravity-west-24.png
 share/doc/gimp/libgimpwidgets/stock-grid-16.png
+share/doc/gimp/libgimpwidgets/stock-hcenter-24.png
 share/doc/gimp/libgimpwidgets/stock-hchain-24.png
 share/doc/gimp/libgimpwidgets/stock-hchain-broken-24.png
 share/doc/gimp/libgimpwidgets/stock-histogram-16.png
@@ -729,8 +892,6 @@ share/doc/gimp/libgimpwidgets/stock-image-32.png
 share/doc/gimp/libgimpwidgets/stock-image-48.png
 share/doc/gimp/libgimpwidgets/stock-images-16.png
 share/doc/gimp/libgimpwidgets/stock-images-24.png
-share/doc/gimp/libgimpwidgets/stock-indexed-palette-16.png
-share/doc/gimp/libgimpwidgets/stock-indexed-palette-24.png
 share/doc/gimp/libgimpwidgets/stock-info-16.png
 share/doc/gimp/libgimpwidgets/stock-info-24.png
 share/doc/gimp/libgimpwidgets/stock-info-64.png
@@ -739,6 +900,7 @@ share/doc/gimp/libgimpwidgets/stock-join-bevel-16.png
 share/doc/gimp/libgimpwidgets/stock-join-miter-16.png
 share/doc/gimp/libgimpwidgets/stock-join-round-16.png
 share/doc/gimp/libgimpwidgets/stock-landscape-16.png
+share/doc/gimp/libgimpwidgets/stock-landscape-22.png
 share/doc/gimp/libgimpwidgets/stock-layer-16.png
 share/doc/gimp/libgimpwidgets/stock-layer-24.png
 share/doc/gimp/libgimpwidgets/stock-layer-32.png
@@ -770,17 +932,20 @@ share/doc/gimp/libgimpwidgets/stock-paths-16.png
 share/doc/gimp/libgimpwidgets/stock-paths-22.png
 share/doc/gimp/libgimpwidgets/stock-plugin-16.png
 share/doc/gimp/libgimpwidgets/stock-portrait-16.png
+share/doc/gimp/libgimpwidgets/stock-portrait-22.png
 share/doc/gimp/libgimpwidgets/stock-print-resolution-16.png
 share/doc/gimp/libgimpwidgets/stock-print-resolution-24.png
-share/doc/gimp/libgimpwidgets/stock-qmask-off-16.png
-share/doc/gimp/libgimpwidgets/stock-qmask-on-16.png
 share/doc/gimp/libgimpwidgets/stock-question-64.png
+share/doc/gimp/libgimpwidgets/stock-quick-mask-off-12.png
+share/doc/gimp/libgimpwidgets/stock-quick-mask-on-12.png
 share/doc/gimp/libgimpwidgets/stock-reset-16.png
 share/doc/gimp/libgimpwidgets/stock-reshow-filter-16.png
 share/doc/gimp/libgimpwidgets/stock-resize-16.png
 share/doc/gimp/libgimpwidgets/stock-rotate-180-16.png
 share/doc/gimp/libgimpwidgets/stock-rotate-270-16.png
 share/doc/gimp/libgimpwidgets/stock-rotate-90-16.png
+share/doc/gimp/libgimpwidgets/stock-sample-point-16.png
+share/doc/gimp/libgimpwidgets/stock-sample-point-24.png
 share/doc/gimp/libgimpwidgets/stock-scale-16.png
 share/doc/gimp/libgimpwidgets/stock-selection-16.png
 share/doc/gimp/libgimpwidgets/stock-selection-add-16.png
@@ -812,6 +977,8 @@ share/doc/gimp/libgimpwidgets/stock-toilet-paper-16.png
 share/doc/gimp/libgimpwidgets/stock-toilet-paper-24.png
 share/doc/gimp/libgimpwidgets/stock-tool-airbrush-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-airbrush-22.png
+share/doc/gimp/libgimpwidgets/stock-tool-align-16.png
+share/doc/gimp/libgimpwidgets/stock-tool-align-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-blend-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-blend-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-blur-16.png
@@ -842,10 +1009,14 @@ share/doc/gimp/libgimpwidgets/stock-tool-eraser-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-eraser-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-flip-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-flip-22.png
+share/doc/gimp/libgimpwidgets/stock-tool-foreground-select-16.png
+share/doc/gimp/libgimpwidgets/stock-tool-foreground-select-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-free-select-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-free-select-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-fuzzy-select-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-fuzzy-select-22.png
+share/doc/gimp/libgimpwidgets/stock-tool-heal-16.png
+share/doc/gimp/libgimpwidgets/stock-tool-heal-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-hue-saturation-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-hue-saturation-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-ink-16.png
@@ -868,6 +1039,8 @@ share/doc/gimp/libgimpwidgets/stock-tool-pencil-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-pencil-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-perspective-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-perspective-22.png
+share/doc/gimp/libgimpwidgets/stock-tool-perspective-clone-16.png
+share/doc/gimp/libgimpwidgets/stock-tool-perspective-clone-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-posterize-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-posterize-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-rect-select-16.png
@@ -892,6 +1065,7 @@ share/doc/gimp/libgimpwidgets/stock-transparency-16.png
 share/doc/gimp/libgimpwidgets/stock-transparency-24.png
 share/doc/gimp/libgimpwidgets/stock-undo-history-16.png
 share/doc/gimp/libgimpwidgets/stock-undo-history-24.png
+share/doc/gimp/libgimpwidgets/stock-vcenter-24.png
 share/doc/gimp/libgimpwidgets/stock-vchain-24.png
 share/doc/gimp/libgimpwidgets/stock-vchain-broken-24.png
 share/doc/gimp/libgimpwidgets/stock-video-16.png
@@ -902,7 +1076,7 @@ share/doc/gimp/libgimpwidgets/stock-warning-64.png
 share/doc/gimp/libgimpwidgets/stock-web-16.png
 share/doc/gimp/libgimpwidgets/stock-web-24.png
 share/doc/gimp/libgimpwidgets/stock-wilber-16.png
-share/doc/gimp/libgimpwidgets/stock-wilber-32.png
+share/doc/gimp/libgimpwidgets/stock-wilber-22.png
 share/doc/gimp/libgimpwidgets/stock-wilber-48.png
 share/doc/gimp/libgimpwidgets/stock-wilber-64.png
 share/doc/gimp/libgimpwidgets/stock-wilber-eek-64.png
@@ -911,39 +1085,39 @@ share/doc/gimp/libgimpwidgets/style.css
 share/doc/gimp/libgimpwidgets/up.png
 share/gimp/brushes/10x10square.gbr
 share/gimp/brushes/10x10squareBlur.gbr
-share/gimp/brushes/11circle.gbr
-share/gimp/brushes/11fcircle.gbr
-share/gimp/brushes/13circle.gbr
-share/gimp/brushes/13fcircle.gbr
-share/gimp/brushes/15circle.gbr
-share/gimp/brushes/15fcircle.gbr
-share/gimp/brushes/17circle.gbr
-share/gimp/brushes/17fcircle.gbr
-share/gimp/brushes/19circle.gbr
-share/gimp/brushes/19fcircle.gbr
-share/gimp/brushes/1circle.gbr
 share/gimp/brushes/20x20square.gbr
 share/gimp/brushes/20x20squareBlur.gbr
-share/gimp/brushes/3circle.gbr
-share/gimp/brushes/3fcircle.gbr
-share/gimp/brushes/5circle.gbr
-share/gimp/brushes/5fcircle.gbr
 share/gimp/brushes/5x5square.gbr
 share/gimp/brushes/5x5squareBlur.gbr
-share/gimp/brushes/7circle.gbr
-share/gimp/brushes/7fcircle.gbr
-share/gimp/brushes/9circle.gbr
-share/gimp/brushes/9fcircle.gbr
-share/gimp/brushes/DStar11.gbr
-share/gimp/brushes/DStar17.gbr
-share/gimp/brushes/DStar25.gbr
+share/gimp/brushes/Calligraphic-Brush-0.vbr
+share/gimp/brushes/Calligraphic-Brush-1.vbr
+share/gimp/brushes/Calligraphic-Brush-2.vbr
+share/gimp/brushes/Calligraphic-Brush-3.vbr
+share/gimp/brushes/Circle-1.vbr
+share/gimp/brushes/Circle-3.vbr
+share/gimp/brushes/Circle-5.vbr
+share/gimp/brushes/Circle-7.vbr
+share/gimp/brushes/Circle-9.vbr
+share/gimp/brushes/Circle-11.vbr
+share/gimp/brushes/Circle-13.vbr
+share/gimp/brushes/Circle-15.vbr
+share/gimp/brushes/Circle-17.vbr
+share/gimp/brushes/Circle-19.vbr
+share/gimp/brushes/Circle-Fuzzy-3.vbr
+share/gimp/brushes/Circle-Fuzzy-5.vbr
+share/gimp/brushes/Circle-Fuzzy-7.vbr
+share/gimp/brushes/Circle-Fuzzy-9.vbr
+share/gimp/brushes/Circle-Fuzzy-11.vbr
+share/gimp/brushes/Circle-Fuzzy-13.vbr
+share/gimp/brushes/Circle-Fuzzy-15.vbr
+share/gimp/brushes/Circle-Fuzzy-17.vbr
+share/gimp/brushes/Circle-Fuzzy-19.vbr
+share/gimp/brushes/Diagonal-Star-11.vbr
+share/gimp/brushes/Diagonal-Star-17.vbr
+share/gimp/brushes/Diagonal-Star-25.vbr
 share/gimp/brushes/SketchBrush-16.gih
 share/gimp/brushes/SketchBrush-32.gih
 share/gimp/brushes/SketchBrush-64.gih
-share/gimp/brushes/callig1.gbr
-share/gimp/brushes/callig2.gbr
-share/gimp/brushes/callig3.gbr
-share/gimp/brushes/callig4.gbr
 share/gimp/brushes/confetti.gbr
 share/gimp/brushes/confetti.gih
 share/gimp/brushes/dunes.gbr
@@ -954,9 +1128,7 @@ share/gimp/brushes/galaxy_small.gbr
 share/gimp/brushes/hsparks.gih
 share/gimp/brushes/pepper.gbr
 share/gimp/brushes/pixel.gbr
-share/gimp/brushes/thegimp.gbr
 share/gimp/brushes/vine.gih
-share/gimp/brushes/xcf.gbr
 @exec mkdir -p %D/share/gimp/fonts
 share/gimp/fractalexplorer/Asteroid_Field
 share/gimp/fractalexplorer/Bar_Code_Label
@@ -1180,16 +1352,14 @@ 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-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/images/gimp-splash.png
+share/gimp/menus/brush-editor-menu.xml
 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/colormap-menu.xml
+share/gimp/menus/cursor-info-menu.xml
 share/gimp/menus/dockable-menu.xml
 share/gimp/menus/documents-menu.xml
 share/gimp/menus/error-console-menu.xml
@@ -1202,21 +1372,16 @@ 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/quick-mask-menu.xml
+share/gimp/menus/sample-points-menu.xml
+share/gimp/menus/selection-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/undo-menu.xml
 share/gimp/menus/vectors-menu.xml
-share/gimp/misc/gimp.applications
-share/gimp/misc/gimp.desktop
-share/gimp/misc/gimp.keys
-share/application-registry/gimp-2.2.applications
-share/applications/gimp-2.2.desktop
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-share/mime-info/gimp-2.2.keys
 share/gimp/palettes/Bears.gpl
 share/gimp/palettes/Bgold.gpl
 share/gimp/palettes/Blues.gpl
@@ -1250,6 +1415,7 @@ share/gimp/palettes/Plasma.gpl
 share/gimp/palettes/Reds.gpl
 share/gimp/palettes/Reds_And_Purples.gpl
 share/gimp/palettes/Royal.gpl
+share/gimp/palettes/Tango.gpl
 share/gimp/palettes/Topographic.gpl
 share/gimp/palettes/Visibone.gpl
 share/gimp/palettes/Visibone_2.gpl
@@ -1350,10 +1516,10 @@ share/gimp/scripts/comic-logo.scm
 share/gimp/scripts/coolmetal-logo.scm
 share/gimp/scripts/copy-visible.scm
 share/gimp/scripts/crystal-logo.scm
+share/gimp/scripts/difference-clouds.scm
 share/gimp/scripts/distress-selection.scm
 share/gimp/scripts/drop-shadow.scm
 share/gimp/scripts/erase-rows.scm
-share/gimp/scripts/fade-outline.scm
 share/gimp/scripts/flatland.scm
 share/gimp/scripts/font-map.scm
 share/gimp/scripts/frosty-logo.scm
@@ -1371,7 +1537,6 @@ 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
 share/gimp/scripts/images/beavis.jpg
 share/gimp/scripts/images/texture.jpg
 share/gimp/scripts/images/texture1.jpg
@@ -1384,13 +1549,19 @@ share/gimp/scripts/mkbrush.scm
 share/gimp/scripts/neon-logo.scm
 share/gimp/scripts/news-text.scm
 share/gimp/scripts/old-photo.scm
+share/gimp/scripts/paste-as-brush.scm
+share/gimp/scripts/paste-as-pattern.scm
 share/gimp/scripts/perspective-shadow.scm
 share/gimp/scripts/predator.scm
 share/gimp/scripts/pupi-button.scm
 share/gimp/scripts/rendermap.scm
+share/gimp/scripts/reverse-layers.scm
 share/gimp/scripts/ripply-anim.scm
 share/gimp/scripts/round-corners.scm
+share/gimp/scripts/script-fu-compat.init
+share/gimp/scripts/script-fu-set-cmap.scm
 share/gimp/scripts/script-fu-util.scm
+share/gimp/scripts/script-fu.init
 share/gimp/scripts/select-to-brush.scm
 share/gimp/scripts/select-to-image.scm
 share/gimp/scripts/select-to-pattern.scm
@@ -1417,486 +1588,410 @@ share/gimp/scripts/weave.scm
 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/color-management-22.png
+share/gimp/themes/Default/images/preferences/color-management.png
+share/gimp/themes/Default/images/preferences/controllers-22.png
 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-22.png
 share/gimp/themes/Default/images/preferences/default-grid.png
+share/gimp/themes/Default/images/preferences/display-22.png
 share/gimp/themes/Default/images/preferences/display.png
+share/gimp/themes/Default/images/preferences/environment-22.png
 share/gimp/themes/Default/images/preferences/environment.png
+share/gimp/themes/Default/images/preferences/folders-22.png
+share/gimp/themes/Default/images/preferences/folders-brushes-22.png
 share/gimp/themes/Default/images/preferences/folders-brushes.png
+share/gimp/themes/Default/images/preferences/folders-environ-22.png
 share/gimp/themes/Default/images/preferences/folders-environ.png
+share/gimp/themes/Default/images/preferences/folders-fonts-22.png
 share/gimp/themes/Default/images/preferences/folders-fonts.png
+share/gimp/themes/Default/images/preferences/folders-gradients-22.png
 share/gimp/themes/Default/images/preferences/folders-gradients.png
+share/gimp/themes/Default/images/preferences/folders-interp-22.png
+share/gimp/themes/Default/images/preferences/folders-interp.png
+share/gimp/themes/Default/images/preferences/folders-modules-22.png
 share/gimp/themes/Default/images/preferences/folders-modules.png
 share/gimp/themes/Default/images/preferences/folders-palettes.png
+share/gimp/themes/Default/images/preferences/folders-palettes-22.png
+share/gimp/themes/Default/images/preferences/folders-patterns-22.png
 share/gimp/themes/Default/images/preferences/folders-patterns.png
+share/gimp/themes/Default/images/preferences/folders-plug-ins-22.png
 share/gimp/themes/Default/images/preferences/folders-plug-ins.png
+share/gimp/themes/Default/images/preferences/folders-scripts-22.png
 share/gimp/themes/Default/images/preferences/folders-scripts.png
 share/gimp/themes/Default/images/preferences/folders-themes.png
+share/gimp/themes/Default/images/preferences/folders-themes-22.png
+share/gimp/themes/Default/images/preferences/folders-tool-plug-ins-22.png
 share/gimp/themes/Default/images/preferences/folders-tool-plug-ins.png
+share/gimp/themes/Default/images/preferences/folders-tools-22.png
 share/gimp/themes/Default/images/preferences/folders.png
+share/gimp/themes/Default/images/preferences/help-system-22.png
 share/gimp/themes/Default/images/preferences/help-system.png
+share/gimp/themes/Default/images/preferences/image-title-22.png
 share/gimp/themes/Default/images/preferences/image-title.png
+share/gimp/themes/Default/images/preferences/image-windows-22.png
 share/gimp/themes/Default/images/preferences/image-windows.png
+share/gimp/themes/Default/images/preferences/input-devices-22.png
 share/gimp/themes/Default/images/preferences/input-devices.png
+share/gimp/themes/Default/images/preferences/interface-22.png
 share/gimp/themes/Default/images/preferences/interface.png
-share/gimp/themes/Default/images/preferences/monitor.png
+share/gimp/themes/Default/images/preferences/new-image-22.png
 share/gimp/themes/Default/images/preferences/new-image.png
+share/gimp/themes/Default/images/preferences/session-22.png
 share/gimp/themes/Default/images/preferences/session.png
+share/gimp/themes/Default/images/preferences/theme-22.png
 share/gimp/themes/Default/images/preferences/theme.png
+share/gimp/themes/Default/images/preferences/tool-options-22.png
 share/gimp/themes/Default/images/preferences/tool-options.png
+share/gimp/themes/Default/images/preferences/toolbox-22.png
 share/gimp/themes/Default/images/preferences/toolbox.png
+share/gimp/themes/Default/images/preferences/window-management-22.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
-share/gimp/themes/Default/images/stock-channel-48.png
-share/gimp/themes/Default/images/stock-channel-alpha-16.png
-share/gimp/themes/Default/images/stock-channel-alpha-24.png
-share/gimp/themes/Default/images/stock-channel-alpha-32.png
-share/gimp/themes/Default/images/stock-channel-alpha-48.png
-share/gimp/themes/Default/images/stock-channel-blue-16.png
-share/gimp/themes/Default/images/stock-channel-blue-24.png
-share/gimp/themes/Default/images/stock-channel-blue-32.png
-share/gimp/themes/Default/images/stock-channel-blue-48.png
-share/gimp/themes/Default/images/stock-channel-gray-16.png
-share/gimp/themes/Default/images/stock-channel-gray-24.png
-share/gimp/themes/Default/images/stock-channel-gray-32.png
-share/gimp/themes/Default/images/stock-channel-gray-48.png
-share/gimp/themes/Default/images/stock-channel-green-16.png
-share/gimp/themes/Default/images/stock-channel-green-24.png
-share/gimp/themes/Default/images/stock-channel-green-32.png
-share/gimp/themes/Default/images/stock-channel-green-48.png
-share/gimp/themes/Default/images/stock-channel-indexed-16.png
-share/gimp/themes/Default/images/stock-channel-indexed-24.png
-share/gimp/themes/Default/images/stock-channel-indexed-32.png
-share/gimp/themes/Default/images/stock-channel-indexed-48.png
-share/gimp/themes/Default/images/stock-channel-red-16.png
-share/gimp/themes/Default/images/stock-channel-red-24.png
-share/gimp/themes/Default/images/stock-channel-red-32.png
-share/gimp/themes/Default/images/stock-channel-red-48.png
-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
-share/gimp/themes/Default/images/stock-color-triangle-16.png
-share/gimp/themes/Default/images/stock-convert-grayscale-16.png
-share/gimp/themes/Default/images/stock-convert-indexed-16.png
-share/gimp/themes/Default/images/stock-convert-rgb-16.png
-share/gimp/themes/Default/images/stock-curve-free-16.png
-share/gimp/themes/Default/images/stock-curve-smooth-16.png
-share/gimp/themes/Default/images/stock-default-colors-12.png
-share/gimp/themes/Default/images/stock-device-status-16.png
-share/gimp/themes/Default/images/stock-device-status-24.png
-share/gimp/themes/Default/images/stock-display-filter-16.png
-share/gimp/themes/Default/images/stock-display-filter-24.png
-share/gimp/themes/Default/images/stock-duplicate-16.png
-share/gimp/themes/Default/images/stock-edit-16.png
 share/gimp/themes/Default/images/stock-error-64.png
-share/gimp/themes/Default/images/stock-eye-12.png
-share/gimp/themes/Default/images/stock-eye-20.png
-share/gimp/themes/Default/images/stock-flip-horizontal-16.png
-share/gimp/themes/Default/images/stock-flip-vertical-16.png
-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
-share/gimp/themes/Default/images/stock-gradient-linear-16.png
-share/gimp/themes/Default/images/stock-gradient-radial-16.png
-share/gimp/themes/Default/images/stock-gradient-shapeburst-angular-16.png
-share/gimp/themes/Default/images/stock-gradient-shapeburst-dimpled-16.png
-share/gimp/themes/Default/images/stock-gradient-shapeburst-spherical-16.png
-share/gimp/themes/Default/images/stock-gradient-spiral-anticlockwise-16.png
-share/gimp/themes/Default/images/stock-gradient-spiral-clockwise-16.png
-share/gimp/themes/Default/images/stock-gradient-square-16.png
-share/gimp/themes/Default/images/stock-gravity-east-24.png
-share/gimp/themes/Default/images/stock-gravity-north-24.png
-share/gimp/themes/Default/images/stock-gravity-north-east-24.png
-share/gimp/themes/Default/images/stock-gravity-north-west-24.png
-share/gimp/themes/Default/images/stock-gravity-south-24.png
-share/gimp/themes/Default/images/stock-gravity-south-east-24.png
-share/gimp/themes/Default/images/stock-gravity-south-west-24.png
-share/gimp/themes/Default/images/stock-gravity-west-24.png
-share/gimp/themes/Default/images/stock-grid-16.png
-share/gimp/themes/Default/images/stock-hchain-24.png
-share/gimp/themes/Default/images/stock-hchain-broken-24.png
-share/gimp/themes/Default/images/stock-histogram-16.png
-share/gimp/themes/Default/images/stock-histogram-22.png
-share/gimp/themes/Default/images/stock-histogram-linear-16.png
-share/gimp/themes/Default/images/stock-histogram-logarithmic-16.png
-share/gimp/themes/Default/images/stock-image-16.png
-share/gimp/themes/Default/images/stock-image-24.png
-share/gimp/themes/Default/images/stock-image-32.png
-share/gimp/themes/Default/images/stock-image-48.png
-share/gimp/themes/Default/images/stock-images-16.png
-share/gimp/themes/Default/images/stock-images-24.png
-share/gimp/themes/Default/images/stock-indexed-palette-16.png
-share/gimp/themes/Default/images/stock-indexed-palette-24.png
-share/gimp/themes/Default/images/stock-info-16.png
-share/gimp/themes/Default/images/stock-info-24.png
 share/gimp/themes/Default/images/stock-info-64.png
-share/gimp/themes/Default/images/stock-invert-16.png
-share/gimp/themes/Default/images/stock-join-bevel-16.png
-share/gimp/themes/Default/images/stock-join-miter-16.png
-share/gimp/themes/Default/images/stock-join-round-16.png
-share/gimp/themes/Default/images/stock-landscape-16.png
-share/gimp/themes/Default/images/stock-layer-16.png
-share/gimp/themes/Default/images/stock-layer-24.png
-share/gimp/themes/Default/images/stock-layer-32.png
-share/gimp/themes/Default/images/stock-layer-48.png
-share/gimp/themes/Default/images/stock-layer-mask-16.png
-share/gimp/themes/Default/images/stock-layer-mask-24.png
-share/gimp/themes/Default/images/stock-layer-mask-32.png
-share/gimp/themes/Default/images/stock-layer-mask-48.png
-share/gimp/themes/Default/images/stock-layer-to-imagesize-16.png
-share/gimp/themes/Default/images/stock-layers-16.png
-share/gimp/themes/Default/images/stock-layers-24.png
-share/gimp/themes/Default/images/stock-letter-spacing-22.png
-share/gimp/themes/Default/images/stock-line-spacing-22.png
-share/gimp/themes/Default/images/stock-linked-12.png
-share/gimp/themes/Default/images/stock-linked-20.png
-share/gimp/themes/Default/images/stock-list-16.png
-share/gimp/themes/Default/images/stock-menu-left-12.png
-share/gimp/themes/Default/images/stock-menu-right-12.png
-share/gimp/themes/Default/images/stock-merge-down-16.png
-share/gimp/themes/Default/images/stock-move-to-screen-16.png
-share/gimp/themes/Default/images/stock-move-to-screen-24.png
-share/gimp/themes/Default/images/stock-navigation-16.png
-share/gimp/themes/Default/images/stock-paste-as-new-16.png
-share/gimp/themes/Default/images/stock-paste-into-16.png
-share/gimp/themes/Default/images/stock-path-16.png
-share/gimp/themes/Default/images/stock-path-22.png
-share/gimp/themes/Default/images/stock-path-stroke-16.png
-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
-share/gimp/themes/Default/images/stock-reset-16.png
-share/gimp/themes/Default/images/stock-reshow-filter-16.png
-share/gimp/themes/Default/images/stock-resize-16.png
-share/gimp/themes/Default/images/stock-rotate-180-16.png
-share/gimp/themes/Default/images/stock-rotate-270-16.png
-share/gimp/themes/Default/images/stock-rotate-90-16.png
-share/gimp/themes/Default/images/stock-scale-16.png
-share/gimp/themes/Default/images/stock-selection-16.png
-share/gimp/themes/Default/images/stock-selection-add-16.png
-share/gimp/themes/Default/images/stock-selection-all-16.png
-share/gimp/themes/Default/images/stock-selection-border-16.png
-share/gimp/themes/Default/images/stock-selection-grow-16.png
-share/gimp/themes/Default/images/stock-selection-intersect-16.png
-share/gimp/themes/Default/images/stock-selection-none-16.png
-share/gimp/themes/Default/images/stock-selection-replace-16.png
-share/gimp/themes/Default/images/stock-selection-shrink-16.png
-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
-share/gimp/themes/Default/images/stock-text-dir-ltr-24.png
-share/gimp/themes/Default/images/stock-text-dir-rtl-24.png
-share/gimp/themes/Default/images/stock-text-layer-16.png
-share/gimp/themes/Default/images/stock-text-layer-24.png
-share/gimp/themes/Default/images/stock-text-layer-32.png
-share/gimp/themes/Default/images/stock-text-layer-48.png
-share/gimp/themes/Default/images/stock-texture-64.png
-share/gimp/themes/Default/images/stock-toilet-paper-16.png
-share/gimp/themes/Default/images/stock-toilet-paper-24.png
-share/gimp/themes/Default/images/stock-tool-airbrush-16.png
-share/gimp/themes/Default/images/stock-tool-airbrush-22.png
-share/gimp/themes/Default/images/stock-tool-blend-16.png
-share/gimp/themes/Default/images/stock-tool-blend-22.png
-share/gimp/themes/Default/images/stock-tool-blur-16.png
-share/gimp/themes/Default/images/stock-tool-blur-22.png
-share/gimp/themes/Default/images/stock-tool-brightness-contrast-16.png
-share/gimp/themes/Default/images/stock-tool-brightness-contrast-22.png
-share/gimp/themes/Default/images/stock-tool-bucket-fill-16.png
-share/gimp/themes/Default/images/stock-tool-bucket-fill-22.png
-share/gimp/themes/Default/images/stock-tool-by-color-select-16.png
-share/gimp/themes/Default/images/stock-tool-by-color-select-22.png
-share/gimp/themes/Default/images/stock-tool-clone-16.png
-share/gimp/themes/Default/images/stock-tool-clone-22.png
-share/gimp/themes/Default/images/stock-tool-color-balance-16.png
-share/gimp/themes/Default/images/stock-tool-color-balance-22.png
-share/gimp/themes/Default/images/stock-tool-color-picker-16.png
-share/gimp/themes/Default/images/stock-tool-color-picker-22.png
-share/gimp/themes/Default/images/stock-tool-colorize-16.png
-share/gimp/themes/Default/images/stock-tool-colorize-22.png
-share/gimp/themes/Default/images/stock-tool-crop-16.png
-share/gimp/themes/Default/images/stock-tool-crop-22.png
-share/gimp/themes/Default/images/stock-tool-curves-16.png
-share/gimp/themes/Default/images/stock-tool-curves-22.png
-share/gimp/themes/Default/images/stock-tool-dodge-16.png
-share/gimp/themes/Default/images/stock-tool-dodge-22.png
-share/gimp/themes/Default/images/stock-tool-ellipse-select-16.png
-share/gimp/themes/Default/images/stock-tool-ellipse-select-22.png
-share/gimp/themes/Default/images/stock-tool-eraser-16.png
-share/gimp/themes/Default/images/stock-tool-eraser-22.png
-share/gimp/themes/Default/images/stock-tool-flip-16.png
-share/gimp/themes/Default/images/stock-tool-flip-22.png
-share/gimp/themes/Default/images/stock-tool-free-select-16.png
-share/gimp/themes/Default/images/stock-tool-free-select-22.png
-share/gimp/themes/Default/images/stock-tool-fuzzy-select-16.png
-share/gimp/themes/Default/images/stock-tool-fuzzy-select-22.png
-share/gimp/themes/Default/images/stock-tool-hue-saturation-16.png
-share/gimp/themes/Default/images/stock-tool-hue-saturation-22.png
-share/gimp/themes/Default/images/stock-tool-ink-16.png
-share/gimp/themes/Default/images/stock-tool-ink-22.png
-share/gimp/themes/Default/images/stock-tool-iscissors-16.png
-share/gimp/themes/Default/images/stock-tool-iscissors-22.png
-share/gimp/themes/Default/images/stock-tool-levels-16.png
-share/gimp/themes/Default/images/stock-tool-levels-22.png
-share/gimp/themes/Default/images/stock-tool-measure-16.png
-share/gimp/themes/Default/images/stock-tool-measure-22.png
-share/gimp/themes/Default/images/stock-tool-move-16.png
-share/gimp/themes/Default/images/stock-tool-move-22.png
-share/gimp/themes/Default/images/stock-tool-options-16.png
-share/gimp/themes/Default/images/stock-tool-options-24.png
-share/gimp/themes/Default/images/stock-tool-paintbrush-16.png
-share/gimp/themes/Default/images/stock-tool-paintbrush-22.png
-share/gimp/themes/Default/images/stock-tool-path-16.png
-share/gimp/themes/Default/images/stock-tool-path-22.png
-share/gimp/themes/Default/images/stock-tool-pencil-16.png
-share/gimp/themes/Default/images/stock-tool-pencil-22.png
-share/gimp/themes/Default/images/stock-tool-perspective-16.png
-share/gimp/themes/Default/images/stock-tool-perspective-22.png
-share/gimp/themes/Default/images/stock-tool-posterize-16.png
-share/gimp/themes/Default/images/stock-tool-posterize-22.png
-share/gimp/themes/Default/images/stock-tool-rect-select-16.png
-share/gimp/themes/Default/images/stock-tool-rect-select-22.png
-share/gimp/themes/Default/images/stock-tool-rotate-16.png
-share/gimp/themes/Default/images/stock-tool-rotate-22.png
-share/gimp/themes/Default/images/stock-tool-scale-16.png
-share/gimp/themes/Default/images/stock-tool-scale-22.png
-share/gimp/themes/Default/images/stock-tool-shear-16.png
-share/gimp/themes/Default/images/stock-tool-shear-22.png
-share/gimp/themes/Default/images/stock-tool-smudge-16.png
-share/gimp/themes/Default/images/stock-tool-smudge-22.png
-share/gimp/themes/Default/images/stock-tool-text-16.png
-share/gimp/themes/Default/images/stock-tool-text-22.png
-share/gimp/themes/Default/images/stock-tool-threshold-16.png
-share/gimp/themes/Default/images/stock-tool-threshold-22.png
-share/gimp/themes/Default/images/stock-tool-zoom-16.png
-share/gimp/themes/Default/images/stock-tool-zoom-22.png
-share/gimp/themes/Default/images/stock-tools-16.png
-share/gimp/themes/Default/images/stock-tools-24.png
-share/gimp/themes/Default/images/stock-transparency-16.png
-share/gimp/themes/Default/images/stock-transparency-24.png
-share/gimp/themes/Default/images/stock-undo-history-16.png
-share/gimp/themes/Default/images/stock-undo-history-24.png
-share/gimp/themes/Default/images/stock-vchain-24.png
-share/gimp/themes/Default/images/stock-vchain-broken-24.png
-share/gimp/themes/Default/images/stock-video-16.png
-share/gimp/themes/Default/images/stock-video-24.png
-share/gimp/themes/Default/images/stock-warning-16.png
-share/gimp/themes/Default/images/stock-warning-24.png
 share/gimp/themes/Default/images/stock-warning-64.png
-share/gimp/themes/Default/images/stock-web-16.png
-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
+%%GNOME%%share/application-registry/gimp.applications
+%%GNOME%%share/mime-info/gimp.keys
+share/icons/hicolor/16x16/apps/gimp.png
+share/icons/hicolor/22x22/apps/gimp.png
+share/icons/hicolor/24x24/apps/gimp.png
+share/icons/hicolor/32x32/apps/gimp.png
+share/icons/hicolor/48x48/apps/gimp.png
+share/icons/hicolor/64x64/apps/gimp.png
+share/icons/hicolor/scalable/apps/gimp.svg
+share/locale/ar/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ar/LC_MESSAGES/gimp20-python.mo
+share/locale/ar/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/ar/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ar/LC_MESSAGES/gimp20-tips.mo
+share/locale/ar/LC_MESSAGES/gimp20.mo
 share/locale/bg/LC_MESSAGES/gimp20-libgimp.mo
-share/locale/bg/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/bg/LC_MESSAGES/gimp20-python.mo
 share/locale/bg/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/bg/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/bg/LC_MESSAGES/gimp20-tips.mo
 share/locale/bg/LC_MESSAGES/gimp20.mo
 share/locale/ca/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ca/LC_MESSAGES/gimp20-python.mo
 share/locale/ca/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ca/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ca/LC_MESSAGES/gimp20-tips.mo
 share/locale/ca/LC_MESSAGES/gimp20.mo
 share/locale/cs/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/cs/LC_MESSAGES/gimp20-python.mo
 share/locale/cs/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/cs/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/cs/LC_MESSAGES/gimp20-tips.mo
 share/locale/cs/LC_MESSAGES/gimp20.mo
 share/locale/da/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/da/LC_MESSAGES/gimp20-python.mo
 share/locale/da/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/da/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/da/LC_MESSAGES/gimp20-tips.mo
 share/locale/da/LC_MESSAGES/gimp20.mo
 share/locale/de/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/de/LC_MESSAGES/gimp20-python.mo
 share/locale/de/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/de/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/de/LC_MESSAGES/gimp20-tips.mo
 share/locale/de/LC_MESSAGES/gimp20.mo
+share/locale/dz/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/dz/LC_MESSAGES/gimp20-python.mo
+share/locale/dz/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/dz/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/dz/LC_MESSAGES/gimp20-tips.mo
+share/locale/dz/LC_MESSAGES/gimp20.mo
 share/locale/el/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/el/LC_MESSAGES/gimp20-python.mo
 share/locale/el/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/el/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/el/LC_MESSAGES/gimp20-tips.mo
 share/locale/el/LC_MESSAGES/gimp20.mo
 share/locale/en_CA/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/en_CA/LC_MESSAGES/gimp20-python.mo
 share/locale/en_CA/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/en_CA/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/en_CA/LC_MESSAGES/gimp20-tips.mo
 share/locale/en_CA/LC_MESSAGES/gimp20.mo
 share/locale/en_GB/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/en_GB/LC_MESSAGES/gimp20-python.mo
 share/locale/en_GB/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/en_GB/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/en_GB/LC_MESSAGES/gimp20-tips.mo
 share/locale/en_GB/LC_MESSAGES/gimp20.mo
+share/locale/eo/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/eo/LC_MESSAGES/gimp20-python.mo
+share/locale/eo/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/eo/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/eo/LC_MESSAGES/gimp20-tips.mo
+share/locale/eo/LC_MESSAGES/gimp20.mo
 share/locale/es/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/es/LC_MESSAGES/gimp20-python.mo
 share/locale/es/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/es/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/es/LC_MESSAGES/gimp20-tips.mo
 share/locale/es/LC_MESSAGES/gimp20.mo
+share/locale/et/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/et/LC_MESSAGES/gimp20-python.mo
+share/locale/et/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/et/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/et/LC_MESSAGES/gimp20-tips.mo
+share/locale/et/LC_MESSAGES/gimp20.mo
 share/locale/eu/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/eu/LC_MESSAGES/gimp20-python.mo
 share/locale/eu/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/eu/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/eu/LC_MESSAGES/gimp20-tips.mo
 share/locale/eu/LC_MESSAGES/gimp20.mo
 share/locale/fa/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/fa/LC_MESSAGES/gimp20-python.mo
 share/locale/fa/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/fa/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/fa/LC_MESSAGES/gimp20-tips.mo
 share/locale/fa/LC_MESSAGES/gimp20.mo
 share/locale/fi/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/fi/LC_MESSAGES/gimp20-python.mo
 share/locale/fi/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/fi/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/fi/LC_MESSAGES/gimp20-tips.mo
 share/locale/fi/LC_MESSAGES/gimp20.mo
 share/locale/fr/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/fr/LC_MESSAGES/gimp20-python.mo
 share/locale/fr/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/fr/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/fr/LC_MESSAGES/gimp20-tips.mo
 share/locale/fr/LC_MESSAGES/gimp20.mo
 share/locale/ga/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ga/LC_MESSAGES/gimp20-python.mo
 share/locale/ga/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ga/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ga/LC_MESSAGES/gimp20-tips.mo
 share/locale/ga/LC_MESSAGES/gimp20.mo
 share/locale/gl/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/gl/LC_MESSAGES/gimp20-python.mo
 share/locale/gl/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/gl/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/gl/LC_MESSAGES/gimp20-tips.mo
 share/locale/gl/LC_MESSAGES/gimp20.mo
+share/locale/gu/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/gu/LC_MESSAGES/gimp20-python.mo
+share/locale/gu/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/gu/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/gu/LC_MESSAGES/gimp20-tips.mo
+share/locale/gu/LC_MESSAGES/gimp20.mo
 share/locale/he/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/he/LC_MESSAGES/gimp20-python.mo
 share/locale/he/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/he/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/he/LC_MESSAGES/gimp20-tips.mo
 share/locale/he/LC_MESSAGES/gimp20.mo
 share/locale/hr/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/hr/LC_MESSAGES/gimp20-python.mo
 share/locale/hr/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/hr/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/hr/LC_MESSAGES/gimp20-tips.mo
 share/locale/hr/LC_MESSAGES/gimp20.mo
 share/locale/hu/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/hu/LC_MESSAGES/gimp20-python.mo
 share/locale/hu/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/hu/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/hu/LC_MESSAGES/gimp20-tips.mo
 share/locale/hu/LC_MESSAGES/gimp20.mo
 share/locale/id/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/id/LC_MESSAGES/gimp20-python.mo
 share/locale/id/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/id/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/id/LC_MESSAGES/gimp20-tips.mo
 share/locale/id/LC_MESSAGES/gimp20.mo
 share/locale/it/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/it/LC_MESSAGES/gimp20-python.mo
 share/locale/it/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/it/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/it/LC_MESSAGES/gimp20-tips.mo
 share/locale/it/LC_MESSAGES/gimp20.mo
 share/locale/ja/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ja/LC_MESSAGES/gimp20-python.mo
 share/locale/ja/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ja/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ja/LC_MESSAGES/gimp20-tips.mo
 share/locale/ja/LC_MESSAGES/gimp20.mo
+share/locale/km/LC_MESSAGES/gimp20.mo
+share/locale/km/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/km/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/km/LC_MESSAGES/gimp20-python.mo
+share/locale/km/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/km/LC_MESSAGES/gimp20-tips.mo
 share/locale/ko/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ko/LC_MESSAGES/gimp20-python.mo
 share/locale/ko/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ko/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ko/LC_MESSAGES/gimp20-tips.mo
 share/locale/ko/LC_MESSAGES/gimp20.mo
 share/locale/lt/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/lt/LC_MESSAGES/gimp20-python.mo
 share/locale/lt/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/lt/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/lt/LC_MESSAGES/gimp20-tips.mo
 share/locale/lt/LC_MESSAGES/gimp20.mo
 share/locale/mk/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/mk/LC_MESSAGES/gimp20-python.mo
 share/locale/mk/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/mk/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/mk/LC_MESSAGES/gimp20-tips.mo
 share/locale/mk/LC_MESSAGES/gimp20.mo
 share/locale/ms/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ms/LC_MESSAGES/gimp20-python.mo
 share/locale/ms/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ms/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ms/LC_MESSAGES/gimp20-tips.mo
 share/locale/ms/LC_MESSAGES/gimp20.mo
 share/locale/nb/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/nb/LC_MESSAGES/gimp20-python.mo
 share/locale/nb/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/nb/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/nb/LC_MESSAGES/gimp20-tips.mo
 share/locale/nb/LC_MESSAGES/gimp20.mo
+share/locale/ne/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ne/LC_MESSAGES/gimp20-python.mo
+share/locale/ne/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/ne/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ne/LC_MESSAGES/gimp20-tips.mo
+share/locale/ne/LC_MESSAGES/gimp20.mo
 share/locale/nl/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/nl/LC_MESSAGES/gimp20-python.mo
 share/locale/nl/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/nl/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/nl/LC_MESSAGES/gimp20-tips.mo
 share/locale/nl/LC_MESSAGES/gimp20.mo
 share/locale/oc/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/oc/LC_MESSAGES/gimp20-python.mo
 share/locale/oc/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/oc/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/oc/LC_MESSAGES/gimp20-tips.mo
 share/locale/oc/LC_MESSAGES/gimp20.mo
 share/locale/pa/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/pa/LC_MESSAGES/gimp20-python.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-tips.mo
 share/locale/pa/LC_MESSAGES/gimp20.mo
 share/locale/pl/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/pl/LC_MESSAGES/gimp20-python.mo
 share/locale/pl/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/pl/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/pl/LC_MESSAGES/gimp20-tips.mo
 share/locale/pl/LC_MESSAGES/gimp20.mo
 share/locale/pt/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/pt/LC_MESSAGES/gimp20-python.mo
 share/locale/pt/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/pt/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/pt/LC_MESSAGES/gimp20-tips.mo
 share/locale/pt/LC_MESSAGES/gimp20.mo
 share/locale/pt_BR/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/pt_BR/LC_MESSAGES/gimp20-python.mo
 share/locale/pt_BR/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/pt_BR/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/pt_BR/LC_MESSAGES/gimp20-tips.mo
 share/locale/pt_BR/LC_MESSAGES/gimp20.mo
 share/locale/ro/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ro/LC_MESSAGES/gimp20-python.mo
 share/locale/ro/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ro/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ro/LC_MESSAGES/gimp20-tips.mo
 share/locale/ro/LC_MESSAGES/gimp20.mo
 share/locale/ru/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ru/LC_MESSAGES/gimp20-python.mo
 share/locale/ru/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ru/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ru/LC_MESSAGES/gimp20-tips.mo
 share/locale/ru/LC_MESSAGES/gimp20.mo
+share/locale/rw/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/rw/LC_MESSAGES/gimp20-python.mo
+share/locale/rw/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/rw/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/rw/LC_MESSAGES/gimp20-tips.mo
+share/locale/rw/LC_MESSAGES/gimp20.mo
 share/locale/sk/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/sk/LC_MESSAGES/gimp20-python.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-tips.mo
 share/locale/sk/LC_MESSAGES/gimp20.mo
+share/locale/sl/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/sl/LC_MESSAGES/gimp20-python.mo
+share/locale/sl/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/sl/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/sl/LC_MESSAGES/gimp20-tips.mo
+share/locale/sl/LC_MESSAGES/gimp20.mo
 share/locale/sr/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/sr/LC_MESSAGES/gimp20-python.mo
 share/locale/sr/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/sr/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/sr/LC_MESSAGES/gimp20-tips.mo
 share/locale/sr/LC_MESSAGES/gimp20.mo
 share/locale/sr@Latn/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/sr@Latn/LC_MESSAGES/gimp20-python.mo
 share/locale/sr@Latn/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/sr@Latn/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/sr@Latn/LC_MESSAGES/gimp20-tips.mo
 share/locale/sr@Latn/LC_MESSAGES/gimp20.mo
 share/locale/sv/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/sv/LC_MESSAGES/gimp20-python.mo
 share/locale/sv/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/sv/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/sv/LC_MESSAGES/gimp20-tips.mo
 share/locale/sv/LC_MESSAGES/gimp20.mo
 share/locale/tr/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/tr/LC_MESSAGES/gimp20-python.mo
 share/locale/tr/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/tr/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/tr/LC_MESSAGES/gimp20-tips.mo
 share/locale/tr/LC_MESSAGES/gimp20.mo
+share/locale/tt/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/tt/LC_MESSAGES/gimp20-python.mo
+share/locale/tt/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/tt/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/tt/LC_MESSAGES/gimp20-tips.mo
+share/locale/tt/LC_MESSAGES/gimp20.mo
 share/locale/uk/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/uk/LC_MESSAGES/gimp20-python.mo
 share/locale/uk/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/uk/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/uk/LC_MESSAGES/gimp20-tips.mo
 share/locale/uk/LC_MESSAGES/gimp20.mo
 share/locale/vi/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/vi/LC_MESSAGES/gimp20-python.mo
 share/locale/vi/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/vi/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/vi/LC_MESSAGES/gimp20-tips.mo
 share/locale/vi/LC_MESSAGES/gimp20.mo
+share/locale/xh/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/xh/LC_MESSAGES/gimp20-python.mo
+share/locale/xh/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/xh/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/xh/LC_MESSAGES/gimp20-tips.mo
+share/locale/xh/LC_MESSAGES/gimp20.mo
 share/locale/yi/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/yi/LC_MESSAGES/gimp20-python.mo
 share/locale/yi/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/yi/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/yi/LC_MESSAGES/gimp20-tips.mo
 share/locale/yi/LC_MESSAGES/gimp20.mo
 share/locale/zh_CN/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/zh_CN/LC_MESSAGES/gimp20-python.mo
 share/locale/zh_CN/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/zh_CN/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/zh_CN/LC_MESSAGES/gimp20-tips.mo
 share/locale/zh_CN/LC_MESSAGES/gimp20.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/zh_TW/LC_MESSAGES/gimp20-python.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-tips.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm share/gimp/tips
 @dirrm share/gimp/themes/Small
@@ -1908,7 +2003,6 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm share/gimp/scripts
 @dirrm share/gimp/patterns
 @dirrm share/gimp/palettes
-@dirrm share/gimp/misc
 @dirrm share/gimp/menus
 @dirrm share/gimp/images
 @dirrm share/gimp/gradients
@@ -1926,13 +2020,15 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm share/doc/gimp/libgimpthumb
 @dirrm share/doc/gimp/libgimpmodule
 @dirrm share/doc/gimp/libgimpmath
+@dirrm share/doc/gimp/libgimpconfig
 @dirrm share/doc/gimp/libgimpcolor
 @dirrm share/doc/gimp/libgimpbase
 @dirrm share/doc/gimp/libgimp
 @dirrm share/doc/gimp
+@dirrmtry share/applications
 @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/interpreters
 @dirrm libexec/gimp/2.2/environ
 @dirrm libexec/gimp/2.2
 @dirrm libexec/gimp
@@ -1940,15 +2036,28 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm include/gimp-2.0/libgimpthumb
 @dirrm include/gimp-2.0/libgimpmodule
 @dirrm include/gimp-2.0/libgimpmath
+@dirrm include/gimp-2.0/libgimpconfig
 @dirrm include/gimp-2.0/libgimpcolor
 @dirrm include/gimp-2.0/libgimpbase
 @dirrm include/gimp-2.0/libgimp
 @dirrm include/gimp-2.0
 @dirrm etc/gimp/2.2
 @dirrm etc/gimp
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/yi/LC_MESSAGES
 @dirrmtry share/locale/yi
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/tt/LC_MESSAGES
+@dirrmtry share/locale/tt
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
-@dirrmtry share/applications
+@dirrmtry share/locale/km/LC_MESSAGES
+@dirrmtry share/locale/km
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz