5 files changed, 830 insertions, 149 deletions

diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 6278dea474ee..e3c1942e231c 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gthumb
-PORTVERSION=	2.10.12
-PORTREVISION=	1
+PORTVERSION=	2.12.1
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -15,40 +14,60 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	An image viewer and browser for the GNOME 2 environment
 
-LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif
+LIB_DEPENDS=	unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui libgnomeprintui gnomedocutils
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomedocutils gconf2
+WANT_GSTREAMER=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-INSTALLS_OMF=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-GCONF_SCHEMAS=	gthumb.schemas
-MAN1=		gthumb.1
+GCONF_SCHEMAS=	gthumb.schemas gthumb-comments.schemas gthumb-image-viewer.schemas \
+		gthumb-importer.schemas gthumb-pixbuf-savers.schemas gthumb-slideshow.schemas \
+		gthumb_convert_format.schemas gthumb_crop_options.schemas gthumb_image_print.schemas \
+		gthumb_photo_importer.schemas gthumb_rename_series.schemas \
+		gthumb_resize_images.schemas gthumb_resize_options.schemas gthumb_webalbums.schemas
 
-OPTIONS=	GPHOTO2 "Support loading photos from digital cameras" On \
-		IPTCDATA "Support for IPTC metadata" Off \
-		OPENRAW "Support for camera RAW files" Off
+PLIST_SUB=	GTHUMB_VER=2.12
+
+OPTIONS=	EXIV2 "Exif support (image metadata)" On \
+		CLUTTER "Fancy slideshows" On \
+		GSTREAMER "Video playback" On \
+		OPENRAW "Support for camera RAW files" On \
+		SOUP "Web services uploaders" On \
+		BRASERO "Write galleries to CD/DVD (large dependency)" On
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_GPHOTO2)
-LIB_DEPENDS+=	gphoto2.2:${PORTSDIR}/graphics/libgphoto2
-CONFIGURE_ARGS+=--enable-gphoto2
+.if defined(WITH_EXIV2)
+LIB_DEPENDS+=	exiv2.9:${PORTSDIR}/graphics/exiv2
+CONFIGURE_ARGS+=--enable-exiv2
+PLIST_SUB+=	EXIV2=""
 .else
-CONFIGURE_ARGS+=--disable-gphoto2
+CONFIGURE_ARGS+=--disable-exiv2
+PLIST_SUB+=	EXIV2="@comment "
 .endif
 
-.if defined(WITH_IPTCDATA)
-LIB_DEPENDS+=	iptcdata.3:${PORTSDIR}/graphics/libiptcdata
-CONFIGURE_ARGS+=--enable-iptcdata
+.if defined(WITH_CLUTTER)
+LIB_DEPENDS+=	clutter-gtk-0.10.0:${PORTSDIR}/graphics/clutter-gtk
+CONFIGURE_ARGS+=--enable-clutter
 .else
-CONFIGURE_ARGS+=--disable-iptcdata
+CONFIGURE_ARGS+=--disable-clutter
+.endif
+
+.if defined(WITH_GSTREAMER)
+USE_GSTREAMER=	yes
+CONFIGURE_ARGS+=--enable-gstreamer
+PLIST_SUB+=	GSTREAMER=""
+GCONF_SCHEMAS+=	gthumb-gstreamer.schemas
+.else
+CONFIGURE_ARGS+=--disable-gstreamer
+PLIST_SUB+=	GSTREAMER="@comment "
 .endif
 
 .if defined(WITH_OPENRAW)
@@ -58,4 +77,23 @@ CONFIGURE_ARGS+=--enable-libopenraw
 CONFIGURE_ARGS+=--disable-libopenraw
 .endif
 
+.if defined(WITH_SOUP)
+LIB_DEPENDS+=	soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome
+CONFIGURE_ARGS+=--enable-libsoup --enable-gnome-keyring
+PLIST_SUB+=	SOUP=""
+GCONF_SCHEMAS+=	gthumb-picasaweb.schemas
+.else
+CONFIGURE_ARGS+=--disable-libsoup --disable-gnome-keyring
+PLIST_SUB+=	SOUP="@comment "
+.endif
+
+.if defined(WITH_BRASERO)
+LIB_DEPENDS+=	brasero-burn.3:${PORTSDIR}/sysutils/brasero
+CONFIGURE_ARGS+=--enable-libbrasero
+PLIST_SUB+=	BRASERO=""
+.else
+CONFIGURE_ARGS+=--disable-libbrasero
+PLIST_SUB+=	BRASERO="@comment "
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/graphics/gthumb/distinfo b/graphics/gthumb/distinfo
index ab3825c94f36..00e791780e04 100644
--- a/graphics/gthumb/distinfo
+++ b/graphics/gthumb/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gthumb-2.10.12.tar.bz2) = a9037ce99e62069e2977243a364074b3
-SHA256 (gnome2/gthumb-2.10.12.tar.bz2) = e4f65ced6db31a3fe17ba172b3b320b581c82d34d76f38e6c7241e109580ca5a
-SIZE (gnome2/gthumb-2.10.12.tar.bz2) = 3349973
+SHA256 (gnome2/gthumb-2.12.1.tar.bz2) = 94d186db48e4527f1ba1dad41b860fc34b8f13da4228319dc742c91f45ddea64
+SIZE (gnome2/gthumb-2.12.1.tar.bz2) = 5186434
diff --git a/graphics/gthumb/files/patch-src-dlg-photo-importer.c b/graphics/gthumb/files/patch-src-dlg-photo-importer.c
deleted file mode 100644
index a8cf09e6bc7b..000000000000
--- a/graphics/gthumb/files/patch-src-dlg-photo-importer.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/dlg-photo-importer.c.orig	2008-01-01 12:13:17.000000000 +0100
-+++ src/dlg-photo-importer.c	2008-07-15 22:02:41.000000000 +0200
-@@ -28,6 +28,7 @@
- #include <string.h>
- #include <strings.h>
- #include <time.h>
-+#include <unistd.h>
- 
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
diff --git a/graphics/gthumb/pkg-descr b/graphics/gthumb/pkg-descr
index 4d1d8cc31d28..ad53b4afe6fd 100644
--- a/graphics/gthumb/pkg-descr
+++ b/graphics/gthumb/pkg-descr
@@ -1,5 +1,4 @@
-This is a port of gThumb for GNOME 2, a fast and small image browser and viewer.
-It creates thumbnailes, caches them and has support for most popular
-image formats.
+gThumb is an image viewer and browser for the GNOME Desktop. It also includes
+an importer tool for transferring photos from cameras.
 
-WWW: http://gthumb.sourceforge.net/
+WWW: http://live.gnome.org/gthumb
diff --git a/graphics/gthumb/pkg-plist b/graphics/gthumb/pkg-plist
index df51303e5853..dd4bb2c5f87c 100644
--- a/graphics/gthumb/pkg-plist
+++ b/graphics/gthumb/pkg-plist
@@ -1,42 +1,631 @@
 bin/gthumb
-lib/gthumb/modules/libduplicates.a
-lib/gthumb/modules/libduplicates.la
-lib/gthumb/modules/libduplicates.so
-lib/gthumb/modules/libjpegtran.a
-lib/gthumb/modules/libjpegtran.la
-lib/gthumb/modules/libjpegtran.so
-lib/gthumb/modules/libphotoimporter.a
-lib/gthumb/modules/libphotoimporter.la
-lib/gthumb/modules/libphotoimporter.so
-lib/gthumb/modules/libpngexporter.a
-lib/gthumb/modules/libpngexporter.la
-lib/gthumb/modules/libpngexporter.so
-lib/gthumb/modules/libsearch.a
-lib/gthumb/modules/libsearch.la
-lib/gthumb/modules/libsearch.so
-lib/gthumb/modules/libwebexporter.a
-lib/gthumb/modules/libwebexporter.la
-lib/gthumb/modules/libwebexporter.so
-lib/libgthumb.a
-lib/libgthumb.la
-lib/libgthumb.so
-libdata/bonobo/servers/GNOME_GThumb.server
+include/gthumb-%%GTHUMB_VER%%/gthumb.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/dom.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/eggfileformatchooser.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/egg-macros.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gconf-utils.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gedit-message-area.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gio-utils.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/glib-utils.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gnome-desktop-thumbnail.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gsignature.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-async-task.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-browser.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-buffer-data.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-cell-renderer-thumbnail.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-cursors.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-dumb-notebook.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-duplicable.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-embedded-dialog.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-empty-list.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-enum-types.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-error.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-extensions.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-data.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-chooser-dialog.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-list.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-properties.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-selection.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-source.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-source-vfs.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-store.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-tool.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-view.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-filterbar.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-filter.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-filter-editor-dialog.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-filter-file.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-folder-tree.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-histogram.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-histogram-view.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-hook.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-icon-cache.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-icon-view.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-dragger.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-history.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-loader.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-navigator.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-preloader.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-selector.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-viewer.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-viewer-tool.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-info-bar.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-location-chooser.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-main.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-marshal.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-metadata.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-metadata-chooser.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-metadata-provider.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-monitor.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-multipage.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-overwrite-dialog.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-pixbuf-list-task.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-pixbuf-saver.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-pixbuf-task.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-preferences.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-progress-dialog.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-sidebar.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-source-tree.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-statusbar.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-stock.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-string-list.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-tags-entry.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-tags-file.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-task.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-test.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-test-category.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-test-chain.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-test-selector.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-test-simple.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-thumb-loader.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-time.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-time-selector.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-toggle-menu-tool-button.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-toolbox.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-uri-list.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-user-dir.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-viewer-page.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-window.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gtk-utils.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gvaluehash.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/main.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/pixbuf-cache.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/pixbuf-io.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/pixbuf-utils.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/typedefs.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/zlib-utils.h
+lib/gthumb/extensions/bookmarks.extension
+%%BRASERO%%lib/gthumb/extensions/burn_disc.extension
+lib/gthumb/extensions/catalogs.extension
+lib/gthumb/extensions/change_date.extension
+lib/gthumb/extensions/comments.extension
+lib/gthumb/extensions/convert_format.extension
+lib/gthumb/extensions/desktop_background.extension
+lib/gthumb/extensions/edit_metadata.extension
+%%EXIV2%%lib/gthumb/extensions/exiv2_tools.extension
+lib/gthumb/extensions/export_tools.extension
+%%SOUP%%lib/gthumb/extensions/facebook.extension
+lib/gthumb/extensions/file_manager.extension
+lib/gthumb/extensions/file_tools.extension
+lib/gthumb/extensions/file_viewer.extension
+%%SOUP%%lib/gthumb/extensions/flicker.extension
+%%GSTREAMER%%lib/gthumb/extensions/gstreamer_tools.extension
+%%GSTREAMER%%lib/gthumb/extensions/gstreamer_utils.extension
+lib/gthumb/extensions/image_print.extension
+lib/gthumb/extensions/image_rotation.extension
+lib/gthumb/extensions/image_viewer.extension
+lib/gthumb/extensions/importer.extension
+lib/gthumb/extensions/jpeg_utils.extension
+lib/gthumb/extensions/libbookmarks.a
+lib/gthumb/extensions/libbookmarks.la
+lib/gthumb/extensions/libbookmarks.so
+%%BRASERO%%lib/gthumb/extensions/libburn_disc.a
+%%BRASERO%%lib/gthumb/extensions/libburn_disc.la
+%%BRASERO%%lib/gthumb/extensions/libburn_disc.so
+lib/gthumb/extensions/libcatalogs.a
+lib/gthumb/extensions/libcatalogs.la
+lib/gthumb/extensions/libcatalogs.so
+lib/gthumb/extensions/libchange_date.a
+lib/gthumb/extensions/libchange_date.la
+lib/gthumb/extensions/libchange_date.so
+lib/gthumb/extensions/libcomments.a
+lib/gthumb/extensions/libcomments.la
+lib/gthumb/extensions/libcomments.so
+lib/gthumb/extensions/libconvert_format.a
+lib/gthumb/extensions/libconvert_format.la
+lib/gthumb/extensions/libconvert_format.so
+lib/gthumb/extensions/libdesktop_background.a
+lib/gthumb/extensions/libdesktop_background.la
+lib/gthumb/extensions/libdesktop_background.so
+lib/gthumb/extensions/libedit_metadata.a
+lib/gthumb/extensions/libedit_metadata.la
+lib/gthumb/extensions/libedit_metadata.so
+%%EXIV2%%lib/gthumb/extensions/libexiv2_tools.a
+%%EXIV2%%lib/gthumb/extensions/libexiv2_tools.la
+%%EXIV2%%lib/gthumb/extensions/libexiv2_tools.so
+lib/gthumb/extensions/libexport_tools.a
+lib/gthumb/extensions/libexport_tools.la
+lib/gthumb/extensions/libexport_tools.so
+%%SOUP%%lib/gthumb/extensions/libfacebook.a
+%%SOUP%%lib/gthumb/extensions/libfacebook.la
+%%SOUP%%lib/gthumb/extensions/libfacebook.so
+lib/gthumb/extensions/libfile_manager.a
+lib/gthumb/extensions/libfile_manager.la
+lib/gthumb/extensions/libfile_manager.so
+lib/gthumb/extensions/libfile_tools.a
+lib/gthumb/extensions/libfile_tools.la
+lib/gthumb/extensions/libfile_tools.so
+lib/gthumb/extensions/libfile_viewer.a
+lib/gthumb/extensions/libfile_viewer.la
+lib/gthumb/extensions/libfile_viewer.so
+%%SOUP%%lib/gthumb/extensions/libflicker.a
+%%SOUP%%lib/gthumb/extensions/libflicker.la
+%%SOUP%%lib/gthumb/extensions/libflicker.so
+%%GSTREAMER%%lib/gthumb/extensions/libgstreamer_tools.a
+%%GSTREAMER%%lib/gthumb/extensions/libgstreamer_tools.la
+%%GSTREAMER%%lib/gthumb/extensions/libgstreamer_tools.so
+%%GSTREAMER%%lib/gthumb/extensions/libgstreamer_utils.a
+%%GSTREAMER%%lib/gthumb/extensions/libgstreamer_utils.la
+%%GSTREAMER%%lib/gthumb/extensions/libgstreamer_utils.so
+lib/gthumb/extensions/libimage_print.a
+lib/gthumb/extensions/libimage_print.la
+lib/gthumb/extensions/libimage_print.so
+lib/gthumb/extensions/libimage_rotation.a
+lib/gthumb/extensions/libimage_rotation.la
+lib/gthumb/extensions/libimage_rotation.so
+lib/gthumb/extensions/libimage_viewer.a
+lib/gthumb/extensions/libimage_viewer.la
+lib/gthumb/extensions/libimage_viewer.so
+lib/gthumb/extensions/libimporter.a
+lib/gthumb/extensions/libimporter.la
+lib/gthumb/extensions/libimporter.so
+lib/gthumb/extensions/libjpeg_utils.a
+lib/gthumb/extensions/libjpeg_utils.la
+lib/gthumb/extensions/libjpeg_utils.so
+lib/gthumb/extensions/liblist_tools.a
+lib/gthumb/extensions/liblist_tools.la
+lib/gthumb/extensions/liblist_tools.so
+%%SOUP%%lib/gthumb/extensions/liboauth.a
+%%SOUP%%lib/gthumb/extensions/liboauth.la
+%%SOUP%%lib/gthumb/extensions/liboauth.so
+lib/gthumb/extensions/libphoto_importer.a
+lib/gthumb/extensions/libphoto_importer.la
+lib/gthumb/extensions/libphoto_importer.so
+%%SOUP%%lib/gthumb/extensions/libphotobucket.a
+%%SOUP%%lib/gthumb/extensions/libphotobucket.la
+%%SOUP%%lib/gthumb/extensions/libphotobucket.so
+%%SOUP%%lib/gthumb/extensions/libpicasaweb.a
+%%SOUP%%lib/gthumb/extensions/libpicasaweb.la
+%%SOUP%%lib/gthumb/extensions/libpicasaweb.so
+lib/gthumb/extensions/libpixbuf_savers.a
+lib/gthumb/extensions/libpixbuf_savers.la
+lib/gthumb/extensions/libpixbuf_savers.so
+lib/gthumb/extensions/libraw_files.a
+lib/gthumb/extensions/libraw_files.la
+lib/gthumb/extensions/libraw_files.so
+lib/gthumb/extensions/libred_eye_removal.a
+lib/gthumb/extensions/libred_eye_removal.la
+lib/gthumb/extensions/libred_eye_removal.so
+lib/gthumb/extensions/librename_series.a
+lib/gthumb/extensions/librename_series.la
+lib/gthumb/extensions/librename_series.so
+lib/gthumb/extensions/libresize_images.a
+lib/gthumb/extensions/libresize_images.la
+lib/gthumb/extensions/libresize_images.so
+lib/gthumb/extensions/libsearch.a
+lib/gthumb/extensions/libsearch.la
+lib/gthumb/extensions/libsearch.so
+lib/gthumb/extensions/libslideshow.a
+lib/gthumb/extensions/libslideshow.la
+lib/gthumb/extensions/libslideshow.so
+lib/gthumb/extensions/libwebalbums.a
+lib/gthumb/extensions/libwebalbums.la
+lib/gthumb/extensions/libwebalbums.so
+lib/gthumb/extensions/list_tools.extension
+%%SOUP%%lib/gthumb/extensions/oauth.extension
+lib/gthumb/extensions/photo_importer.extension
+%%SOUP%%lib/gthumb/extensions/photobucket.extension
+%%SOUP%%lib/gthumb/extensions/picasaweb.extension
+lib/gthumb/extensions/pixbuf_savers.extension
+lib/gthumb/extensions/raw_files.extension
+lib/gthumb/extensions/red_eye_removal.extension
+lib/gthumb/extensions/rename_series.extension
+lib/gthumb/extensions/resize_images.extension
+lib/gthumb/extensions/search.extension
+lib/gthumb/extensions/slideshow.extension
+lib/gthumb/extensions/webalbums.extension
+libdata/pkgconfig/gthumb-%%GTHUMB_VER%%.pc
+share/aclocal/gthumb.m4
 share/applications/gthumb.desktop
 share/applications/gthumb-import.desktop
-share/gthumb/albumthemes/BestFit/back.png
-share/gthumb/albumthemes/BestFit/BestFit.css
-share/gthumb/albumthemes/BestFit/BestFit.js
-share/gthumb/albumthemes/BestFit/image.gthtml
-share/gthumb/albumthemes/BestFit/index.gthtml
-share/gthumb/albumthemes/BestFit/index.js
-share/gthumb/albumthemes/BestFit/lib.js
-share/gthumb/albumthemes/BestFit/next.png
-share/gthumb/albumthemes/BestFit/preview.png
-share/gthumb/albumthemes/BestFit/prev.png
-share/gthumb/albumthemes/BestFit/thumbnail.gthtml
-share/gthumb/albumthemes/Classic/1.gif
+share/gnome/help/gthumb/C/attributes.page
+share/gnome/help/gthumb/C/batch-convert-format.page
+share/gnome/help/gthumb/C/batch-change-date.page
+share/gnome/help/gthumb/C/batch-resize.page
+share/gnome/help/gthumb/C/batch-rotate.page
+share/gnome/help/gthumb/C/batch-scripts.page
+share/gnome/help/gthumb/C/bookmarks.page
+share/gnome/help/gthumb/C/browser.page
+share/gnome/help/gthumb/C/edit-colors.page
+share/gnome/help/gthumb/C/edit-redeye.page
+share/gnome/help/gthumb/C/edit-resize-crop.page
+share/gnome/help/gthumb/C/edit-rotate.page
+share/gnome/help/gthumb/C/edit-save-undo-redo.page
+share/gnome/help/gthumb/C/extensions.page
+share/gnome/help/gthumb/C/figures/comment.png
+share/gnome/help/gthumb/C/figures/general-filter.png
+share/gnome/help/gthumb/C/figures/import.png
+share/gnome/help/gthumb/C/figures/import-pref-auto-folder.png
+share/gnome/help/gthumb/C/figures/import-pref-custom-format.png
+share/gnome/help/gthumb/C/figures/main-win.png
+share/gnome/help/gthumb/C/figures/nav-button.png
+share/gnome/help/gthumb/C/figures/palette.png
+share/gnome/help/gthumb/C/figures/preferences.png
+share/gnome/help/gthumb/C/figures/specific-filter.png
+share/gnome/help/gthumb/C/figures/thumbnail-pane.png
+share/gnome/help/gthumb/C/filtering.page
+share/gnome/help/gthumb/C/fullscreen.page
+share/gnome/help/gthumb/C/gimp.page
+share/gnome/help/gthumb/C/import.page
+share/gnome/help/gthumb/C/index.page
+share/gnome/help/gthumb/C/introduction.page
+share/gnome/help/gthumb/C/legal.xml
+share/gnome/help/gthumb/C/printing.page
+share/gnome/help/gthumb/C/rename-series.page
+share/gnome/help/gthumb/C/sharing-disc.page
+share/gnome/help/gthumb/C/shortcuts.page
+share/gnome/help/gthumb/C/slideshow.page
+share/gnome/help/gthumb/C/sorting.page
+share/gnome/help/gthumb/C/strftime.page
+share/gnome/help/gthumb/C/thumbnails.page
+share/gnome/help/gthumb/C/thumbnail-pane.page
+share/gnome/help/gthumb/C/viewer.page
+share/gnome/help/gthumb/C/wallpaper.page
+share/gnome/help/gthumb/de/attributes.page
+share/gnome/help/gthumb/de/batch-convert-format.page
+share/gnome/help/gthumb/de/batch-change-date.page
+share/gnome/help/gthumb/de/batch-resize.page
+share/gnome/help/gthumb/de/batch-rotate.page
+share/gnome/help/gthumb/de/batch-scripts.page
+share/gnome/help/gthumb/de/bookmarks.page
+share/gnome/help/gthumb/de/browser.page
+share/gnome/help/gthumb/de/edit-colors.page
+share/gnome/help/gthumb/de/edit-redeye.page
+share/gnome/help/gthumb/de/edit-resize-crop.page
+share/gnome/help/gthumb/de/edit-rotate.page
+share/gnome/help/gthumb/de/edit-save-undo-redo.page
+share/gnome/help/gthumb/de/extensions.page
+share/gnome/help/gthumb/de/figures/comment.png
+share/gnome/help/gthumb/de/figures/general-filter.png
+share/gnome/help/gthumb/de/figures/import.png
+share/gnome/help/gthumb/de/figures/import-pref-auto-folder.png
+share/gnome/help/gthumb/de/figures/import-pref-custom-format.png
+share/gnome/help/gthumb/de/figures/main-win.png
+share/gnome/help/gthumb/de/figures/nav-button.png
+share/gnome/help/gthumb/de/figures/palette.png
+share/gnome/help/gthumb/de/figures/preferences.png
+share/gnome/help/gthumb/de/figures/specific-filter.png
+share/gnome/help/gthumb/de/figures/thumbnail-pane.png
+share/gnome/help/gthumb/de/filtering.page
+share/gnome/help/gthumb/de/fullscreen.page
+share/gnome/help/gthumb/de/gimp.page
+share/gnome/help/gthumb/de/import.page
+share/gnome/help/gthumb/de/index.page
+share/gnome/help/gthumb/de/introduction.page
+share/gnome/help/gthumb/de/legal.xml
+share/gnome/help/gthumb/de/printing.page
+share/gnome/help/gthumb/de/rename-series.page
+share/gnome/help/gthumb/de/sharing-disc.page
+share/gnome/help/gthumb/de/shortcuts.page
+share/gnome/help/gthumb/de/slideshow.page
+share/gnome/help/gthumb/de/sorting.page
+share/gnome/help/gthumb/de/strftime.page
+share/gnome/help/gthumb/de/thumbnails.page
+share/gnome/help/gthumb/de/thumbnail-pane.page
+share/gnome/help/gthumb/de/viewer.page
+share/gnome/help/gthumb/de/wallpaper.page
+share/gnome/help/gthumb/el/attributes.page
+share/gnome/help/gthumb/el/batch-convert-format.page
+share/gnome/help/gthumb/el/batch-change-date.page
+share/gnome/help/gthumb/el/batch-resize.page
+share/gnome/help/gthumb/el/batch-rotate.page
+share/gnome/help/gthumb/el/batch-scripts.page
+share/gnome/help/gthumb/el/bookmarks.page
+share/gnome/help/gthumb/el/browser.page
+share/gnome/help/gthumb/el/edit-colors.page
+share/gnome/help/gthumb/el/edit-redeye.page
+share/gnome/help/gthumb/el/edit-resize-crop.page
+share/gnome/help/gthumb/el/edit-rotate.page
+share/gnome/help/gthumb/el/edit-save-undo-redo.page
+share/gnome/help/gthumb/el/extensions.page
+share/gnome/help/gthumb/el/figures/comment.png
+share/gnome/help/gthumb/el/figures/general-filter.png
+share/gnome/help/gthumb/el/figures/import.png
+share/gnome/help/gthumb/el/figures/import-pref-auto-folder.png
+share/gnome/help/gthumb/el/figures/import-pref-custom-format.png
+share/gnome/help/gthumb/el/figures/main-win.png
+share/gnome/help/gthumb/el/figures/nav-button.png
+share/gnome/help/gthumb/el/figures/palette.png
+share/gnome/help/gthumb/el/figures/preferences.png
+share/gnome/help/gthumb/el/figures/specific-filter.png
+share/gnome/help/gthumb/el/figures/thumbnail-pane.png
+share/gnome/help/gthumb/el/filtering.page
+share/gnome/help/gthumb/el/fullscreen.page
+share/gnome/help/gthumb/el/gimp.page
+share/gnome/help/gthumb/el/import.page
+share/gnome/help/gthumb/el/index.page
+share/gnome/help/gthumb/el/introduction.page
+share/gnome/help/gthumb/el/legal.xml
+share/gnome/help/gthumb/el/printing.page
+share/gnome/help/gthumb/el/rename-series.page
+share/gnome/help/gthumb/el/sharing-disc.page
+share/gnome/help/gthumb/el/shortcuts.page
+share/gnome/help/gthumb/el/slideshow.page
+share/gnome/help/gthumb/el/sorting.page
+share/gnome/help/gthumb/el/strftime.page
+share/gnome/help/gthumb/el/thumbnails.page
+share/gnome/help/gthumb/el/thumbnail-pane.page
+share/gnome/help/gthumb/el/viewer.page
+share/gnome/help/gthumb/el/wallpaper.page
+share/gnome/help/gthumb/es/attributes.page
+share/gnome/help/gthumb/es/batch-convert-format.page
+share/gnome/help/gthumb/es/batch-change-date.page
+share/gnome/help/gthumb/es/batch-resize.page
+share/gnome/help/gthumb/es/batch-rotate.page
+share/gnome/help/gthumb/es/batch-scripts.page
+share/gnome/help/gthumb/es/bookmarks.page
+share/gnome/help/gthumb/es/browser.page
+share/gnome/help/gthumb/es/edit-colors.page
+share/gnome/help/gthumb/es/edit-redeye.page
+share/gnome/help/gthumb/es/edit-resize-crop.page
+share/gnome/help/gthumb/es/edit-rotate.page
+share/gnome/help/gthumb/es/edit-save-undo-redo.page
+share/gnome/help/gthumb/es/extensions.page
+share/gnome/help/gthumb/es/figures/comment.png
+share/gnome/help/gthumb/es/figures/general-filter.png
+share/gnome/help/gthumb/es/figures/import.png
+share/gnome/help/gthumb/es/figures/import-pref-auto-folder.png
+share/gnome/help/gthumb/es/figures/import-pref-custom-format.png
+share/gnome/help/gthumb/es/figures/main-win.png
+share/gnome/help/gthumb/es/figures/nav-button.png
+share/gnome/help/gthumb/es/figures/palette.png
+share/gnome/help/gthumb/es/figures/preferences.png
+share/gnome/help/gthumb/es/figures/specific-filter.png
+share/gnome/help/gthumb/es/figures/thumbnail-pane.png
+share/gnome/help/gthumb/es/filtering.page
+share/gnome/help/gthumb/es/fullscreen.page
+share/gnome/help/gthumb/es/gimp.page
+share/gnome/help/gthumb/es/import.page
+share/gnome/help/gthumb/es/index.page
+share/gnome/help/gthumb/es/introduction.page
+share/gnome/help/gthumb/es/legal.xml
+share/gnome/help/gthumb/es/printing.page
+share/gnome/help/gthumb/es/rename-series.page
+share/gnome/help/gthumb/es/sharing-disc.page
+share/gnome/help/gthumb/es/shortcuts.page
+share/gnome/help/gthumb/es/slideshow.page
+share/gnome/help/gthumb/es/sorting.page
+share/gnome/help/gthumb/es/strftime.page
+share/gnome/help/gthumb/es/thumbnails.page
+share/gnome/help/gthumb/es/thumbnail-pane.page
+share/gnome/help/gthumb/es/viewer.page
+share/gnome/help/gthumb/es/wallpaper.page
+share/gnome/help/gthumb/fr/attributes.page
+share/gnome/help/gthumb/fr/batch-convert-format.page
+share/gnome/help/gthumb/fr/batch-change-date.page
+share/gnome/help/gthumb/fr/batch-resize.page
+share/gnome/help/gthumb/fr/batch-rotate.page
+share/gnome/help/gthumb/fr/batch-scripts.page
+share/gnome/help/gthumb/fr/bookmarks.page
+share/gnome/help/gthumb/fr/browser.page
+share/gnome/help/gthumb/fr/edit-colors.page
+share/gnome/help/gthumb/fr/edit-redeye.page
+share/gnome/help/gthumb/fr/edit-resize-crop.page
+share/gnome/help/gthumb/fr/edit-rotate.page
+share/gnome/help/gthumb/fr/edit-save-undo-redo.page
+share/gnome/help/gthumb/fr/extensions.page
+share/gnome/help/gthumb/fr/figures/comment.png
+share/gnome/help/gthumb/fr/figures/general-filter.png
+share/gnome/help/gthumb/fr/figures/import.png
+share/gnome/help/gthumb/fr/figures/import-pref-auto-folder.png
+share/gnome/help/gthumb/fr/figures/import-pref-custom-format.png
+share/gnome/help/gthumb/fr/figures/main-win.png
+share/gnome/help/gthumb/fr/figures/nav-button.png
+share/gnome/help/gthumb/fr/figures/palette.png
+share/gnome/help/gthumb/fr/figures/preferences.png
+share/gnome/help/gthumb/fr/figures/specific-filter.png
+share/gnome/help/gthumb/fr/figures/thumbnail-pane.png
+share/gnome/help/gthumb/fr/filtering.page
+share/gnome/help/gthumb/fr/fullscreen.page
+share/gnome/help/gthumb/fr/gimp.page
+share/gnome/help/gthumb/fr/import.page
+share/gnome/help/gthumb/fr/index.page
+share/gnome/help/gthumb/fr/introduction.page
+share/gnome/help/gthumb/fr/legal.xml
+share/gnome/help/gthumb/fr/printing.page
+share/gnome/help/gthumb/fr/rename-series.page
+share/gnome/help/gthumb/fr/sharing-disc.page
+share/gnome/help/gthumb/fr/shortcuts.page
+share/gnome/help/gthumb/fr/slideshow.page
+share/gnome/help/gthumb/fr/sorting.page
+share/gnome/help/gthumb/fr/strftime.page
+share/gnome/help/gthumb/fr/thumbnails.page
+share/gnome/help/gthumb/fr/thumbnail-pane.page
+share/gnome/help/gthumb/fr/viewer.page
+share/gnome/help/gthumb/fr/wallpaper.page
+share/gnome/help/gthumb/oc/attributes.page
+share/gnome/help/gthumb/oc/batch-convert-format.page
+share/gnome/help/gthumb/oc/batch-change-date.page
+share/gnome/help/gthumb/oc/batch-resize.page
+share/gnome/help/gthumb/oc/batch-rotate.page
+share/gnome/help/gthumb/oc/batch-scripts.page
+share/gnome/help/gthumb/oc/bookmarks.page
+share/gnome/help/gthumb/oc/browser.page
+share/gnome/help/gthumb/oc/edit-colors.page
+share/gnome/help/gthumb/oc/edit-redeye.page
+share/gnome/help/gthumb/oc/edit-resize-crop.page
+share/gnome/help/gthumb/oc/edit-rotate.page
+share/gnome/help/gthumb/oc/edit-save-undo-redo.page
+share/gnome/help/gthumb/oc/extensions.page
+share/gnome/help/gthumb/oc/figures/comment.png
+share/gnome/help/gthumb/oc/figures/general-filter.png
+share/gnome/help/gthumb/oc/figures/import.png
+share/gnome/help/gthumb/oc/figures/import-pref-auto-folder.png
+share/gnome/help/gthumb/oc/figures/import-pref-custom-format.png
+share/gnome/help/gthumb/oc/figures/main-win.png
+share/gnome/help/gthumb/oc/figures/nav-button.png
+share/gnome/help/gthumb/oc/figures/palette.png
+share/gnome/help/gthumb/oc/figures/preferences.png
+share/gnome/help/gthumb/oc/figures/specific-filter.png
+share/gnome/help/gthumb/oc/figures/thumbnail-pane.png
+share/gnome/help/gthumb/oc/filtering.page
+share/gnome/help/gthumb/oc/fullscreen.page
+share/gnome/help/gthumb/oc/gimp.page
+share/gnome/help/gthumb/oc/import.page
+share/gnome/help/gthumb/oc/index.page
+share/gnome/help/gthumb/oc/introduction.page
+share/gnome/help/gthumb/oc/legal.xml
+share/gnome/help/gthumb/oc/printing.page
+share/gnome/help/gthumb/oc/rename-series.page
+share/gnome/help/gthumb/oc/sharing-disc.page
+share/gnome/help/gthumb/oc/shortcuts.page
+share/gnome/help/gthumb/oc/slideshow.page
+share/gnome/help/gthumb/oc/sorting.page
+share/gnome/help/gthumb/oc/strftime.page
+share/gnome/help/gthumb/oc/thumbnails.page
+share/gnome/help/gthumb/oc/thumbnail-pane.page
+share/gnome/help/gthumb/oc/viewer.page
+share/gnome/help/gthumb/oc/wallpaper.page
+share/gnome/help/gthumb/sl/attributes.page
+share/gnome/help/gthumb/sl/batch-convert-format.page
+share/gnome/help/gthumb/sl/batch-change-date.page
+share/gnome/help/gthumb/sl/batch-resize.page
+share/gnome/help/gthumb/sl/batch-rotate.page
+share/gnome/help/gthumb/sl/batch-scripts.page
+share/gnome/help/gthumb/sl/bookmarks.page
+share/gnome/help/gthumb/sl/browser.page
+share/gnome/help/gthumb/sl/edit-colors.page
+share/gnome/help/gthumb/sl/edit-redeye.page
+share/gnome/help/gthumb/sl/edit-resize-crop.page
+share/gnome/help/gthumb/sl/edit-rotate.page
+share/gnome/help/gthumb/sl/edit-save-undo-redo.page
+share/gnome/help/gthumb/sl/extensions.page
+share/gnome/help/gthumb/sl/figures/comment.png
+share/gnome/help/gthumb/sl/figures/general-filter.png
+share/gnome/help/gthumb/sl/figures/import.png
+share/gnome/help/gthumb/sl/figures/import-pref-auto-folder.png
+share/gnome/help/gthumb/sl/figures/import-pref-custom-format.png
+share/gnome/help/gthumb/sl/figures/main-win.png
+share/gnome/help/gthumb/sl/figures/nav-button.png
+share/gnome/help/gthumb/sl/figures/palette.png
+share/gnome/help/gthumb/sl/figures/preferences.png
+share/gnome/help/gthumb/sl/figures/specific-filter.png
+share/gnome/help/gthumb/sl/figures/thumbnail-pane.png
+share/gnome/help/gthumb/sl/filtering.page
+share/gnome/help/gthumb/sl/fullscreen.page
+share/gnome/help/gthumb/sl/gimp.page
+share/gnome/help/gthumb/sl/import.page
+share/gnome/help/gthumb/sl/index.page
+share/gnome/help/gthumb/sl/introduction.page
+share/gnome/help/gthumb/sl/legal.xml
+share/gnome/help/gthumb/sl/printing.page
+share/gnome/help/gthumb/sl/rename-series.page
+share/gnome/help/gthumb/sl/sharing-disc.page
+share/gnome/help/gthumb/sl/shortcuts.page
+share/gnome/help/gthumb/sl/slideshow.page
+share/gnome/help/gthumb/sl/sorting.page
+share/gnome/help/gthumb/sl/strftime.page
+share/gnome/help/gthumb/sl/thumbnails.page
+share/gnome/help/gthumb/sl/thumbnail-pane.page
+share/gnome/help/gthumb/sl/viewer.page
+share/gnome/help/gthumb/sl/wallpaper.page
+share/gnome/help/gthumb/sv/attributes.page
+share/gnome/help/gthumb/sv/batch-convert-format.page
+share/gnome/help/gthumb/sv/batch-change-date.page
+share/gnome/help/gthumb/sv/batch-resize.page
+share/gnome/help/gthumb/sv/batch-rotate.page
+share/gnome/help/gthumb/sv/batch-scripts.page
+share/gnome/help/gthumb/sv/bookmarks.page
+share/gnome/help/gthumb/sv/browser.page
+share/gnome/help/gthumb/sv/edit-colors.page
+share/gnome/help/gthumb/sv/edit-redeye.page
+share/gnome/help/gthumb/sv/edit-resize-crop.page
+share/gnome/help/gthumb/sv/edit-rotate.page
+share/gnome/help/gthumb/sv/edit-save-undo-redo.page
+share/gnome/help/gthumb/sv/extensions.page
+share/gnome/help/gthumb/sv/figures/comment.png
+share/gnome/help/gthumb/sv/figures/general-filter.png
+share/gnome/help/gthumb/sv/figures/import.png
+share/gnome/help/gthumb/sv/figures/import-pref-auto-folder.png
+share/gnome/help/gthumb/sv/figures/import-pref-custom-format.png
+share/gnome/help/gthumb/sv/figures/main-win.png
+share/gnome/help/gthumb/sv/figures/nav-button.png
+share/gnome/help/gthumb/sv/figures/palette.png
+share/gnome/help/gthumb/sv/figures/preferences.png
+share/gnome/help/gthumb/sv/figures/specific-filter.png
+share/gnome/help/gthumb/sv/figures/thumbnail-pane.png
+share/gnome/help/gthumb/sv/filtering.page
+share/gnome/help/gthumb/sv/fullscreen.page
+share/gnome/help/gthumb/sv/gimp.page
+share/gnome/help/gthumb/sv/import.page
+share/gnome/help/gthumb/sv/index.page
+share/gnome/help/gthumb/sv/introduction.page
+share/gnome/help/gthumb/sv/legal.xml
+share/gnome/help/gthumb/sv/printing.page
+share/gnome/help/gthumb/sv/rename-series.page
+share/gnome/help/gthumb/sv/sharing-disc.page
+share/gnome/help/gthumb/sv/shortcuts.page
+share/gnome/help/gthumb/sv/slideshow.page
+share/gnome/help/gthumb/sv/sorting.page
+share/gnome/help/gthumb/sv/strftime.page
+share/gnome/help/gthumb/sv/thumbnails.page
+share/gnome/help/gthumb/sv/thumbnail-pane.page
+share/gnome/help/gthumb/sv/viewer.page
+share/gnome/help/gthumb/sv/wallpaper.page
+share/gnome/help/gthumb/zh_CN/attributes.page
+share/gnome/help/gthumb/zh_CN/batch-convert-format.page
+share/gnome/help/gthumb/zh_CN/batch-change-date.page
+share/gnome/help/gthumb/zh_CN/batch-resize.page
+share/gnome/help/gthumb/zh_CN/batch-rotate.page
+share/gnome/help/gthumb/zh_CN/batch-scripts.page
+share/gnome/help/gthumb/zh_CN/bookmarks.page
+share/gnome/help/gthumb/zh_CN/browser.page
+share/gnome/help/gthumb/zh_CN/edit-colors.page
+share/gnome/help/gthumb/zh_CN/edit-redeye.page
+share/gnome/help/gthumb/zh_CN/edit-resize-crop.page
+share/gnome/help/gthumb/zh_CN/edit-rotate.page
+share/gnome/help/gthumb/zh_CN/edit-save-undo-redo.page
+share/gnome/help/gthumb/zh_CN/extensions.page
+share/gnome/help/gthumb/zh_CN/figures/comment.png
+share/gnome/help/gthumb/zh_CN/figures/general-filter.png
+share/gnome/help/gthumb/zh_CN/figures/import.png
+share/gnome/help/gthumb/zh_CN/figures/import-pref-auto-folder.png
+share/gnome/help/gthumb/zh_CN/figures/import-pref-custom-format.png
+share/gnome/help/gthumb/zh_CN/figures/main-win.png
+share/gnome/help/gthumb/zh_CN/figures/nav-button.png
+share/gnome/help/gthumb/zh_CN/figures/palette.png
+share/gnome/help/gthumb/zh_CN/figures/preferences.png
+share/gnome/help/gthumb/zh_CN/figures/specific-filter.png
+share/gnome/help/gthumb/zh_CN/figures/thumbnail-pane.png
+share/gnome/help/gthumb/zh_CN/filtering.page
+share/gnome/help/gthumb/zh_CN/fullscreen.page
+share/gnome/help/gthumb/zh_CN/gimp.page
+share/gnome/help/gthumb/zh_CN/import.page
+share/gnome/help/gthumb/zh_CN/index.page
+share/gnome/help/gthumb/zh_CN/introduction.page
+share/gnome/help/gthumb/zh_CN/legal.xml
+share/gnome/help/gthumb/zh_CN/printing.page
+share/gnome/help/gthumb/zh_CN/rename-series.page
+share/gnome/help/gthumb/zh_CN/sharing-disc.page
+share/gnome/help/gthumb/zh_CN/shortcuts.page
+share/gnome/help/gthumb/zh_CN/slideshow.page
+share/gnome/help/gthumb/zh_CN/sorting.page
+share/gnome/help/gthumb/zh_CN/strftime.page
+share/gnome/help/gthumb/zh_CN/thumbnails.page
+share/gnome/help/gthumb/zh_CN/thumbnail-pane.page
+share/gnome/help/gthumb/zh_CN/viewer.page
+share/gnome/help/gthumb/zh_CN/wallpaper.page
 share/gthumb/albumthemes/Classic/back.png
-share/gthumb/albumthemes/Classic/background.gif
 share/gthumb/albumthemes/Classic/bot.png
 share/gthumb/albumthemes/Classic/image.gthtml
 share/gthumb/albumthemes/Classic/index.gthtml
@@ -49,9 +638,7 @@ share/gthumb/albumthemes/Classic/right.png
 share/gthumb/albumthemes/Classic/style.css
 share/gthumb/albumthemes/Classic/thumbnail.gthtml
 share/gthumb/albumthemes/Classic/top.png
-share/gthumb/albumthemes/ClassicClips/1.gif
 share/gthumb/albumthemes/ClassicClips/back.png
-share/gthumb/albumthemes/ClassicClips/background.gif
 share/gthumb/albumthemes/ClassicClips/bot.png
 share/gthumb/albumthemes/ClassicClips/image.gthtml
 share/gthumb/albumthemes/ClassicClips/index.gthtml
@@ -64,15 +651,7 @@ share/gthumb/albumthemes/ClassicClips/right.png
 share/gthumb/albumthemes/ClassicClips/style.css
 share/gthumb/albumthemes/ClassicClips/thumbnail.gthtml
 share/gthumb/albumthemes/ClassicClips/top.png
-share/gthumb/albumthemes/Flicker/image.gthtml
-share/gthumb/albumthemes/Flicker/index.gthtml
-share/gthumb/albumthemes/Flicker/layout.css
-share/gthumb/albumthemes/Flicker/preview.png
-share/gthumb/albumthemes/Flicker/style.css
-share/gthumb/albumthemes/Flicker/thumbnail.gthtml
-share/gthumb/albumthemes/NeatRound/1.gif
 share/gthumb/albumthemes/NeatRound/back.png
-share/gthumb/albumthemes/NeatRound/background.gif
 share/gthumb/albumthemes/NeatRound/bot.png
 share/gthumb/albumthemes/NeatRound/image.gthtml
 share/gthumb/albumthemes/NeatRound/index.gthtml
@@ -87,76 +666,140 @@ share/gthumb/albumthemes/NeatRound/thumbnail.gthtml
 share/gthumb/albumthemes/NeatRound/top.png
 share/gthumb/albumthemes/Wiki/image.gthtml
 share/gthumb/albumthemes/Wiki/index.gthtml
-share/gthumb/albumthemes/Wiki/layout.css
 share/gthumb/albumthemes/Wiki/preview.png
 share/gthumb/albumthemes/Wiki/style.css
 share/gthumb/albumthemes/Wiki/thumbnail.gthtml
-share/gthumb/glade/ftp-client-48.png
-share/gthumb/glade/gphoto-48.png
-share/gthumb/glade/gthumb.glade
-share/gthumb/glade/gthumb_camera.glade
-share/gthumb/glade/gthumb_comments.glade
-share/gthumb/glade/gthumb_convert.glade
-share/gthumb/glade/gthumb_crop.glade
-share/gthumb/glade/gthumb_edit.glade
-share/gthumb/glade/gthumb_png_exporter.glade
-share/gthumb/glade/gthumb_preferences.glade
-share/gthumb/glade/gthumb_print.glade
-share/gthumb/glade/gthumb_redeye.glade
-share/gthumb/glade/gthumb_search.glade
-share/gthumb/glade/gthumb_tools.glade
-share/gthumb/glade/gthumb_web_exporter.glade
-share/gthumb/glade/volume-mute.png
-share/gnome/help/gthumb/C/figures/comment.png
-share/gnome/help/gthumb/C/figures/main-win.png
-share/gnome/help/gthumb/C/figures/nav-button.png
-share/gnome/help/gthumb/C/figures/preferences.png
-share/gnome/help/gthumb/C/gthumb.xml
-share/gnome/help/gthumb/C/legal.xml
-share/gnome/help/gthumb/de/figures/comment.png
-share/gnome/help/gthumb/de/figures/main-win.png
-share/gnome/help/gthumb/de/figures/nav-button.png
-share/gnome/help/gthumb/de/figures/preferences.png
-share/gnome/help/gthumb/de/gthumb.xml
-share/gnome/help/gthumb/el/figures/comment.png
-share/gnome/help/gthumb/el/figures/main-win.png
-share/gnome/help/gthumb/el/figures/nav-button.png
-share/gnome/help/gthumb/el/figures/preferences.png
-share/gnome/help/gthumb/el/gthumb.xml
-share/gnome/help/gthumb/es/figures/comment.png
-share/gnome/help/gthumb/es/figures/main-win.png
-share/gnome/help/gthumb/es/figures/nav-button.png
-share/gnome/help/gthumb/es/figures/preferences.png
-share/gnome/help/gthumb/es/gthumb.xml
-share/gnome/help/gthumb/fr/figures/comment.png
-share/gnome/help/gthumb/fr/figures/main-win.png
-share/gnome/help/gthumb/fr/figures/nav-button.png
-share/gnome/help/gthumb/fr/figures/preferences.png
-share/gnome/help/gthumb/fr/gthumb.xml
-share/gnome/help/gthumb/sv/figures/comment.png
-share/gnome/help/gthumb/sv/figures/main-win.png
-share/gnome/help/gthumb/sv/figures/nav-button.png
-share/gnome/help/gthumb/sv/figures/preferences.png
-share/gnome/help/gthumb/sv/gthumb.xml
-share/gnome/help/gthumb/zh_CN/figures/comment.png
-share/gnome/help/gthumb/zh_CN/figures/main-win.png
-share/gnome/help/gthumb/zh_CN/figures/nav-button.png
-share/gnome/help/gthumb/zh_CN/figures/preferences.png
-share/gnome/help/gthumb/zh_CN/gthumb.xml
-share/omf/gthumb/gthumb-C.omf
-share/omf/gthumb/gthumb-de.omf
-share/omf/gthumb/gthumb-el.omf
-share/omf/gthumb/gthumb-es.omf
-share/omf/gthumb/gthumb-fr.omf
-share/omf/gthumb/gthumb-sv.omf
-share/omf/gthumb/gthumb-zh_CN.omf
+share/gthumb/icons/hicolor/scalable/actions/browser-mode.svg
+share/gthumb/icons/hicolor/scalable/actions/file-catalog.svg
+share/gthumb/icons/hicolor/scalable/actions/file-library.svg
+share/gthumb/icons/hicolor/scalable/actions/file-search.svg
+share/gthumb/icons/hicolor/scalable/actions/palette.svg
+share/gthumb/icons/hicolor/scalable/actions/share.svg
+share/gthumb/icons/hicolor/scalable/actions/slideshow-pause.svg
+share/gthumb/icons/hicolor/scalable/actions/tag.svg
+share/gthumb/icons/hicolor/16x16/actions/browser-mode.png
+share/gthumb/icons/hicolor/16x16/actions/facebook.png
+share/gthumb/icons/hicolor/16x16/actions/file-catalog.png
+share/gthumb/icons/hicolor/16x16/actions/file-library.png
+share/gthumb/icons/hicolor/16x16/actions/file-search.png
+share/gthumb/icons/hicolor/16x16/actions/flickr.png
+share/gthumb/icons/hicolor/16x16/actions/histogram.png
+share/gthumb/icons/hicolor/16x16/actions/image-navigator.png
+share/gthumb/icons/hicolor/16x16/actions/photobucket.png
+share/gthumb/icons/hicolor/16x16/actions/picasaweb.png
+share/gthumb/icons/hicolor/16x16/actions/tool-adjust-colors.png
+share/gthumb/icons/hicolor/16x16/actions/tool-crop.png
+share/gthumb/icons/hicolor/16x16/actions/tool-desaturate.png
+share/gthumb/icons/hicolor/16x16/actions/tool-enhance.png
+share/gthumb/icons/hicolor/16x16/actions/tool-flip.png
+share/gthumb/icons/hicolor/16x16/actions/tool-invert.png
+share/gthumb/icons/hicolor/16x16/actions/tool-mirror.png
+share/gthumb/icons/hicolor/16x16/actions/tool-red-eye.png
+share/gthumb/icons/hicolor/16x16/actions/tool-resize.png
+share/gthumb/icons/hicolor/16x16/actions/tool-rotate-270.png
+share/gthumb/icons/hicolor/16x16/actions/tool-rotate-90.png
+share/gthumb/icons/hicolor/22x22/actions/browser-mode.png
+share/gthumb/icons/hicolor/22x22/actions/file-catalog.png
+share/gthumb/icons/hicolor/22x22/actions/file-library.png
+share/gthumb/icons/hicolor/22x22/actions/file-search.png
+share/gthumb/icons/hicolor/22x22/actions/histogram.png
+share/gthumb/icons/hicolor/22x22/actions/palette.png
+share/gthumb/icons/hicolor/22x22/actions/share.png
+share/gthumb/icons/hicolor/22x22/actions/tool-adjust-colors.png
+share/gthumb/icons/hicolor/22x22/actions/tool-crop.png
+share/gthumb/icons/hicolor/22x22/actions/tool-desaturate.png
+share/gthumb/icons/hicolor/22x22/actions/tool-enhance.png
+share/gthumb/icons/hicolor/22x22/actions/tool-red-eye.png
+share/gthumb/icons/hicolor/22x22/actions/tool-resize.png
+share/gthumb/icons/hicolor/22x22/actions/zoom-fit-width.png
+share/gthumb/icons/hicolor/48x48/actions/browser-mode.png
+share/gthumb/icons/hicolor/48x48/actions/file-catalog.png
+share/gthumb/icons/hicolor/48x48/actions/file-library.png
+share/gthumb/icons/hicolor/48x48/actions/file-search.png
+share/gthumb/icons/hicolor/48x48/actions/palette.png
+share/gthumb/ui/add-to-catalog.ui
+share/gthumb/ui/adjust-colors-options.ui
+share/gthumb/ui/ask-value.ui
+share/gthumb/ui/bookmarks.ui
+%%BRASERO%%share/gthumb/ui/burn-disc-options.ui
+%%BRASERO%%share/gthumb/ui/burn-source-selector.ui
+share/gthumb/ui/catalog-properties.ui
+share/gthumb/ui/change-date.ui
+share/gthumb/ui/comments-preferences.ui
+share/gthumb/ui/convert-format.ui
+share/gthumb/ui/crop-options.ui
+share/gthumb/ui/edit-comment-page.ui
+%%EXIV2%%share/gthumb/ui/edit-exiv2-page.ui
+%%SOUP%%share/gthumb/ui/export-to-facebook.ui
+%%SOUP%%share/gthumb/ui/export-to-flickr.ui
+%%SOUP%%share/gthumb/ui/export-to-photobucket.ui
+%%SOUP%%share/gthumb/ui/export-to-picasaweb.ui
+share/gthumb/ui/extensions.ui
+%%SOUP%%share/gthumb/ui/facebook-account-chooser.ui
+%%SOUP%%share/gthumb/ui/facebook-account-manager.ui
+%%SOUP%%share/gthumb/ui/facebook-album-properties.ui
+%%SOUP%%share/gthumb/ui/facebook-ask-authorization.ui
+%%SOUP%%share/gthumb/ui/facebook-complete-authorization.ui
+%%SOUP%%share/gthumb/ui/facebook-export-completed.ui
+share/gthumb/ui/filter-editor.ui
+%%SOUP%%share/gthumb/ui/flicker-account-chooser.ui
+%%SOUP%%share/gthumb/ui/flicker-account-manager.ui
+%%SOUP%%share/gthumb/ui/flicker-ask-authorization.ui
+%%SOUP%%share/gthumb/ui/flicker-complete-authorization.ui
+%%SOUP%%share/gthumb/ui/flicker-export-completed.ui
+share/gthumb/ui/image-viewer-preferences.ui
+%%SOUP%%share/gthumb/ui/import-from-flickr.ui
+%%SOUP%%share/gthumb/ui/import-from-picasaweb.ui
+share/gthumb/ui/import-preferences.ui
+share/gthumb/ui/jpeg-options.ui
+%%GSTREAMER%%share/gthumb/ui/mediabar.ui
+%%SOUP%%share/gthumb/ui/oauth-account-chooser.ui
+%%SOUP%%share/gthumb/ui/oauth-account-manager.ui
+%%SOUP%%share/gthumb/ui/oauth-ask-authorization.ui
+%%SOUP%%share/gthumb/ui/oauth-complete-authorization.ui
+share/gthumb/ui/organize-files.ui
+share/gthumb/ui/organize-files-task.ui
+share/gthumb/ui/overwrite-dialog.ui
+share/gthumb/ui/personalize-filters.ui
+share/gthumb/ui/personalize-scripts.ui
+share/gthumb/ui/photo-importer.ui
+share/gthumb/ui/photo-importer-options.ui
+%%SOUP%%share/gthumb/ui/photobucket-album-properties.ui
+%%SOUP%%share/gthumb/ui/photobucket-export-completed.ui
+%%SOUP%%share/gthumb/ui/picasa-web-account-chooser.ui
+%%SOUP%%share/gthumb/ui/picasa-web-account-manager.ui
+%%SOUP%%share/gthumb/ui/picasa-web-account-properties.ui
+%%SOUP%%share/gthumb/ui/picasa-web-album-properties.ui
+%%SOUP%%share/gthumb/ui/picasa-web-export-completed.ui
+share/gthumb/ui/png-options.ui
+share/gthumb/ui/preferences.ui
+share/gthumb/ui/print-layout.ui
+share/gthumb/ui/red-eye-removal-options.ui
+share/gthumb/ui/rename-series.ui
+share/gthumb/ui/resize-images.ui
+share/gthumb/ui/resize-options.ui
+share/gthumb/ui/save-options-preferences.ui
+%%GSTREAMER%%share/gthumb/ui/save-screenshot.ui
+share/gthumb/ui/script-editor.ui
+share/gthumb/ui/search-editor.ui
+share/gthumb/ui/slideshow-preferences.ui
+share/gthumb/ui/sort-order.ui
+share/gthumb/ui/tag-chooser.ui
+share/gthumb/ui/tga-options.ui
+share/gthumb/ui/tiff-options.ui
+share/gthumb/ui/web-album-exporter.ui
+share/icons/hicolor/16x16/apps/gthumb.png
+share/icons/hicolor/22x22/apps/gthumb.png
+share/icons/hicolor/32x32/apps/gthumb.png
 share/icons/hicolor/48x48/apps/gthumb.png
+share/icons/hicolor/scalable/apps/gthumb.svg
 share/locale/am/LC_MESSAGES/gthumb.mo
 share/locale/ar/LC_MESSAGES/gthumb.mo
 share/locale/az/LC_MESSAGES/gthumb.mo
 share/locale/be/LC_MESSAGES/gthumb.mo
 share/locale/bg/LC_MESSAGES/gthumb.mo
 share/locale/ca/LC_MESSAGES/gthumb.mo
+share/locale/ca@valencia/LC_MESSAGES/gthumb.mo
 share/locale/cs/LC_MESSAGES/gthumb.mo
 share/locale/da/LC_MESSAGES/gthumb.mo
 share/locale/de/LC_MESSAGES/gthumb.mo
@@ -186,15 +829,16 @@ share/locale/lt/LC_MESSAGES/gthumb.mo
 share/locale/lv/LC_MESSAGES/gthumb.mo
 share/locale/mk/LC_MESSAGES/gthumb.mo
 share/locale/ml/LC_MESSAGES/gthumb.mo
-share/locale/mr/LC_MESSAGES/gthumb.mo
 share/locale/ms/LC_MESSAGES/gthumb.mo
 share/locale/nb/LC_MESSAGES/gthumb.mo
 share/locale/nds/LC_MESSAGES/gthumb.mo
 share/locale/ne/LC_MESSAGES/gthumb.mo
 share/locale/nl/LC_MESSAGES/gthumb.mo
 share/locale/nn/LC_MESSAGES/gthumb.mo
+share/locale/oc/LC_MESSAGES/gthumb.mo
 share/locale/pa/LC_MESSAGES/gthumb.mo
 share/locale/pl/LC_MESSAGES/gthumb.mo
+share/locale/ps/LC_MESSAGES/gthumb.mo
 share/locale/pt/LC_MESSAGES/gthumb.mo
 share/locale/pt_BR/LC_MESSAGES/gthumb.mo
 share/locale/ro/LC_MESSAGES/gthumb.mo
@@ -206,8 +850,6 @@ share/locale/sq/LC_MESSAGES/gthumb.mo
 share/locale/sr/LC_MESSAGES/gthumb.mo
 share/locale/sr@Latn/LC_MESSAGES/gthumb.mo
 share/locale/sv/LC_MESSAGES/gthumb.mo
-share/locale/ta/LC_MESSAGES/gthumb.mo
-share/locale/te/LC_MESSAGES/gthumb.mo
 share/locale/th/LC_MESSAGES/gthumb.mo
 share/locale/tr/LC_MESSAGES/gthumb.mo
 share/locale/vi/LC_MESSAGES/gthumb.mo
@@ -230,11 +872,14 @@ share/locale/zh_TW/LC_MESSAGES/gthumb.mo
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
-@dirrm share/omf/gthumb
 @dirrm share/gnome/help/gthumb/zh_CN/figures
 @dirrm share/gnome/help/gthumb/zh_CN
 @dirrm share/gnome/help/gthumb/sv/figures
 @dirrm share/gnome/help/gthumb/sv
+@dirrm share/gnome/help/gthumb/sl/figures
+@dirrm share/gnome/help/gthumb/sl
+@dirrm share/gnome/help/gthumb/oc/figures
+@dirrm share/gnome/help/gthumb/oc
 @dirrm share/gnome/help/gthumb/fr/figures
 @dirrm share/gnome/help/gthumb/fr
 @dirrm share/gnome/help/gthumb/es/figures
@@ -246,15 +891,25 @@ share/locale/zh_TW/LC_MESSAGES/gthumb.mo
 @dirrm share/gnome/help/gthumb/C/figures
 @dirrm share/gnome/help/gthumb/C
 @dirrm share/gnome/help/gthumb
-@dirrm share/gthumb/glade
+@dirrm share/gthumb/ui
+@dirrm share/gthumb/icons/hicolor/48x48/actions
+@dirrm share/gthumb/icons/hicolor/48x48
+@dirrm share/gthumb/icons/hicolor/22x22/actions
+@dirrm share/gthumb/icons/hicolor/22x22
+@dirrm share/gthumb/icons/hicolor/16x16/actions
+@dirrm share/gthumb/icons/hicolor/16x16
+@dirrm share/gthumb/icons/hicolor/scalable/actions
+@dirrm share/gthumb/icons/hicolor/scalable
+@dirrm share/gthumb/icons/hicolor
+@dirrm share/gthumb/icons
 @dirrm share/gthumb/albumthemes/Wiki
 @dirrm share/gthumb/albumthemes/NeatRound
-@dirrm share/gthumb/albumthemes/Flicker
 @dirrm share/gthumb/albumthemes/ClassicClips
 @dirrm share/gthumb/albumthemes/Classic
-@dirrm share/gthumb/albumthemes/BestFit
 @dirrm share/gthumb/albumthemes
 @dirrm share/gthumb
-@dirrm lib/gthumb/modules
-@dirrm lib/gthumb
 @dirrmtry share/applications
+@dirrm lib/gthumb/extensions
+@dirrm lib/gthumb
+@dirrm include/gthumb-%%GTHUMB_VER%%/gthumb
+@dirrm include/gthumb-%%GTHUMB_VER%%