- Merge gimp-devel changes to gimp

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8584 df743ca5-7f9a-e211-a948-0013205c9059
author: ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> 2007-03-31 02:18:41 +0800
committer: ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> 2007-03-31 02:18:41 +0800
commit: 1d715b601a9b9e13a115ec770e9a3c6a56f92510 (patch)
tree: 64f24e68a4e2fe613b39bb3150a73b39e35c48b8 /graphics
parent: 79a6d85c8ae28fcd91ce567868f980cb7a1c22f6 (diff)
download: marcuscom-ports-1d715b601a9b9e13a115ec770e9a3c6a56f92510.tar
marcuscom-ports-1d715b601a9b9e13a115ec770e9a3c6a56f92510.tar.gz
marcuscom-ports-1d715b601a9b9e13a115ec770e9a3c6a56f92510.tar.bz2
marcuscom-ports-1d715b601a9b9e13a115ec770e9a3c6a56f92510.tar.lz
marcuscom-ports-1d715b601a9b9e13a115ec770e9a3c6a56f92510.tar.xz
marcuscom-ports-1d715b601a9b9e13a115ec770e9a3c6a56f92510.tar.zst
marcuscom-ports-1d715b601a9b9e13a115ec770e9a3c6a56f92510.zip
13 files changed, 702 insertions, 667 deletions
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 4a3fd4ffb..6b125f923 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -3,14 +3,13 @@
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/gimp-app/Makefile,v 1.8 2007/02/16 18:14:25 mezz Exp $
-#
+#    $MCom: ports/graphics/gimp/Makefile,v 1.2 2006/08/25 18:14:57 pav Exp $
 
 PORTNAME=	gimp
-PORTVERSION=	2.3.13
-PORTREVISION=	1
-PORTEPOCH?=	1
-CATEGORIES?=	graphics gnome
+PORTVERSION=	2.2.13
+PORTREVISION=	2
+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,64 +18,68 @@ 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}
-PKGNAMESUFFIX?=	-app
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A GNU Image Manipulation Program development version
+COMMENT=	A GNU Image Manipulation Program
 
-LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif \
-		wmf.2:${PORTSDIR}/graphics/libwmf \
-		poppler-glib.1:${PORTSDIR}/graphics/poppler-gtk \
+LIB_DEPENDS=	wmf.2:${PORTSDIR}/graphics/libwmf \
 		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 \
-		lcms.1:${PORTSDIR}/graphics/lcms
+		tiff.4:${PORTSDIR}/graphics/tiff
+
+CONFLICTS=	gimp-1.* gimpshop-[0-9]*
+
+SHLIBVER?=	200
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
-USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2 ltverhack desktopfileutils
+GNU_CONFIGURE=	yes
+USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2
 WANT_GNOME=	yes
-USE_GCC=	3.4+
+USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-INSTALLS_ICONS=	yes
-LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
-CONFIGURE_ARGS?=--disable-perl \
+PLIST_SUB=	SHLIBVER="${SHLIBVER}"
+CONFIGURE_ARGS=	--disable-perl \
 		--with-html-dir=${DOCSDIR} \
 		--disable-gtk-doc \
-		--without-print \
-		--disable-python \
-		--with-desktop-dir=${PREFIX}/share
+		--enable-static \
+		--mandir=${PREFIX}/man
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
-		GIMP_THREAD_LIBS=${PTHREAD_LIBS}
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+
+GIMP_DISTFILE=	${DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+
+MAN1=	gimp.1 gimp-2.2.1 gimp-remote.1 gimp-remote-2.2.1 gimptool-2.0.1
+MAN5=	gimprc.5 gimprc-2.2.5
 
-.if !defined(GIMP_SLAVE)
 OPTIONS=	DEBUG "debugging" off \
-		MP "multiple processor support" off \
-		RSVG "SVG format support" on
-.endif
+		PYTHON "Python-Fu support" off \
+		RSVG "SVG format support" on \
+		HTML_HELP_BROWSER "GIMP help browser" on \
+		MP "multiple processor support" off
 
 .include <bsd.port.pre.mk>
 
-.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
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug
+.endif
 
+.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
-
-CONFLICTS=	gimp-1.*
-
-MAN1+=	gimp-2.3.1 gimp-remote-2.3.1 gimptool-2.0.1
-MAN5+=	gimprc-2.3.5
+CONFIGURE_ARGS+=	--disable-python
+PLIST_SUB+=		PYTHON:="@comment "
+.endif
 
 .if defined(WITHOUT_RSVG)
 CONFIGURE_ARGS+=	--without-librsvg
@@ -86,41 +89,42 @@ USE_GNOME+=		librsvg2
 PLIST_SUB+=		SVG=""
 .endif
 
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug
+.if defined(WITHOUT_PRINT)
+CONFIGURE_ARGS+=	--disable-print
+PLIST_SUB+=		PRINT="@comment "
+.else
+LIB_DEPENDS+=		gimpprint.2:${PORTSDIR}/print/gimp-print
+PLIST_SUB+=		PRINT=""
 .endif
 
 .if defined(WITH_MP)
 CONFIGURE_ARGS+=	--enable-mp
-.else
-CONFIGURE_ARGS+=	--disable-mp
 .endif
 
-.if ${HAVE_GNOME:Mgnomehier}!="" || defined(WITH_GNOME)
-USE_GNOME+=		desktopfileutils gnomehier
-PLIST_SUB+=		GNOME=""
+.if ${HAVE_GNOME:Mgnomepanel}!=""
+USE_GNOME+=		gnomepanel desktopfileutils
+CONFIGURE_ARGS+=	--with-desktop-dir=${LOCALBASE}/share/gnome
+CONFIGURE_ENV+=		GIMP_THREAD_LIBS=${PTHREAD_LIBS}
+PKGNAMESUFFIX:=		-gnome
+PLIST_SUB+=		GNOMEPANEL:=""
+GNOME_ENABLED=		yes
 .else
-PLIST_SUB+=		GNOME="@comment "
-.endif
-
+PLIST_SUB+=		GNOMEPANEL:="@comment "
+CONFIGURE_ENV+=		GIMP_THREAD_LIBS=${PTHREAD_LIBS}
 .endif
 
+.if defined(WITH_HTML_HELP_BROWSER)
+USE_GNOME+=		libgtkhtml
+PLIST_SUB+=		HELPBROWSER:=""
+.else
+PLIST_SUB+=		HELPBROWSER:="@comment "
 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
-	@${REINPLACE_CMD} -e 's|@mandir@|${PREFIX}/man|' \
-		${WRKSRC}/docs/Makefile.in
+	@${REINPLACE_CMD} -e 's|\(have_gtkhtml2=\)yes|\1no|' ${WRKSRC}/configure
+.endif
 
+.if defined(GNOME_ENABLED)
 post-install:
-.if ${HAVE_GNOME:Mgnomehier}!="" || defined(WITH_GNOME)
-	${MKDIR} ${PREFIX}/share/gnome/mime-info ${PREFIX}/share/gnome/application-registry
-	${INSTALL_DATA} ${WRKSRC}/desktop/gimp.applications ${PREFIX}/share/gnome/application-registry
-	${INSTALL_DATA} ${WRKSRC}/desktop/gimp.keys ${PREFIX}/share/gnome/mime-info
-.endif
 	@-update-desktop-database
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index 43625e507..b3e8ef4f1 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-2.3.13.tar.bz2) = b150a726e1380ee0a6af342a9c0ebe80
-SHA256 (gimp-2.3.13.tar.bz2) = 6cc35431735c9303721c0a99f63dc685be60e82c197800880cbbf861c5c498ae
-SIZE (gimp-2.3.13.tar.bz2) = 15855459
+MD5 (gimp-2.2.13.tar.bz2) = d84a4a476a0c4fae24602db67f6fe49a
+SHA256 (gimp-2.2.13.tar.bz2) = d0273a3133461f5531bfa17ee24419abfe1f21121b03ef99195a2371a79b2ed7
+SIZE (gimp-2.2.13.tar.bz2) = 12930670
diff --git a/graphics/gimp-app/files/patch-aa b/graphics/gimp-app/files/patch-aa
new file mode 100644
index 000000000..411ac92c9
--- /dev/null
+++ b/graphics/gimp-app/files/patch-aa
@@ -0,0 +1,20 @@
+--- 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-libgimp_gimp.c b/graphics/gimp-app/files/patch-am
index a1bb86bbf..45c58cbe5 100644
--- a/graphics/gimp-app/files/patch-libgimp_gimp.c
+++ b/graphics/gimp-app/files/patch-am
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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 @@
  #include <stdlib.h>
  #include <string.h>
  #include <sys/types.h>
@@ -8,13 +8,12 @@
  
  #ifdef HAVE_SYS_TIME_H
  #include <sys/time.h>
-@@ -291,6 +292,9 @@
-   gimp_env_init (TRUE);
+@@ -211,6 +212,9 @@
+     }
  
    progname = argv[0];
 +
 +  /* Ignore floating point exceptions */
 +  fpsetmask(0);
  
-   basename = g_path_get_basename (progname);
- 
+   g_set_prgname (g_basename (progname));
diff --git a/graphics/gimp-app/files/patch-configure b/graphics/gimp-app/files/patch-configure
index 157f146ba..da42f67f8 100644
--- a/graphics/gimp-app/files/patch-configure
+++ b/graphics/gimp-app/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Nov 23 15:16:53 2006
-+++ configure	Sun Dec 31 19:29:32 2006
-@@ -29404,6 +29404,7 @@
+--- configure.orig	Sun Mar  6 15:30:12 2005
++++ configure	Sun Mar  6 15:33:57 2005
+@@ -25925,6 +25925,7 @@
      if test "x$enable_gtktest" = "xyes" ; then
        ac_save_CFLAGS="$CFLAGS"
        ac_save_LIBS="$LIBS"
@@ -8,18 +8,9 @@
        CFLAGS="$CFLAGS $GTK_CFLAGS"
        LIBS="$GTK_LIBS $LIBS"
        rm -f conf.gtktest
-@@ -35211,7 +35212,7 @@
-   fi
-   { echo "$as_me:$LINENO: result: $have_exif_0_6" >&5
- echo "${ECHO_T}$have_exif_0_6" >&6; }
--  if test x$have_exif_0_6 == xyes; then
-+  if test x$have_exif_0_6 = xyes; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_EXIF_0_6 1
-@@ -38514,9 +38515,9 @@
+@@ -33865,9 +33866,9 @@
  fi
- 
+ fi;
  
 -gimpdatadir="$datadir/$PACKAGE/2.0"
 -gimpplugindir="$libdir/$PACKAGE/2.0"
@@ -28,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
deleted file mode 100644
index 62da49282..000000000
--- a/graphics/gimp-app/files/patch-desktop_Makefile.in
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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-plug-ins.c b/graphics/gimp-app/files/patch-plug-ins.c
new file mode 100644
index 000000000..f7650f0e0
--- /dev/null
+++ b/graphics/gimp-app/files/patch-plug-ins.c
@@ -0,0 +1,19 @@
+--- app/plug-in/plug-ins.c.orig	Wed Nov 17 15:51:50 2004
++++ app/plug-in/plug-ins.c	Sun Oct 22 18:58:36 2006
+@@ -317,6 +317,8 @@
+ 
+   if (! gimp->no_interface)
+     {
++      gimp_menus_init (gimp, gimp->plug_in_defs, STD_PLUGINS_DOMAIN);
++
+       gimp->load_procs = g_slist_sort_with_data (gimp->load_procs,
+                                                  plug_ins_file_proc_compare,
+                                                  gimp);
+@@ -324,7 +326,6 @@
+                                                  plug_ins_file_proc_compare,
+                                                  gimp);
+ 
+-      gimp_menus_init (gimp, gimp->plug_in_defs, STD_PLUGINS_DOMAIN);
+     }
+ 
+   /* build list of automatically started extensions */
diff --git a/graphics/gimp-app/files/patch-plug-ins_common_url.c b/graphics/gimp-app/files/patch-plug-ins_common_url.c
new file mode 100644
index 000000000..bceff6df1
--- /dev/null
+++ b/graphics/gimp-app/files/patch-plug-ins_common_url.c
@@ -0,0 +1,17 @@
+--- 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
new file mode 100644
index 000000000..36f4bf714
--- /dev/null
+++ b/graphics/gimp-app/files/patch-plug-ins_print_print.c
@@ -0,0 +1,11 @@
+--- 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
deleted file mode 100644
index efc3a8b31..000000000
--- a/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in
+++ /dev/null
@@ -1,97 +0,0 @@
---- 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 408f42f13..6946abf9f 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -1,11 +1,11 @@
-bin/gimp-2.3
-bin/gimp-console-2.3
-bin/gimp-remote-2.3
+bin/gimp
+bin/gimp-2.2
+bin/gimp-remote
+bin/gimp-remote-2.2
 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,8 +19,6 @@ 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
@@ -30,6 +28,7 @@ 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
@@ -41,8 +40,6 @@ 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
@@ -50,14 +47,11 @@ 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
@@ -71,7 +65,6 @@ 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
@@ -80,21 +73,17 @@ 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
@@ -106,21 +95,16 @@ 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
@@ -131,22 +115,8 @@ include/gimp-2.0/libgimpcolor/gimpcmyk.h
 include/gimp-2.0/libgimpcolor/gimpcolor.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
@@ -161,7 +131,6 @@ 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
@@ -179,79 +148,29 @@ 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/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/gimpresolutionentry.h
 include/gimp-2.0/libgimpwidgets/gimpscrolledpreview.h
 include/gimp-2.0/libgimpwidgets/gimpsizeentry.h
 include/gimp-2.0/libgimpwidgets/gimpstock.h
 include/gimp-2.0/libgimpwidgets/gimpunitmenu.h
 include/gimp-2.0/libgimpwidgets/gimpwidgets.h
-include/gimp-2.0/libgimpwidgets/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
-@comment this is a simlink to gimp-2.3.1, so put it here because it gives me trouble with MAN1.
-man/man1/gimp-console-2.3.1
-libexec/gimp/2.2/interpreters/default.interp
+%%PYTHON:%%libexec/gimp/2.2/environ/pygimp.env
+%%PYTHON:%%libexec/gimp/2.2/python/pygimp-logo.png
 libexec/gimp/2.2/modules/libcdisplay_colorblind.a
 libexec/gimp/2.2/modules/libcdisplay_colorblind.la
 libexec/gimp/2.2/modules/libcdisplay_colorblind.so
@@ -261,9 +180,6 @@ 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
@@ -289,7 +205,6 @@ 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
@@ -303,9 +218,10 @@ 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
-libexec/gimp/2.2/plug-ins/colormap-remap
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/colorxhtml.py
 libexec/gimp/2.2/plug-ins/colortoalpha
 libexec/gimp/2.2/plug-ins/compose
 libexec/gimp/2.2/plug-ins/compressor
@@ -316,7 +232,6 @@ 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
@@ -332,6 +247,7 @@ 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
@@ -344,17 +260,19 @@ libexec/gimp/2.2/plug-ins/gfli
 libexec/gimp/2.2/plug-ins/gif
 libexec/gimp/2.2/plug-ins/gifload
 libexec/gimp/2.2/plug-ins/gih
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/gimpcons.py
 libexec/gimp/2.2/plug-ins/gimpressionist
 libexec/gimp/2.2/plug-ins/glasstile
 libexec/gimp/2.2/plug-ins/glob
 libexec/gimp/2.2/plug-ins/gqbist
 libexec/gimp/2.2/plug-ins/gradmap
 libexec/gimp/2.2/plug-ins/grid
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/gtkcons.py
 libexec/gimp/2.2/plug-ins/gtm
 libexec/gimp/2.2/plug-ins/guillotine
 libexec/gimp/2.2/plug-ins/header
 libexec/gimp/2.2/plug-ins/help
-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
@@ -363,15 +281,12 @@ 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
@@ -385,6 +300,7 @@ 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
@@ -393,22 +309,24 @@ 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
+%%PRINT%%libexec/gimp/2.2/plug-ins/print
 libexec/gimp/2.2/plug-ins/procedure-browser
 libexec/gimp/2.2/plug-ins/psd
 libexec/gimp/2.2/plug-ins/psd_save
 libexec/gimp/2.2/plug-ins/psp
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/py-slice.py
 libexec/gimp/2.2/plug-ins/randomize
 libexec/gimp/2.2/plug-ins/raw
 libexec/gimp/2.2/plug-ins/rcm
-libexec/gimp/2.2/plug-ins/redeye
 libexec/gimp/2.2/plug-ins/retinex
 libexec/gimp/2.2/plug-ins/ripple
 libexec/gimp/2.2/plug-ins/rotate
 libexec/gimp/2.2/plug-ins/sample_colorize
 libexec/gimp/2.2/plug-ins/scatter_hsv
 libexec/gimp/2.2/plug-ins/screenshot
+libexec/gimp/2.2/plug-ins/script-fu
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/shadow_bevel.py
 libexec/gimp/2.2/plug-ins/sel2path
 libexec/gimp/2.2/plug-ins/sel_gauss
 libexec/gimp/2.2/plug-ins/semiflatten
@@ -425,7 +343,7 @@ libexec/gimp/2.2/plug-ins/spheredesigner
 libexec/gimp/2.2/plug-ins/spread
 libexec/gimp/2.2/plug-ins/struc
 libexec/gimp/2.2/plug-ins/sunras
-libexec/gimp/2.2/plug-ins/svg
+%%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
@@ -434,13 +352,14 @@ 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/uri
+libexec/gimp/2.2/plug-ins/url
 libexec/gimp/2.2/plug-ins/video
 libexec/gimp/2.2/plug-ins/vinvert
 libexec/gimp/2.2/plug-ins/vpropagate
 libexec/gimp/2.2/plug-ins/warp
 libexec/gimp/2.2/plug-ins/waves
 libexec/gimp/2.2/plug-ins/webbrowser
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/whirlpinch.py
 libexec/gimp/2.2/plug-ins/whirlpinch
 libexec/gimp/2.2/plug-ins/wind
 libexec/gimp/2.2/plug-ins/winicon
@@ -450,26 +369,67 @@ libexec/gimp/2.2/plug-ins/xjt
 libexec/gimp/2.2/plug-ins/xpm
 libexec/gimp/2.2/plug-ins/xwd
 libexec/gimp/2.2/plug-ins/zealouscrop
+%%PYTHON:%%libexec/gimp/2.2/python/gimpenums.py
+%%PYTHON:%%libexec/gimp/2.2/python/gimpenums.pyc
+%%PYTHON:%%libexec/gimp/2.2/python/gimpenums.pyo
+%%PYTHON:%%libexec/gimp/2.2/python/gimpfu.py
+%%PYTHON:%%libexec/gimp/2.2/python/gimpfu.pyc
+%%PYTHON:%%libexec/gimp/2.2/python/gimpfu.pyo
+%%PYTHON:%%libexec/gimp/2.2/python/gimpmodule.so
+%%PYTHON:%%libexec/gimp/2.2/python/gimpplugin.py
+%%PYTHON:%%libexec/gimp/2.2/python/gimpplugin.pyc
+%%PYTHON:%%libexec/gimp/2.2/python/gimpplugin.pyo
+%%PYTHON:%%libexec/gimp/2.2/python/gimpprocbrowsermodule.so
+%%PYTHON:%%libexec/gimp/2.2/python/gimpshelf.py
+%%PYTHON:%%libexec/gimp/2.2/python/gimpshelf.pyc
+%%PYTHON:%%libexec/gimp/2.2/python/gimpshelf.pyo
+%%PYTHON:%%libexec/gimp/2.2/python/gimpui.py
+%%PYTHON:%%libexec/gimp/2.2/python/gimpui.pyc
+%%PYTHON:%%libexec/gimp/2.2/python/gimpui.pyo
+lib/libgimp-2.0.a
+lib/libgimp-2.0.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
 %%DOCSDIR%%/libgimp/GimpAspectPreview.html
-%%DOCSDIR%%/libgimp/GimpBrushSelectButton.html
 %%DOCSDIR%%/libgimp/GimpDrawablePreview.html
-%%DOCSDIR%%/libgimp/GimpFontSelectButton.html
-%%DOCSDIR%%/libgimp/GimpGradientSelectButton.html
-%%DOCSDIR%%/libgimp/GimpImageComboBox.html
-%%DOCSDIR%%/libgimp/GimpPaletteSelectButton.html
-%%DOCSDIR%%/libgimp/GimpPatternSelectButton.html
-%%DOCSDIR%%/libgimp/GimpProcBrowserDialog.html
 %%DOCSDIR%%/libgimp/GimpProgressBar.html
-%%DOCSDIR%%/libgimp/GimpSelectButton.html
-%%DOCSDIR%%/libgimp/GimpZoomPreview.html
 %%DOCSDIR%%/libgimp/gimpdefinitions.html
 %%DOCSDIR%%/libgimp/home.png
 %%DOCSDIR%%/libgimp/index.html
 %%DOCSDIR%%/libgimp/index.sgml
 %%DOCSDIR%%/libgimp/left.png
-%%DOCSDIR%%/libgimp/libgimp-GimpItemComboBox.html
 %%DOCSDIR%%/libgimp/libgimp-data.html
 %%DOCSDIR%%/libgimp/libgimp-general.html
 %%DOCSDIR%%/libgimp/libgimp-gimp.html
@@ -477,13 +437,13 @@ share/applications/gimp.desktop
 %%DOCSDIR%%/libgimp/libgimp-gimpbrushes.html
 %%DOCSDIR%%/libgimp/libgimp-gimpbrushmenu.html
 %%DOCSDIR%%/libgimp/libgimp-gimpbrushselect.html
-%%DOCSDIR%%/libgimp/libgimp-gimpbuffer.html
 %%DOCSDIR%%/libgimp/libgimp-gimpchannel.html
 %%DOCSDIR%%/libgimp/libgimp-gimpcolor.html
 %%DOCSDIR%%/libgimp/libgimp-gimpcontext.html
 %%DOCSDIR%%/libgimp/libgimp-gimpconvert.html
 %%DOCSDIR%%/libgimp/libgimp-gimpdisplay.html
 %%DOCSDIR%%/libgimp/libgimp-gimpdrawable.html
+%%DOCSDIR%%/libgimp/libgimp-gimpdrawablecombobox.html
 %%DOCSDIR%%/libgimp/libgimp-gimpdrawabletransform.html
 %%DOCSDIR%%/libgimp/libgimp-gimpedit.html
 %%DOCSDIR%%/libgimp/libgimp-gimpenums.html
@@ -498,10 +458,10 @@ share/applications/gimp.desktop
 %%DOCSDIR%%/libgimp/libgimp-gimpgradientmenu.html
 %%DOCSDIR%%/libgimp/libgimp-gimpgradients.html
 %%DOCSDIR%%/libgimp/libgimp-gimpgradientselect.html
-%%DOCSDIR%%/libgimp/libgimp-gimpgrid.html
 %%DOCSDIR%%/libgimp/libgimp-gimpguides.html
 %%DOCSDIR%%/libgimp/libgimp-gimphelp.html
 %%DOCSDIR%%/libgimp/libgimp-gimpimage.html
+%%DOCSDIR%%/libgimp/libgimp-gimpimagecombobox.html
 %%DOCSDIR%%/libgimp/libgimp-gimplayer.html
 %%DOCSDIR%%/libgimp/libgimp-gimpmenu.html
 %%DOCSDIR%%/libgimp/libgimp-gimpmessage.html
@@ -519,7 +479,6 @@ share/applications/gimp.desktop
 %%DOCSDIR%%/libgimp/libgimp-gimppixelrgn.html
 %%DOCSDIR%%/libgimp/libgimp-gimpplugin.html
 %%DOCSDIR%%/libgimp/libgimp-gimpproceduraldb.html
-%%DOCSDIR%%/libgimp/libgimp-gimpprocview.html
 %%DOCSDIR%%/libgimp/libgimp-gimpprogress.html
 %%DOCSDIR%%/libgimp/libgimp-gimpregioniterator.html
 %%DOCSDIR%%/libgimp/libgimp-gimpselection.html
@@ -528,12 +487,7 @@ share/applications/gimp.desktop
 %%DOCSDIR%%/libgimp/libgimp-gimptools.html
 %%DOCSDIR%%/libgimp/libgimp-gimpui.html
 %%DOCSDIR%%/libgimp/libgimp-gimpundo.html
-%%DOCSDIR%%/libgimp/libgimp-gimpvectors.html
 %%DOCSDIR%%/libgimp/libgimp-image.html
-%%DOCSDIR%%/libgimp/libgimp-index-deprecated.html
-%%DOCSDIR%%/libgimp/libgimp-index-new-in-2-2.html
-%%DOCSDIR%%/libgimp/libgimp-index-new-in-2-4.html
-%%DOCSDIR%%/libgimp/libgimp-index.html
 %%DOCSDIR%%/libgimp/libgimp-selectors.html
 %%DOCSDIR%%/libgimp/libgimp.devhelp
 %%DOCSDIR%%/libgimp/libgimp.devhelp2
@@ -550,23 +504,18 @@ share/applications/gimp.desktop
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimpbaseenums.html
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimpbasetypes.html
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimpchecks.html
-%%DOCSDIR%%/libgimpbase/libgimpbase-gimpcpuaccel.html
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimpdatafiles.html
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimpenv.html
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimplimits.html
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimpmemsize.html
-%%DOCSDIR%%/libgimpbase/libgimpbase-gimpparam.html
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimpparasite.html
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimpparasiteio.html
-%%DOCSDIR%%/libgimpbase/libgimpbase-gimprectangle.html
+%%DOCSDIR%%/libgimpbase/libgimpbase-gimpprotocol.html
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimpsignal.html
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimpunit.html
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimputils.html
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimpversion.html
-%%DOCSDIR%%/libgimpbase/libgimpbase-index-deprecated.html
-%%DOCSDIR%%/libgimpbase/libgimpbase-index-new-in-2-2.html
-%%DOCSDIR%%/libgimpbase/libgimpbase-index-new-in-2-4.html
-%%DOCSDIR%%/libgimpbase/libgimpbase-index.html
+%%DOCSDIR%%/libgimpbase/libgimpbase-gimpwire.html
 %%DOCSDIR%%/libgimpbase/libgimpbase.devhelp
 %%DOCSDIR%%/libgimpbase/libgimpbase.devhelp2
 %%DOCSDIR%%/libgimpbase/libgimpbase.html
@@ -577,63 +526,29 @@ share/applications/gimp.desktop
 %%DOCSDIR%%/libgimpcolor/index.html
 %%DOCSDIR%%/libgimpcolor/index.sgml
 %%DOCSDIR%%/libgimpcolor/left.png
+%%DOCSDIR%%/libgimpcolor/style.css
 %%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpAdaptiveSupersample.html
 %%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpBilinear.html
 %%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpCMYK.html
 %%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpColorSpace.html
 %%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpHSV.html
 %%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpRGB.html
-%%DOCSDIR%%/libgimpcolor/libgimpcolor-index-deprecated.html
-%%DOCSDIR%%/libgimpcolor/libgimpcolor-index-new-in-2-2.html
-%%DOCSDIR%%/libgimpcolor/libgimpcolor-index-new-in-2-4.html
-%%DOCSDIR%%/libgimpcolor/libgimpcolor-index.html
 %%DOCSDIR%%/libgimpcolor/libgimpcolor.devhelp
-%%DOCSDIR%%/libgimpcolor/libgimpcolor.devhelp2
 %%DOCSDIR%%/libgimpcolor/libgimpcolor.html
 %%DOCSDIR%%/libgimpcolor/right.png
-%%DOCSDIR%%/libgimpcolor/style.css
 %%DOCSDIR%%/libgimpcolor/up.png
-%%DOCSDIR%%/libgimpconfig/GimpColorConfig.html
-%%DOCSDIR%%/libgimpconfig/home.png
-%%DOCSDIR%%/libgimpconfig/index.html
-%%DOCSDIR%%/libgimpconfig/index.sgml
-%%DOCSDIR%%/libgimpconfig/left.png
-%%DOCSDIR%%/libgimpconfig/libgimpconfig-GimpConfig.html
-%%DOCSDIR%%/libgimpconfig/libgimpconfig-GimpConfigError.html
-%%DOCSDIR%%/libgimpconfig/libgimpconfig-GimpConfigWriter.html
-%%DOCSDIR%%/libgimpconfig/libgimpconfig-GimpScanner.html
-%%DOCSDIR%%/libgimpconfig/libgimpconfig-gimpconfig-deserialize.html
-%%DOCSDIR%%/libgimpconfig/libgimpconfig-gimpconfig-params.html
-%%DOCSDIR%%/libgimpconfig/libgimpconfig-gimpconfig-path.html
-%%DOCSDIR%%/libgimpconfig/libgimpconfig-gimpconfig-serialize.html
-%%DOCSDIR%%/libgimpconfig/libgimpconfig-gimpconfig-utils.html
-%%DOCSDIR%%/libgimpconfig/libgimpconfig-hierarchy.html
-%%DOCSDIR%%/libgimpconfig/libgimpconfig-index-deprecated.html
-%%DOCSDIR%%/libgimpconfig/libgimpconfig-index-new-in-2-4.html
-%%DOCSDIR%%/libgimpconfig/libgimpconfig-index.html
-%%DOCSDIR%%/libgimpconfig/libgimpconfig.devhelp
-%%DOCSDIR%%/libgimpconfig/libgimpconfig.devhelp2
-%%DOCSDIR%%/libgimpconfig/libgimpconfig.html
-%%DOCSDIR%%/libgimpconfig/right.png
-%%DOCSDIR%%/libgimpconfig/style.css
-%%DOCSDIR%%/libgimpconfig/up.png
 %%DOCSDIR%%/libgimpmath/home.png
 %%DOCSDIR%%/libgimpmath/index.html
 %%DOCSDIR%%/libgimpmath/index.sgml
 %%DOCSDIR%%/libgimpmath/left.png
+%%DOCSDIR%%/libgimpmath/style.css
 %%DOCSDIR%%/libgimpmath/libgimpmath-GimpMD5.html
 %%DOCSDIR%%/libgimpmath/libgimpmath-GimpMath.html
 %%DOCSDIR%%/libgimpmath/libgimpmath-GimpMatrix.html
 %%DOCSDIR%%/libgimpmath/libgimpmath-GimpVector.html
-%%DOCSDIR%%/libgimpmath/libgimpmath-index-deprecated.html
-%%DOCSDIR%%/libgimpmath/libgimpmath-index-new-in-2-2.html
-%%DOCSDIR%%/libgimpmath/libgimpmath-index-new-in-2-4.html
-%%DOCSDIR%%/libgimpmath/libgimpmath-index.html
 %%DOCSDIR%%/libgimpmath/libgimpmath.devhelp
-%%DOCSDIR%%/libgimpmath/libgimpmath.devhelp2
 %%DOCSDIR%%/libgimpmath/libgimpmath.html
 %%DOCSDIR%%/libgimpmath/right.png
-%%DOCSDIR%%/libgimpmath/style.css
 %%DOCSDIR%%/libgimpmath/up.png
 %%DOCSDIR%%/libgimpmodule/GimpModule.html
 %%DOCSDIR%%/libgimpmodule/GimpModuleDB.html
@@ -641,15 +556,10 @@ share/applications/gimp.desktop
 %%DOCSDIR%%/libgimpmodule/index.html
 %%DOCSDIR%%/libgimpmodule/index.sgml
 %%DOCSDIR%%/libgimpmodule/left.png
-%%DOCSDIR%%/libgimpmodule/libgimpmodule-index-deprecated.html
-%%DOCSDIR%%/libgimpmodule/libgimpmodule-index-new-in-2-2.html
-%%DOCSDIR%%/libgimpmodule/libgimpmodule-index-new-in-2-4.html
-%%DOCSDIR%%/libgimpmodule/libgimpmodule-index.html
+%%DOCSDIR%%/libgimpmodule/style.css
 %%DOCSDIR%%/libgimpmodule/libgimpmodule.devhelp
-%%DOCSDIR%%/libgimpmodule/libgimpmodule.devhelp2
 %%DOCSDIR%%/libgimpmodule/libgimpmodule.html
 %%DOCSDIR%%/libgimpmodule/right.png
-%%DOCSDIR%%/libgimpmodule/style.css
 %%DOCSDIR%%/libgimpmodule/up.png
 %%DOCSDIR%%/libgimpthumb/GimpThumbnail.html
 %%DOCSDIR%%/libgimpthumb/home.png
@@ -659,17 +569,12 @@ share/applications/gimp.desktop
 %%DOCSDIR%%/libgimpthumb/libgimpthumb-gimpthumb-enums.html
 %%DOCSDIR%%/libgimpthumb/libgimpthumb-gimpthumb-error.html
 %%DOCSDIR%%/libgimpthumb/libgimpthumb-gimpthumb-utils.html
-%%DOCSDIR%%/libgimpthumb/libgimpthumb-index-deprecated.html
-%%DOCSDIR%%/libgimpthumb/libgimpthumb-index-new-in-2-2.html
-%%DOCSDIR%%/libgimpthumb/libgimpthumb-index-new-in-2-4.html
-%%DOCSDIR%%/libgimpthumb/libgimpthumb-index.html
 %%DOCSDIR%%/libgimpthumb/libgimpthumb.devhelp
 %%DOCSDIR%%/libgimpthumb/libgimpthumb.devhelp2
 %%DOCSDIR%%/libgimpthumb/libgimpthumb.html
 %%DOCSDIR%%/libgimpthumb/right.png
 %%DOCSDIR%%/libgimpthumb/style.css
 %%DOCSDIR%%/libgimpthumb/up.png
-%%DOCSDIR%%/libgimpwidgets/GimpBrowser.html
 %%DOCSDIR%%/libgimpwidgets/GimpButton.html
 %%DOCSDIR%%/libgimpwidgets/GimpCellRendererColor.html
 %%DOCSDIR%%/libgimpwidgets/GimpCellRendererToggle.html
@@ -687,55 +592,26 @@ share/applications/gimp.desktop
 %%DOCSDIR%%/libgimpwidgets/GimpColorSelector.html
 %%DOCSDIR%%/libgimpwidgets/GimpController.html
 %%DOCSDIR%%/libgimpwidgets/GimpDialog.html
-%%DOCSDIR%%/libgimpwidgets/GimpEnumComboBox.html
-%%DOCSDIR%%/libgimpwidgets/GimpEnumLabel.html
-%%DOCSDIR%%/libgimpwidgets/GimpEnumStore.html
 %%DOCSDIR%%/libgimpwidgets/GimpFileEntry.html
 %%DOCSDIR%%/libgimpwidgets/GimpFrame.html
 %%DOCSDIR%%/libgimpwidgets/GimpIntComboBox.html
 %%DOCSDIR%%/libgimpwidgets/GimpIntStore.html
 %%DOCSDIR%%/libgimpwidgets/GimpMemsizeEntry.html
 %%DOCSDIR%%/libgimpwidgets/GimpOffsetArea.html
-%%DOCSDIR%%/libgimpwidgets/GimpPageSelector.html
 %%DOCSDIR%%/libgimpwidgets/GimpPathEditor.html
 %%DOCSDIR%%/libgimpwidgets/GimpPickButton.html
 %%DOCSDIR%%/libgimpwidgets/GimpPixmap.html
 %%DOCSDIR%%/libgimpwidgets/GimpPreview.html
 %%DOCSDIR%%/libgimpwidgets/GimpPreviewArea.html
-%%DOCSDIR%%/libgimpwidgets/GimpScrolledPreview.html
 %%DOCSDIR%%/libgimpwidgets/GimpSizeEntry.html
 %%DOCSDIR%%/libgimpwidgets/GimpUnitMenu.html
-%%DOCSDIR%%/libgimpwidgets/gimp-browser.png
-%%DOCSDIR%%/libgimpwidgets/gimp-button.png
-%%DOCSDIR%%/libgimpwidgets/gimp-chain-button.png
-%%DOCSDIR%%/libgimpwidgets/gimp-color-area.png
-%%DOCSDIR%%/libgimpwidgets/gimp-color-button.png
-%%DOCSDIR%%/libgimpwidgets/gimp-color-hex-entry.png
-%%DOCSDIR%%/libgimpwidgets/gimp-color-scale.png
-%%DOCSDIR%%/libgimpwidgets/gimp-color-selection.png
-%%DOCSDIR%%/libgimpwidgets/gimp-dialog.png
-%%DOCSDIR%%/libgimpwidgets/gimp-enum-combo-box.png
-%%DOCSDIR%%/libgimpwidgets/gimp-enum-label.png
-%%DOCSDIR%%/libgimpwidgets/gimp-file-entry.png
-%%DOCSDIR%%/libgimpwidgets/gimp-frame.png
-%%DOCSDIR%%/libgimpwidgets/gimp-hint-box.png
-%%DOCSDIR%%/libgimpwidgets/gimp-int-combo-box.png
-%%DOCSDIR%%/libgimpwidgets/gimp-memsize-entry.png
-%%DOCSDIR%%/libgimpwidgets/gimp-offset-area.png
-%%DOCSDIR%%/libgimpwidgets/gimp-page-selector.png
-%%DOCSDIR%%/libgimpwidgets/gimp-path-editor.png
-%%DOCSDIR%%/libgimpwidgets/gimp-pick-button.png
-%%DOCSDIR%%/libgimpwidgets/gimp-preview-area.png
-%%DOCSDIR%%/libgimpwidgets/gimp-unit-menu.png
 %%DOCSDIR%%/libgimpwidgets/home.png
 %%DOCSDIR%%/libgimpwidgets/index.html
 %%DOCSDIR%%/libgimpwidgets/index.sgml
 %%DOCSDIR%%/libgimpwidgets/left.png
-%%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpEnumWidgets.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpHelpUI.html
-%%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpHintBox.html
-%%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpPropWidgets.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpQueryBox.html
+%%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpScrolledPreview.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpStock.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpWidgets.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-cell-renderers.html
@@ -743,13 +619,8 @@ share/applications/gimp.desktop
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-colorselector.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-controller.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-deprecated.html
-%%DOCSDIR%%/libgimpwidgets/libgimpwidgets-gallery.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-gimpoldwidgets.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-hierarchy.html
-%%DOCSDIR%%/libgimpwidgets/libgimpwidgets-index-deprecated.html
-%%DOCSDIR%%/libgimpwidgets/libgimpwidgets-index-new-in-2-2.html
-%%DOCSDIR%%/libgimpwidgets/libgimpwidgets-index-new-in-2-4.html
-%%DOCSDIR%%/libgimpwidgets/libgimpwidgets-index.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-utils.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-widgets.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets.devhelp
@@ -798,23 +669,9 @@ share/applications/gimp.desktop
 %%DOCSDIR%%/libgimpwidgets/stock-color-picker-gray-18.png
 %%DOCSDIR%%/libgimpwidgets/stock-color-picker-white-18.png
 %%DOCSDIR%%/libgimpwidgets/stock-color-triangle-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-colormap-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-colormap-24.png
-%%DOCSDIR%%/libgimpwidgets/stock-controller-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-controller-24.png
-%%DOCSDIR%%/libgimpwidgets/stock-controller-keyboard-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-controller-keyboard-24.png
-%%DOCSDIR%%/libgimpwidgets/stock-controller-linux-input-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-controller-linux-input-24.png
-%%DOCSDIR%%/libgimpwidgets/stock-controller-midi-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-controller-midi-24.png
-%%DOCSDIR%%/libgimpwidgets/stock-controller-wheel-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-controller-wheel-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-convert-grayscale-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-convert-indexed-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-convert-rgb-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-cursor-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-cursor-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-curve-free-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-curve-smooth-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-default-colors-12.png
@@ -822,16 +679,6 @@ share/applications/gimp.desktop
 %%DOCSDIR%%/libgimpwidgets/stock-device-status-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-display-filter-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-display-filter-24.png
-%%DOCSDIR%%/libgimpwidgets/stock-display-filter-colorblind-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-display-filter-colorblind-24.png
-%%DOCSDIR%%/libgimpwidgets/stock-display-filter-contrast-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-display-filter-contrast-24.png
-%%DOCSDIR%%/libgimpwidgets/stock-display-filter-gamma-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-display-filter-gamma-24.png
-%%DOCSDIR%%/libgimpwidgets/stock-display-filter-lcms-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-display-filter-lcms-24.png
-%%DOCSDIR%%/libgimpwidgets/stock-display-filter-proof-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-display-filter-proof-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-duplicate-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-edit-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-error-64.png
@@ -864,7 +711,6 @@ share/applications/gimp.desktop
 %%DOCSDIR%%/libgimpwidgets/stock-gravity-south-west-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-gravity-west-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-grid-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-hcenter-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-hchain-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-hchain-broken-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-histogram-16.png
@@ -877,6 +723,8 @@ share/applications/gimp.desktop
 %%DOCSDIR%%/libgimpwidgets/stock-image-48.png
 %%DOCSDIR%%/libgimpwidgets/stock-images-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-images-24.png
+%%DOCSDIR%%/libgimpwidgets/stock-indexed-palette-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-indexed-palette-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-info-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-info-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-info-64.png
@@ -885,7 +733,6 @@ share/applications/gimp.desktop
 %%DOCSDIR%%/libgimpwidgets/stock-join-miter-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-join-round-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-landscape-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-landscape-22.png
 %%DOCSDIR%%/libgimpwidgets/stock-layer-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-layer-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-layer-32.png
@@ -917,20 +764,17 @@ share/applications/gimp.desktop
 %%DOCSDIR%%/libgimpwidgets/stock-paths-22.png
 %%DOCSDIR%%/libgimpwidgets/stock-plugin-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-portrait-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-portrait-22.png
 %%DOCSDIR%%/libgimpwidgets/stock-print-resolution-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-print-resolution-24.png
+%%DOCSDIR%%/libgimpwidgets/stock-qmask-off-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-qmask-on-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-question-64.png
-%%DOCSDIR%%/libgimpwidgets/stock-quick-mask-off-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-quick-mask-on-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-reset-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-reshow-filter-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-resize-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-rotate-180-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-rotate-270-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-rotate-90-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-sample-point-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-sample-point-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-scale-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-selection-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-selection-add-16.png
@@ -962,8 +806,6 @@ share/applications/gimp.desktop
 %%DOCSDIR%%/libgimpwidgets/stock-toilet-paper-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-tool-airbrush-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-tool-airbrush-22.png
-%%DOCSDIR%%/libgimpwidgets/stock-tool-align-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-tool-align-22.png
 %%DOCSDIR%%/libgimpwidgets/stock-tool-blend-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-tool-blend-22.png
 %%DOCSDIR%%/libgimpwidgets/stock-tool-blur-16.png
@@ -994,14 +836,10 @@ share/applications/gimp.desktop
 %%DOCSDIR%%/libgimpwidgets/stock-tool-eraser-22.png
 %%DOCSDIR%%/libgimpwidgets/stock-tool-flip-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-tool-flip-22.png
-%%DOCSDIR%%/libgimpwidgets/stock-tool-foreground-select-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-tool-foreground-select-22.png
 %%DOCSDIR%%/libgimpwidgets/stock-tool-free-select-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-tool-free-select-22.png
 %%DOCSDIR%%/libgimpwidgets/stock-tool-fuzzy-select-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-tool-fuzzy-select-22.png
-%%DOCSDIR%%/libgimpwidgets/stock-tool-heal-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-tool-heal-22.png
 %%DOCSDIR%%/libgimpwidgets/stock-tool-hue-saturation-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-tool-hue-saturation-22.png
 %%DOCSDIR%%/libgimpwidgets/stock-tool-ink-16.png
@@ -1024,8 +862,6 @@ share/applications/gimp.desktop
 %%DOCSDIR%%/libgimpwidgets/stock-tool-pencil-22.png
 %%DOCSDIR%%/libgimpwidgets/stock-tool-perspective-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-tool-perspective-22.png
-%%DOCSDIR%%/libgimpwidgets/stock-tool-perspective-clone-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-tool-perspective-clone-22.png
 %%DOCSDIR%%/libgimpwidgets/stock-tool-posterize-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-tool-posterize-22.png
 %%DOCSDIR%%/libgimpwidgets/stock-tool-rect-select-16.png
@@ -1050,7 +886,6 @@ share/applications/gimp.desktop
 %%DOCSDIR%%/libgimpwidgets/stock-transparency-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-undo-history-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-undo-history-24.png
-%%DOCSDIR%%/libgimpwidgets/stock-vcenter-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-vchain-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-vchain-broken-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-video-16.png
@@ -1061,7 +896,7 @@ share/applications/gimp.desktop
 %%DOCSDIR%%/libgimpwidgets/stock-web-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-web-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-wilber-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-wilber-22.png
+%%DOCSDIR%%/libgimpwidgets/stock-wilber-32.png
 %%DOCSDIR%%/libgimpwidgets/stock-wilber-48.png
 %%DOCSDIR%%/libgimpwidgets/stock-wilber-64.png
 %%DOCSDIR%%/libgimpwidgets/stock-wilber-eek-64.png
@@ -1116,6 +951,7 @@ share/applications/gimp.desktop
 %%DATADIR%%/brushes/thegimp.gbr
 %%DATADIR%%/brushes/vine.gih
 %%DATADIR%%/brushes/xcf.gbr
+@exec mkdir -p %D/%%DATADIR%%/fonts
 %%DATADIR%%/fractalexplorer/Asteroid_Field
 %%DATADIR%%/fractalexplorer/Bar_Code_Label
 %%DATADIR%%/fractalexplorer/Beauty_of_Nature
@@ -1338,14 +1174,16 @@ share/applications/gimp.desktop
 %%DATADIR%%/gradients/Wood_2.ggr
 %%DATADIR%%/gradients/Yellow_Contrast.ggr
 %%DATADIR%%/gradients/Yellow_Orange.ggr
-%%DATADIR%%/images/gimp-logo.png
 %%DATADIR%%/images/gimp-splash.png
-%%DATADIR%%/menus/brush-editor-menu.xml
+%%DATADIR%%/images/gimp-logo.png
+%%DATADIR%%/images/wilber-devel-icon.png
+%%DATADIR%%/images/wilber-icon.png
+%%DATADIR%%/images/wilber-tips.png
+%%DATADIR%%/images/wilber-wizard.png
 %%DATADIR%%/menus/brushes-menu.xml
 %%DATADIR%%/menus/buffers-menu.xml
 %%DATADIR%%/menus/channels-menu.xml
-%%DATADIR%%/menus/colormap-menu.xml
-%%DATADIR%%/menus/cursor-info-menu.xml
+%%DATADIR%%/menus/colormap-editor-menu.xml
 %%DATADIR%%/menus/dockable-menu.xml
 %%DATADIR%%/menus/documents-menu.xml
 %%DATADIR%%/menus/error-console-menu.xml
@@ -1358,16 +1196,21 @@ share/applications/gimp.desktop
 %%DATADIR%%/menus/palette-editor-menu.xml
 %%DATADIR%%/menus/palettes-menu.xml
 %%DATADIR%%/menus/patterns-menu.xml
-%%DATADIR%%/menus/quick-mask-menu.xml
-%%DATADIR%%/menus/sample-points-menu.xml
-%%DATADIR%%/menus/selection-menu.xml
+%%DATADIR%%/menus/qmask-menu.xml
+%%DATADIR%%/menus/selection-editor-menu.xml
 %%DATADIR%%/menus/templates-menu.xml
 %%DATADIR%%/menus/text-editor-toolbar.xml
 %%DATADIR%%/menus/tool-options-menu.xml
 %%DATADIR%%/menus/toolbox-menu.xml
 %%DATADIR%%/menus/tools-menu.xml
-%%DATADIR%%/menus/undo-menu.xml
 %%DATADIR%%/menus/vectors-menu.xml
+%%DATADIR%%/misc/gimp.applications
+%%DATADIR%%/misc/gimp.desktop
+%%DATADIR%%/misc/gimp.keys
+%%GNOMEPANEL:%%share/gnome/application-registry/gimp-2.2.applications
+%%GNOMEPANEL:%%share/gnome/applications/gimp-2.2.desktop
+%%GNOMEPANEL:%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+%%GNOMEPANEL:%%share/gnome/mime-info/gimp-2.2.keys
 %%DATADIR%%/palettes/Bears.gpl
 %%DATADIR%%/palettes/Bgold.gpl
 %%DATADIR%%/palettes/Blues.gpl
@@ -1401,7 +1244,6 @@ share/applications/gimp.desktop
 %%DATADIR%%/palettes/Reds.gpl
 %%DATADIR%%/palettes/Reds_And_Purples.gpl
 %%DATADIR%%/palettes/Royal.gpl
-%%DATADIR%%/palettes/Tango.gpl
 %%DATADIR%%/palettes/Topographic.gpl
 %%DATADIR%%/palettes/Visibone.gpl
 %%DATADIR%%/palettes/Visibone_2.gpl
@@ -1466,379 +1308,585 @@ share/applications/gimp.desktop
 %%DATADIR%%/patterns/wood3.pat
 %%DATADIR%%/patterns/wood4.pat
 %%DATADIR%%/patterns/wood5.pat
+%%DATADIR%%/scripts/3d-outline.scm
+%%DATADIR%%/scripts/3dTruchet.scm
+%%DATADIR%%/scripts/add-bevel.scm
+%%DATADIR%%/scripts/addborder.scm
+%%DATADIR%%/scripts/alien-glow-arrow.scm
+%%DATADIR%%/scripts/alien-glow-bar.scm
+%%DATADIR%%/scripts/alien-glow-bullet.scm
+%%DATADIR%%/scripts/alien-glow-button.scm
+%%DATADIR%%/scripts/alien-glow-logo.scm
+%%DATADIR%%/scripts/alien-neon-logo.scm
+%%DATADIR%%/scripts/basic1-logo.scm
+%%DATADIR%%/scripts/basic2-logo.scm
+%%DATADIR%%/scripts/beveled-button.scm
+%%DATADIR%%/scripts/beveled-pattern-arrow.scm
+%%DATADIR%%/scripts/beveled-pattern-bullet.scm
+%%DATADIR%%/scripts/beveled-pattern-button.scm
+%%DATADIR%%/scripts/beveled-pattern-heading.scm
+%%DATADIR%%/scripts/beveled-pattern-hrule.scm
+%%DATADIR%%/scripts/blend-anim.scm
+%%DATADIR%%/scripts/blended-logo.scm
+%%DATADIR%%/scripts/bovinated-logo.scm
+%%DATADIR%%/scripts/burn-in-anim.scm
+%%DATADIR%%/scripts/camo.scm
+%%DATADIR%%/scripts/carve-it.scm
+%%DATADIR%%/scripts/carved-logo.scm
+%%DATADIR%%/scripts/chalk.scm
+%%DATADIR%%/scripts/chip-away.scm
+%%DATADIR%%/scripts/chrome-it.scm
+%%DATADIR%%/scripts/chrome-logo.scm
+%%DATADIR%%/scripts/circuit.scm
+%%DATADIR%%/scripts/clothify.scm
+%%DATADIR%%/scripts/coffee.scm
+%%DATADIR%%/scripts/comic-logo.scm
+%%DATADIR%%/scripts/coolmetal-logo.scm
+%%DATADIR%%/scripts/copy-visible.scm
+%%DATADIR%%/scripts/crystal-logo.scm
+%%DATADIR%%/scripts/distress-selection.scm
+%%DATADIR%%/scripts/drop-shadow.scm
+%%DATADIR%%/scripts/erase-rows.scm
+%%DATADIR%%/scripts/fade-outline.scm
+%%DATADIR%%/scripts/flatland.scm
+%%DATADIR%%/scripts/font-map.scm
+%%DATADIR%%/scripts/frosty-logo.scm
+%%DATADIR%%/scripts/fuzzyborder.scm
+%%DATADIR%%/scripts/gimp-headers.scm
+%%DATADIR%%/scripts/gimp-labels.scm
+%%DATADIR%%/scripts/glossy.scm
+%%DATADIR%%/scripts/glowing-logo.scm
+%%DATADIR%%/scripts/gradient-bevel-logo.scm
+%%DATADIR%%/scripts/gradient-example.scm
+%%DATADIR%%/scripts/grid-system.scm
+%%DATADIR%%/scripts/guides-from-selection.scm
+%%DATADIR%%/scripts/guides-new-percent.scm
+%%DATADIR%%/scripts/guides-new.scm
+%%DATADIR%%/scripts/guides-remove-all.scm
+%%DATADIR%%/scripts/hsv-graph.scm
+%%DATADIR%%/scripts/i26-gunya2.scm
+%%DATADIR%%/scripts/image-structure.scm
+%%DATADIR%%/scripts/images/beavis.jpg
+%%DATADIR%%/scripts/images/texture.jpg
+%%DATADIR%%/scripts/images/texture1.jpg
+%%DATADIR%%/scripts/images/texture2.jpg
+%%DATADIR%%/scripts/images/texture3.jpg
+%%DATADIR%%/scripts/land.scm
+%%DATADIR%%/scripts/lava.scm
+%%DATADIR%%/scripts/line-nova.scm
+%%DATADIR%%/scripts/mkbrush.scm
+%%DATADIR%%/scripts/neon-logo.scm
+%%DATADIR%%/scripts/news-text.scm
+%%DATADIR%%/scripts/old-photo.scm
+%%DATADIR%%/scripts/perspective-shadow.scm
+%%DATADIR%%/scripts/predator.scm
+%%DATADIR%%/scripts/pupi-button.scm
+%%DATADIR%%/scripts/rendermap.scm
+%%DATADIR%%/scripts/ripply-anim.scm
+%%DATADIR%%/scripts/round-corners.scm
+%%DATADIR%%/scripts/script-fu-util.scm
+%%DATADIR%%/scripts/select-to-brush.scm
+%%DATADIR%%/scripts/select-to-image.scm
+%%DATADIR%%/scripts/select-to-pattern.scm
+%%DATADIR%%/scripts/selection-round.scm
+%%DATADIR%%/scripts/slide.scm
+%%DATADIR%%/scripts/sota-chrome-logo.scm
+%%DATADIR%%/scripts/speed-text.scm
+%%DATADIR%%/scripts/sphere.scm
+%%DATADIR%%/scripts/spinning-globe.scm
+%%DATADIR%%/scripts/spyrogimp.scm
+%%DATADIR%%/scripts/starburst-logo.scm
+%%DATADIR%%/scripts/starscape-logo.scm
+%%DATADIR%%/scripts/swirltile.scm
+%%DATADIR%%/scripts/swirly-pattern.scm
+%%DATADIR%%/scripts/t-o-p-logo.scm
+%%DATADIR%%/scripts/text-circle.scm
+%%DATADIR%%/scripts/textured-logo.scm
+%%DATADIR%%/scripts/tileblur.scm
+%%DATADIR%%/scripts/title-header.scm
+%%DATADIR%%/scripts/truchet.scm
+%%DATADIR%%/scripts/unsharp-mask.scm
+%%DATADIR%%/scripts/waves-anim.scm
+%%DATADIR%%/scripts/weave.scm
+%%DATADIR%%/scripts/web-browser.scm
+%%DATADIR%%/scripts/xach-effect.scm
 %%DATADIR%%/themes/Default/gtkrc
-%%DATADIR%%/themes/Default/images/preferences/color-management-22.png
-%%DATADIR%%/themes/Default/images/preferences/color-management.png
-%%DATADIR%%/themes/Default/images/preferences/controllers-22.png
+%%DATADIR%%/themes/Default/imagerc
 %%DATADIR%%/themes/Default/images/preferences/controllers.png
 %%DATADIR%%/themes/Default/images/preferences/default-comment.png
-%%DATADIR%%/themes/Default/images/preferences/default-grid-22.png
 %%DATADIR%%/themes/Default/images/preferences/default-grid.png
-%%DATADIR%%/themes/Default/images/preferences/display-22.png
 %%DATADIR%%/themes/Default/images/preferences/display.png
-%%DATADIR%%/themes/Default/images/preferences/environment-22.png
 %%DATADIR%%/themes/Default/images/preferences/environment.png
-%%DATADIR%%/themes/Default/images/preferences/folders-22.png
-%%DATADIR%%/themes/Default/images/preferences/folders-brushes-22.png
 %%DATADIR%%/themes/Default/images/preferences/folders-brushes.png
-%%DATADIR%%/themes/Default/images/preferences/folders-environ-22.png
 %%DATADIR%%/themes/Default/images/preferences/folders-environ.png
-%%DATADIR%%/themes/Default/images/preferences/folders-fonts-22.png
 %%DATADIR%%/themes/Default/images/preferences/folders-fonts.png
-%%DATADIR%%/themes/Default/images/preferences/folders-gradients-22.png
 %%DATADIR%%/themes/Default/images/preferences/folders-gradients.png
-%%DATADIR%%/themes/Default/images/preferences/folders-interp-22.png
-%%DATADIR%%/themes/Default/images/preferences/folders-interp.png
-%%DATADIR%%/themes/Default/images/preferences/folders-modules-22.png
 %%DATADIR%%/themes/Default/images/preferences/folders-modules.png
 %%DATADIR%%/themes/Default/images/preferences/folders-palettes.png
-%%DATADIR%%/themes/Default/images/preferences/folders-patterns-22.png
 %%DATADIR%%/themes/Default/images/preferences/folders-patterns.png
-%%DATADIR%%/themes/Default/images/preferences/folders-plug-ins-22.png
 %%DATADIR%%/themes/Default/images/preferences/folders-plug-ins.png
-%%DATADIR%%/themes/Default/images/preferences/folders-scripts-22.png
 %%DATADIR%%/themes/Default/images/preferences/folders-scripts.png
 %%DATADIR%%/themes/Default/images/preferences/folders-themes.png
-%%DATADIR%%/themes/Default/images/preferences/folders-tool-plug-ins-22.png
 %%DATADIR%%/themes/Default/images/preferences/folders-tool-plug-ins.png
-%%DATADIR%%/themes/Default/images/preferences/folders-tools-22.png
 %%DATADIR%%/themes/Default/images/preferences/folders.png
-%%DATADIR%%/themes/Default/images/preferences/help-system-22.png
 %%DATADIR%%/themes/Default/images/preferences/help-system.png
-%%DATADIR%%/themes/Default/images/preferences/image-title-22.png
 %%DATADIR%%/themes/Default/images/preferences/image-title.png
-%%DATADIR%%/themes/Default/images/preferences/image-windows-22.png
 %%DATADIR%%/themes/Default/images/preferences/image-windows.png
-%%DATADIR%%/themes/Default/images/preferences/input-devices-22.png
 %%DATADIR%%/themes/Default/images/preferences/input-devices.png
-%%DATADIR%%/themes/Default/images/preferences/interface-22.png
 %%DATADIR%%/themes/Default/images/preferences/interface.png
-%%DATADIR%%/themes/Default/images/preferences/new-image-22.png
+%%DATADIR%%/themes/Default/images/preferences/monitor.png
 %%DATADIR%%/themes/Default/images/preferences/new-image.png
-%%DATADIR%%/themes/Default/images/preferences/session-22.png
 %%DATADIR%%/themes/Default/images/preferences/session.png
-%%DATADIR%%/themes/Default/images/preferences/theme-22.png
 %%DATADIR%%/themes/Default/images/preferences/theme.png
-%%DATADIR%%/themes/Default/images/preferences/tool-options-22.png
 %%DATADIR%%/themes/Default/images/preferences/tool-options.png
-%%DATADIR%%/themes/Default/images/preferences/toolbox-22.png
 %%DATADIR%%/themes/Default/images/preferences/toolbox.png
-%%DATADIR%%/themes/Default/images/preferences/window-management-22.png
 %%DATADIR%%/themes/Default/images/preferences/window-management.png
+%%DATADIR%%/themes/Default/images/stock-anchor-16.png
+%%DATADIR%%/themes/Default/images/stock-cap-butt-16.png
+%%DATADIR%%/themes/Default/images/stock-cap-round-16.png
+%%DATADIR%%/themes/Default/images/stock-cap-square-16.png
+%%DATADIR%%/themes/Default/images/stock-center-16.png
+%%DATADIR%%/themes/Default/images/stock-center-24.png
+%%DATADIR%%/themes/Default/images/stock-channel-16.png
+%%DATADIR%%/themes/Default/images/stock-channel-24.png
+%%DATADIR%%/themes/Default/images/stock-channel-32.png
+%%DATADIR%%/themes/Default/images/stock-channel-48.png
+%%DATADIR%%/themes/Default/images/stock-channel-alpha-16.png
+%%DATADIR%%/themes/Default/images/stock-channel-alpha-24.png
+%%DATADIR%%/themes/Default/images/stock-channel-alpha-32.png
+%%DATADIR%%/themes/Default/images/stock-channel-alpha-48.png
+%%DATADIR%%/themes/Default/images/stock-channel-blue-16.png
+%%DATADIR%%/themes/Default/images/stock-channel-blue-24.png
+%%DATADIR%%/themes/Default/images/stock-channel-blue-32.png
+%%DATADIR%%/themes/Default/images/stock-channel-blue-48.png
+%%DATADIR%%/themes/Default/images/stock-channel-gray-16.png
+%%DATADIR%%/themes/Default/images/stock-channel-gray-24.png
+%%DATADIR%%/themes/Default/images/stock-channel-gray-32.png
+%%DATADIR%%/themes/Default/images/stock-channel-gray-48.png
+%%DATADIR%%/themes/Default/images/stock-channel-green-16.png
+%%DATADIR%%/themes/Default/images/stock-channel-green-24.png
+%%DATADIR%%/themes/Default/images/stock-channel-green-32.png
+%%DATADIR%%/themes/Default/images/stock-channel-green-48.png
+%%DATADIR%%/themes/Default/images/stock-channel-indexed-16.png
+%%DATADIR%%/themes/Default/images/stock-channel-indexed-24.png
+%%DATADIR%%/themes/Default/images/stock-channel-indexed-32.png
+%%DATADIR%%/themes/Default/images/stock-channel-indexed-48.png
+%%DATADIR%%/themes/Default/images/stock-channel-red-16.png
+%%DATADIR%%/themes/Default/images/stock-channel-red-24.png
+%%DATADIR%%/themes/Default/images/stock-channel-red-32.png
+%%DATADIR%%/themes/Default/images/stock-channel-red-48.png
+%%DATADIR%%/themes/Default/images/stock-channels-16.png
+%%DATADIR%%/themes/Default/images/stock-channels-24.png
+%%DATADIR%%/themes/Default/images/stock-char-picker-22.png
+%%DATADIR%%/themes/Default/images/stock-close-12.png
+%%DATADIR%%/themes/Default/images/stock-color-pick-from-screen-16.png
+%%DATADIR%%/themes/Default/images/stock-color-picker-black-18.png
+%%DATADIR%%/themes/Default/images/stock-color-picker-gray-18.png
+%%DATADIR%%/themes/Default/images/stock-color-picker-white-18.png
+%%DATADIR%%/themes/Default/images/stock-color-triangle-16.png
+%%DATADIR%%/themes/Default/images/stock-convert-grayscale-16.png
+%%DATADIR%%/themes/Default/images/stock-convert-indexed-16.png
+%%DATADIR%%/themes/Default/images/stock-convert-rgb-16.png
+%%DATADIR%%/themes/Default/images/stock-curve-free-16.png
+%%DATADIR%%/themes/Default/images/stock-curve-smooth-16.png
+%%DATADIR%%/themes/Default/images/stock-default-colors-12.png
+%%DATADIR%%/themes/Default/images/stock-device-status-16.png
+%%DATADIR%%/themes/Default/images/stock-device-status-24.png
+%%DATADIR%%/themes/Default/images/stock-display-filter-16.png
+%%DATADIR%%/themes/Default/images/stock-display-filter-24.png
+%%DATADIR%%/themes/Default/images/stock-duplicate-16.png
+%%DATADIR%%/themes/Default/images/stock-edit-16.png
 %%DATADIR%%/themes/Default/images/stock-error-64.png
+%%DATADIR%%/themes/Default/images/stock-eye-12.png
+%%DATADIR%%/themes/Default/images/stock-eye-20.png
+%%DATADIR%%/themes/Default/images/stock-flip-horizontal-16.png
+%%DATADIR%%/themes/Default/images/stock-flip-vertical-16.png
+%%DATADIR%%/themes/Default/images/stock-floating-selection-16.png
+%%DATADIR%%/themes/Default/images/stock-floating-selection-24.png
+%%DATADIR%%/themes/Default/images/stock-floating-selection-32.png
+%%DATADIR%%/themes/Default/images/stock-floating-selection-48.png
+%%DATADIR%%/themes/Default/images/stock-frame-64.png
+%%DATADIR%%/themes/Default/images/stock-gradient-bilinear-16.png
+%%DATADIR%%/themes/Default/images/stock-gradient-conical-asymmetric-16.png
+%%DATADIR%%/themes/Default/images/stock-gradient-conical-symmetric-16.png
+%%DATADIR%%/themes/Default/images/stock-gradient-linear-16.png
+%%DATADIR%%/themes/Default/images/stock-gradient-radial-16.png
+%%DATADIR%%/themes/Default/images/stock-gradient-shapeburst-angular-16.png
+%%DATADIR%%/themes/Default/images/stock-gradient-shapeburst-dimpled-16.png
+%%DATADIR%%/themes/Default/images/stock-gradient-shapeburst-spherical-16.png
+%%DATADIR%%/themes/Default/images/stock-gradient-spiral-anticlockwise-16.png
+%%DATADIR%%/themes/Default/images/stock-gradient-spiral-clockwise-16.png
+%%DATADIR%%/themes/Default/images/stock-gradient-square-16.png
+%%DATADIR%%/themes/Default/images/stock-gravity-east-24.png
+%%DATADIR%%/themes/Default/images/stock-gravity-north-24.png
+%%DATADIR%%/themes/Default/images/stock-gravity-north-east-24.png
+%%DATADIR%%/themes/Default/images/stock-gravity-north-west-24.png
+%%DATADIR%%/themes/Default/images/stock-gravity-south-24.png
+%%DATADIR%%/themes/Default/images/stock-gravity-south-east-24.png
+%%DATADIR%%/themes/Default/images/stock-gravity-south-west-24.png
+%%DATADIR%%/themes/Default/images/stock-gravity-west-24.png
+%%DATADIR%%/themes/Default/images/stock-grid-16.png
+%%DATADIR%%/themes/Default/images/stock-hchain-24.png
+%%DATADIR%%/themes/Default/images/stock-hchain-broken-24.png
+%%DATADIR%%/themes/Default/images/stock-histogram-16.png
+%%DATADIR%%/themes/Default/images/stock-histogram-22.png
+%%DATADIR%%/themes/Default/images/stock-histogram-linear-16.png
+%%DATADIR%%/themes/Default/images/stock-histogram-logarithmic-16.png
+%%DATADIR%%/themes/Default/images/stock-image-16.png
+%%DATADIR%%/themes/Default/images/stock-image-24.png
+%%DATADIR%%/themes/Default/images/stock-image-32.png
+%%DATADIR%%/themes/Default/images/stock-image-48.png
+%%DATADIR%%/themes/Default/images/stock-images-16.png
+%%DATADIR%%/themes/Default/images/stock-images-24.png
+%%DATADIR%%/themes/Default/images/stock-indexed-palette-16.png
+%%DATADIR%%/themes/Default/images/stock-indexed-palette-24.png
+%%DATADIR%%/themes/Default/images/stock-info-16.png
+%%DATADIR%%/themes/Default/images/stock-info-24.png
 %%DATADIR%%/themes/Default/images/stock-info-64.png
+%%DATADIR%%/themes/Default/images/stock-invert-16.png
+%%DATADIR%%/themes/Default/images/stock-join-bevel-16.png
+%%DATADIR%%/themes/Default/images/stock-join-miter-16.png
+%%DATADIR%%/themes/Default/images/stock-join-round-16.png
+%%DATADIR%%/themes/Default/images/stock-landscape-16.png
+%%DATADIR%%/themes/Default/images/stock-layer-16.png
+%%DATADIR%%/themes/Default/images/stock-layer-24.png
+%%DATADIR%%/themes/Default/images/stock-layer-32.png
+%%DATADIR%%/themes/Default/images/stock-layer-48.png
+%%DATADIR%%/themes/Default/images/stock-layer-mask-16.png
+%%DATADIR%%/themes/Default/images/stock-layer-mask-24.png
+%%DATADIR%%/themes/Default/images/stock-layer-mask-32.png
+%%DATADIR%%/themes/Default/images/stock-layer-mask-48.png
+%%DATADIR%%/themes/Default/images/stock-layer-to-imagesize-16.png
+%%DATADIR%%/themes/Default/images/stock-layers-16.png
+%%DATADIR%%/themes/Default/images/stock-layers-24.png
+%%DATADIR%%/themes/Default/images/stock-letter-spacing-22.png
+%%DATADIR%%/themes/Default/images/stock-line-spacing-22.png
+%%DATADIR%%/themes/Default/images/stock-linked-12.png
+%%DATADIR%%/themes/Default/images/stock-linked-20.png
+%%DATADIR%%/themes/Default/images/stock-list-16.png
+%%DATADIR%%/themes/Default/images/stock-menu-left-12.png
+%%DATADIR%%/themes/Default/images/stock-menu-right-12.png
+%%DATADIR%%/themes/Default/images/stock-merge-down-16.png
+%%DATADIR%%/themes/Default/images/stock-move-to-screen-16.png
+%%DATADIR%%/themes/Default/images/stock-move-to-screen-24.png
+%%DATADIR%%/themes/Default/images/stock-navigation-16.png
+%%DATADIR%%/themes/Default/images/stock-paste-as-new-16.png
+%%DATADIR%%/themes/Default/images/stock-paste-into-16.png
+%%DATADIR%%/themes/Default/images/stock-path-16.png
+%%DATADIR%%/themes/Default/images/stock-path-22.png
+%%DATADIR%%/themes/Default/images/stock-path-stroke-16.png
+%%DATADIR%%/themes/Default/images/stock-paths-16.png
+%%DATADIR%%/themes/Default/images/stock-paths-22.png
+%%DATADIR%%/themes/Default/images/stock-plugin-16.png
+%%DATADIR%%/themes/Default/images/stock-portrait-16.png
+%%DATADIR%%/themes/Default/images/stock-print-resolution-16.png
+%%DATADIR%%/themes/Default/images/stock-print-resolution-24.png
+%%DATADIR%%/themes/Default/images/stock-qmask-off-16.png
+%%DATADIR%%/themes/Default/images/stock-qmask-on-16.png
 %%DATADIR%%/themes/Default/images/stock-question-64.png
+%%DATADIR%%/themes/Default/images/stock-reset-16.png
+%%DATADIR%%/themes/Default/images/stock-reshow-filter-16.png
+%%DATADIR%%/themes/Default/images/stock-resize-16.png
+%%DATADIR%%/themes/Default/images/stock-rotate-180-16.png
+%%DATADIR%%/themes/Default/images/stock-rotate-270-16.png
+%%DATADIR%%/themes/Default/images/stock-rotate-90-16.png
+%%DATADIR%%/themes/Default/images/stock-scale-16.png
+%%DATADIR%%/themes/Default/images/stock-selection-16.png
+%%DATADIR%%/themes/Default/images/stock-selection-add-16.png
+%%DATADIR%%/themes/Default/images/stock-selection-all-16.png
+%%DATADIR%%/themes/Default/images/stock-selection-border-16.png
+%%DATADIR%%/themes/Default/images/stock-selection-grow-16.png
+%%DATADIR%%/themes/Default/images/stock-selection-intersect-16.png
+%%DATADIR%%/themes/Default/images/stock-selection-none-16.png
+%%DATADIR%%/themes/Default/images/stock-selection-replace-16.png
+%%DATADIR%%/themes/Default/images/stock-selection-shrink-16.png
+%%DATADIR%%/themes/Default/images/stock-selection-stroke-16.png
+%%DATADIR%%/themes/Default/images/stock-selection-subtract-16.png
+%%DATADIR%%/themes/Default/images/stock-selection-to-channel-16.png
+%%DATADIR%%/themes/Default/images/stock-selection-to-path-16.png
+%%DATADIR%%/themes/Default/images/stock-shape-circle-16.png
+%%DATADIR%%/themes/Default/images/stock-shape-diamond-16.png
+%%DATADIR%%/themes/Default/images/stock-shape-square-16.png
+%%DATADIR%%/themes/Default/images/stock-swap-colors-12.png
+%%DATADIR%%/themes/Default/images/stock-template-16.png
+%%DATADIR%%/themes/Default/images/stock-template-24.png
+%%DATADIR%%/themes/Default/images/stock-text-dir-ltr-24.png
+%%DATADIR%%/themes/Default/images/stock-text-dir-rtl-24.png
+%%DATADIR%%/themes/Default/images/stock-text-layer-16.png
+%%DATADIR%%/themes/Default/images/stock-text-layer-24.png
+%%DATADIR%%/themes/Default/images/stock-text-layer-32.png
+%%DATADIR%%/themes/Default/images/stock-text-layer-48.png
+%%DATADIR%%/themes/Default/images/stock-texture-64.png
+%%DATADIR%%/themes/Default/images/stock-toilet-paper-16.png
+%%DATADIR%%/themes/Default/images/stock-toilet-paper-24.png
+%%DATADIR%%/themes/Default/images/stock-tool-airbrush-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-airbrush-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-blend-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-blend-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-blur-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-blur-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-brightness-contrast-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-brightness-contrast-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-bucket-fill-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-bucket-fill-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-by-color-select-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-by-color-select-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-clone-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-clone-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-color-balance-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-color-balance-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-color-picker-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-color-picker-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-colorize-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-colorize-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-crop-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-crop-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-curves-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-curves-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-dodge-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-dodge-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-ellipse-select-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-ellipse-select-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-eraser-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-eraser-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-flip-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-flip-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-free-select-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-free-select-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-fuzzy-select-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-fuzzy-select-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-hue-saturation-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-hue-saturation-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-ink-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-ink-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-iscissors-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-iscissors-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-levels-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-levels-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-measure-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-measure-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-move-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-move-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-options-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-options-24.png
+%%DATADIR%%/themes/Default/images/stock-tool-paintbrush-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-paintbrush-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-path-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-path-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-pencil-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-pencil-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-perspective-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-perspective-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-posterize-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-posterize-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-rect-select-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-rect-select-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-rotate-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-rotate-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-scale-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-scale-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-shear-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-shear-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-smudge-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-smudge-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-text-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-text-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-threshold-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-threshold-22.png
+%%DATADIR%%/themes/Default/images/stock-tool-zoom-16.png
+%%DATADIR%%/themes/Default/images/stock-tool-zoom-22.png
+%%DATADIR%%/themes/Default/images/stock-tools-16.png
+%%DATADIR%%/themes/Default/images/stock-tools-24.png
+%%DATADIR%%/themes/Default/images/stock-transparency-16.png
+%%DATADIR%%/themes/Default/images/stock-transparency-24.png
+%%DATADIR%%/themes/Default/images/stock-undo-history-16.png
+%%DATADIR%%/themes/Default/images/stock-undo-history-24.png
+%%DATADIR%%/themes/Default/images/stock-vchain-24.png
+%%DATADIR%%/themes/Default/images/stock-vchain-broken-24.png
+%%DATADIR%%/themes/Default/images/stock-video-16.png
+%%DATADIR%%/themes/Default/images/stock-video-24.png
+%%DATADIR%%/themes/Default/images/stock-warning-16.png
+%%DATADIR%%/themes/Default/images/stock-warning-24.png
 %%DATADIR%%/themes/Default/images/stock-warning-64.png
+%%DATADIR%%/themes/Default/images/stock-web-16.png
+%%DATADIR%%/themes/Default/images/stock-web-24.png
+%%DATADIR%%/themes/Default/images/stock-wilber-16.png
+%%DATADIR%%/themes/Default/images/stock-wilber-64.png
+%%DATADIR%%/themes/Default/images/stock-wilber-eek-64.png
+%%DATADIR%%/themes/Default/images/stock-zoom-follow-window-12.png
 %%DATADIR%%/themes/Small/gtkrc
 %%DATADIR%%/tips/gimp-tips.xml
-%%GNOME%%share/gnome/application-registry/gimp.applications
-%%GNOME%%share/gnome/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-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-script-fu.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/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/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/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/no/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/no/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/no/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/no/LC_MESSAGES/gimp20.mo
 share/locale/pa/LC_MESSAGES/gimp20-libgimp.mo
-share/locale/pa/LC_MESSAGES/gimp20-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/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 %%DATADIR%%/tips
 @dirrm %%DATADIR%%/themes/Small
@@ -1846,8 +1894,11 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm %%DATADIR%%/themes/Default/images
 @dirrm %%DATADIR%%/themes/Default
 @dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/scripts/images
+@dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/patterns
 @dirrm %%DATADIR%%/palettes
+@dirrm %%DATADIR%%/misc
 @dirrm %%DATADIR%%/menus
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%/gradients
@@ -1865,15 +1916,13 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm %%DOCSDIR%%/libgimpthumb
 @dirrm %%DOCSDIR%%/libgimpmodule
 @dirrm %%DOCSDIR%%/libgimpmath
-@dirrm %%DOCSDIR%%/libgimpconfig
 @dirrm %%DOCSDIR%%/libgimpcolor
 @dirrm %%DOCSDIR%%/libgimpbase
 @dirrm %%DOCSDIR%%/libgimp
 @dirrm %%DOCSDIR%%
-@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
@@ -1881,41 +1930,33 @@ 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
+%%GNOMEPANEL:%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
 @dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_CN/LC_MESSAGES
 @dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/yi/LC_MESSAGES
 @dirrmtry share/locale/yi
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
 @dirrmtry share/locale/uk/LC_MESSAGES
 @dirrmtry share/locale/uk
-@dirrmtry share/locale/tt/LC_MESSAGES
-@dirrmtry share/locale/tt
 @dirrmtry share/locale/sr/LC_MESSAGES
 @dirrmtry share/locale/sr
 @dirrmtry share/locale/sk/LC_MESSAGES
 @dirrmtry share/locale/sk
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
 @dirrmtry share/locale/ro/LC_MESSAGES
 @dirrmtry share/locale/ro
 @dirrmtry share/locale/pt/LC_MESSAGES
 @dirrmtry share/locale/pt
 @dirrmtry share/locale/pl/LC_MESSAGES
 @dirrmtry share/locale/pl
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
 @dirrmtry share/locale/ko/LC_MESSAGES
 @dirrmtry share/locale/ko
 @dirrmtry share/locale/gl/LC_MESSAGES
@@ -1924,8 +1965,6 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrmtry share/locale/fi
 @dirrmtry share/locale/el/LC_MESSAGES
 @dirrmtry share/locale/el
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
 @dirrmtry share/locale/cs/LC_MESSAGES
 @dirrmtry share/locale/cs
 @dirrmtry share/locale/ca/LC_MESSAGES
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
new file mode 100644
index 000000000..a2d932e2f
--- /dev/null
+++ b/graphics/gimp/Makefile
@@ -0,0 +1,44 @@
+# New ports collection makefile for:    The GIMP
+# Date created:         Mon Nov 18 21:28:43 CST 1996
+# Whom:                 erich@FreeBSD.org
+#
+# $FreeBSD$
+#   $MCom: ports/graphics/gimp-devel/Makefile,v 1.28 2007/03/30 17:05:55 ahze Exp $
+#
+
+PORTNAME=	gimp
+PORTVERSION?=	2.2
+PORTEPOCH?=	2
+CATEGORIES=	graphics gnome
+MASTER_SITES?=	# empty
+DISTFILES?=	# empty
+EXTRACT_ONLY?=	# empty
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	The "meta-port" for The Gimp
+
+RUN_DEPENDS=	gimp-2.2:${PORTSDIR}/graphics/gimp-app
+
+OPTIONS=	PYTHON "Python-fu support" Off \
+		PRINT "Gutenprint (gimp-print) plugin" On \
+		HELP "Install Gimp-Help (50+MB distfile)" Off
+
+NO_BUILD=	yes
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_HELP)
+RUN_DEPENDS+=	gimp-help>0:${PORTSDIR}/graphics/gimp-help
+.endif
+
+.if defined(WITH_PYTHON)
+RUN_DEPENDS+=	${LOCALBASE}/libexec/gimp/2.2/environ/pygimp.env:${PORTSDIR}/graphics/py-gimp
+.endif
+
+.if !defined(WITHOUT_PRINT)
+RUN_DEPENDS+=	${LOCALBASE}/libexec/gimp/2.2/plug-ins/print:${PORTSDIR}/print/gimp-gutenprint
+.endif
+
+do-install:	# empty
+
+.include <bsd.port.post.mk>
diff --git a/graphics/gimp/pkg-descr b/graphics/gimp/pkg-descr
new file mode 100644
index 000000000..35939f2a6
--- /dev/null
+++ b/graphics/gimp/pkg-descr
@@ -0,0 +1,21 @@
+The GIMP is designed to provide an intuitive graphical interface to a
+variety of image editing operations. Here is a list of the GIMP's 
+major features:
+
+ Image editing
+ -------------
+
+   *  Selection tools including rectangle, ellipse, free, fuzzy, bezier 
+      and intelligent.
+   *  Transformation tools including rotate, scale, shear and flip.
+   *  Painting tools including bucket, brush, airbrush, clone, convolve,
+      blend and text.
+   *  Effects filters (such as blur, edge detect).
+   *  Channel & color operations (such as add, composite, decompose).
+   *  Plug-ins which allow for the easy addition of new file formats and
+      new effect filters.
+   *  Multiple undo/redo.
+
+This is "The Gimp" meta-port, see ports/graphics/gimp-app for more details
+
+WWW: http://www.gimp.org/
author	ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>	2007-03-31 02:18:41 +0800
committer	ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>	2007-03-31 02:18:41 +0800
commit	1d715b601a9b9e13a115ec770e9a3c6a56f92510 (patch)
tree	64f24e68a4e2fe613b39bb3150a73b39e35c48b8 /graphics
parent	79a6d85c8ae28fcd91ce567868f980cb7a1c22f6 (diff)
download	marcuscom-ports-1d715b601a9b9e13a115ec770e9a3c6a56f92510.tar marcuscom-ports-1d715b601a9b9e13a115ec770e9a3c6a56f92510.tar.gz marcuscom-ports-1d715b601a9b9e13a115ec770e9a3c6a56f92510.tar.bz2 marcuscom-ports-1d715b601a9b9e13a115ec770e9a3c6a56f92510.tar.lz marcuscom-ports-1d715b601a9b9e13a115ec770e9a3c6a56f92510.tar.xz marcuscom-ports-1d715b601a9b9e13a115ec770e9a3c6a56f92510.tar.zst marcuscom-ports-1d715b601a9b9e13a115ec770e9a3c6a56f92510.zip