Update to GNOME 2.2.

This is Phase I.  All existing ports have been updated to their GNOME 2.2
counterparts.

4 files changed, 205 insertions, 192 deletions

diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 167f831..26f09c5 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	gal2
-PORTVERSION=	0.0.7
+PORTVERSION=	1.99.1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gal2-0/0.0
-DISTNAME=	${PORTNAME}-0-${PORTVERSION}
+MASTER_SITE_SUBDIR=	sources/gal/1.99
+DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
-		gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui
+LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
+		gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/x11-toolkits/gal2/distinfo b/x11-toolkits/gal2/distinfo
index cae9923..95d431c 100644
--- a/x11-toolkits/gal2/distinfo
+++ b/x11-toolkits/gal2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gal2-0-0.0.7.tar.bz2) = b6d7f0d41c0fcd07a943de3ddb92245e
+MD5 (gnome2/gal-1.99.1.tar.bz2) = 7ce5122053c46a2b5c4445c30cc860b1
diff --git a/x11-toolkits/gal2/files/patch-gal_e-table_e-table-group.c b/x11-toolkits/gal2/files/patch-gal_e-table_e-table-group.c
index d12a6a9..69c1796 100644
--- a/x11-toolkits/gal2/files/patch-gal_e-table_e-table-group.c
+++ b/x11-toolkits/gal2/files/patch-gal_e-table_e-table-group.c
@@ -1,5 +1,5 @@
---- gal/e-table/e-table-group.c.orig	Thu Nov 28 13:51:22 2002
-+++ gal/e-table/e-table-group.c	Thu Nov 28 22:23:01 2002
+--- gal/e-table/e-table-group.c.orig	Wed Nov 20 10:02:06 2002
++++ gal/e-table/e-table-group.c	Thu Feb  6 22:35:27 2003
 @@ -22,6 +22,7 @@
   */
  
@@ -8,17 +8,17 @@
  #include <gtk/gtksignal.h>
  #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
  #include "e-table-group.h"
-@@ -129,13 +130,14 @@
+@@ -128,13 +129,14 @@
  			 ETableHeader     *header,
  			 ETableModel      *model)
  {
 +	va_list args;
  	etg->full_header = full_header;
- 	gtk_object_ref (GTK_OBJECT(etg->full_header));
+ 	g_object_ref (etg->full_header);
  	etg->header = header;
- 	gtk_object_ref (GTK_OBJECT(etg->header));
+ 	g_object_ref (etg->header);
  	etg->model = model;
- 	gtk_object_ref (GTK_OBJECT(etg->model));
+ 	g_object_ref (etg->model);
 -	gnome_canvas_item_construct (GNOME_CANVAS_ITEM (etg), parent, 0, NULL);
 +	gnome_canvas_item_construct (GNOME_CANVAS_ITEM (etg), parent, 0, args);
  }
diff --git a/x11-toolkits/gal2/pkg-plist b/x11-toolkits/gal2/pkg-plist
index 3309af5..1c8cd99 100644
--- a/x11-toolkits/gal2/pkg-plist
+++ b/x11-toolkits/gal2/pkg-plist
@@ -1,142 +1,153 @@
-include/gal-2-0/gal/e-paned/e-hpaned.h
-include/gal-2-0/gal/e-paned/e-paned.h
-include/gal-2-0/gal/e-paned/e-vpaned.h
-include/gal-2-0/gal/e-table/e-cell-checkbox.h
-include/gal-2-0/gal/e-table/e-cell-combo.h
-include/gal-2-0/gal/e-table/e-cell-date.h
-include/gal-2-0/gal/e-table/e-cell-float.h
-include/gal-2-0/gal/e-table/e-cell-number.h
-include/gal-2-0/gal/e-table/e-cell-pixbuf.h
-include/gal-2-0/gal/e-table/e-cell-popup.h
-include/gal-2-0/gal/e-table/e-cell-progress.h
-include/gal-2-0/gal/e-table/e-cell-size.h
-include/gal-2-0/gal/e-table/e-cell-spin-button.h
-include/gal-2-0/gal/e-table/e-cell-text.h
-include/gal-2-0/gal/e-table/e-cell-toggle.h
-include/gal-2-0/gal/e-table/e-cell-tree.h
-include/gal-2-0/gal/e-table/e-cell-vbox.h
-include/gal-2-0/gal/e-table/e-cell.h
-include/gal-2-0/gal/e-table/e-table-click-to-add.h
-include/gal-2-0/gal/e-table/e-table-col-dnd.h
-include/gal-2-0/gal/e-table/e-table-col.h
-include/gal-2-0/gal/e-table/e-table-column-specification.h
-include/gal-2-0/gal/e-table/e-table-config.h
-include/gal-2-0/gal/e-table/e-table-defines.h
-include/gal-2-0/gal/e-table/e-table-extras.h
-include/gal-2-0/gal/e-table/e-table-field-chooser-dialog.h
-include/gal-2-0/gal/e-table/e-table-field-chooser-item.h
-include/gal-2-0/gal/e-table/e-table-field-chooser.h
-include/gal-2-0/gal/e-table/e-table-group-container.h
-include/gal-2-0/gal/e-table/e-table-group-leaf.h
-include/gal-2-0/gal/e-table/e-table-group.h
-include/gal-2-0/gal/e-table/e-table-header-item.h
-include/gal-2-0/gal/e-table/e-table-header-utils.h
-include/gal-2-0/gal/e-table/e-table-header.h
-include/gal-2-0/gal/e-table/e-table-item.h
-include/gal-2-0/gal/e-table/e-table-memory-callbacks.h
-include/gal-2-0/gal/e-table/e-table-memory-store.h
-include/gal-2-0/gal/e-table/e-table-memory.h
-include/gal-2-0/gal/e-table/e-table-model.h
-include/gal-2-0/gal/e-table/e-table-one.h
-include/gal-2-0/gal/e-table/e-table-scrolled.h
-include/gal-2-0/gal/e-table/e-table-search.h
-include/gal-2-0/gal/e-table/e-table-selection-model.h
-include/gal-2-0/gal/e-table/e-table-simple.h
-include/gal-2-0/gal/e-table/e-table-sort-info.h
-include/gal-2-0/gal/e-table/e-table-sorted-variable.h
-include/gal-2-0/gal/e-table/e-table-sorted.h
-include/gal-2-0/gal/e-table/e-table-sorter.h
-include/gal-2-0/gal/e-table/e-table-sorting-utils.h
-include/gal-2-0/gal/e-table/e-table-specification.h
-include/gal-2-0/gal/e-table/e-table-state.h
-include/gal-2-0/gal/e-table/e-table-subset-variable.h
-include/gal-2-0/gal/e-table/e-table-subset.h
-include/gal-2-0/gal/e-table/e-table-tooltip.h
-include/gal-2-0/gal/e-table/e-table-utils.h
-include/gal-2-0/gal/e-table/e-table-without.h
-include/gal-2-0/gal/e-table/e-table.h
-include/gal-2-0/gal/e-table/e-tree-memory-callbacks.h
-include/gal-2-0/gal/e-table/e-tree-memory.h
-include/gal-2-0/gal/e-table/e-tree-model.h
-include/gal-2-0/gal/e-table/e-tree-scrolled.h
-include/gal-2-0/gal/e-table/e-tree-selection-model.h
-include/gal-2-0/gal/e-table/e-tree-sorted.h
-include/gal-2-0/gal/e-table/e-tree-table-adapter.h
-include/gal-2-0/gal/e-table/e-tree.h
-include/gal-2-0/gal/e-text/e-completion-match.h
-include/gal-2-0/gal/e-text/e-completion-view.h
-include/gal-2-0/gal/e-text/e-completion.h
-include/gal-2-0/gal/e-text/e-entry.h
-include/gal-2-0/gal/e-text/e-table-text-model.h
-include/gal-2-0/gal/e-text/e-text-model-repos.h
-include/gal-2-0/gal/e-text/e-text-model-uri.h
-include/gal-2-0/gal/e-text/e-text-model.h
-include/gal-2-0/gal/e-text/e-text.h
-include/gal-2-0/gal/menus/gal-define-views-dialog.h
-include/gal-2-0/gal/menus/gal-define-views-model.h
-include/gal-2-0/gal/menus/gal-view-collection.h
-include/gal-2-0/gal/menus/gal-view-etable.h
-include/gal-2-0/gal/menus/gal-view-factory-etable.h
-include/gal-2-0/gal/menus/gal-view-factory.h
-include/gal-2-0/gal/menus/gal-view-instance-save-as-dialog.h
-include/gal-2-0/gal/menus/gal-view-instance.h
-include/gal-2-0/gal/menus/gal-view-new-dialog.h
-include/gal-2-0/gal/menus/gal-view.h
-include/gal-2-0/gal/shortcut-bar/e-group-bar.h
-include/gal-2-0/gal/shortcut-bar/e-icon-bar-bg-item.h
-include/gal-2-0/gal/shortcut-bar/e-icon-bar.h
-include/gal-2-0/gal/shortcut-bar/e-shortcut-bar.h
-include/gal-2-0/gal/shortcut-bar/e-shortcut-model.h
-include/gal-2-0/gal/shortcut-bar/e-vscrolled-bar.h
-include/gal-2-0/gal/util/e-bit-array.h
-include/gal-2-0/gal/util/e-cache.h
-include/gal-2-0/gal/util/e-marshal.h
-include/gal-2-0/gal/util/e-sorter-array.h
-include/gal-2-0/gal/util/e-sorter.h
-include/gal-2-0/gal/util/e-text-event-processor-emacs-like.h
-include/gal-2-0/gal/util/e-text-event-processor-types.h
-include/gal-2-0/gal/util/e-text-event-processor.h
-include/gal-2-0/gal/util/e-util.h
-include/gal-2-0/gal/util/e-xml-utils.h
-include/gal-2-0/gal/widgets/color-group.h
-include/gal-2-0/gal/widgets/color-palette.h
-include/gal-2-0/gal/widgets/e-canvas-background.h
-include/gal-2-0/gal/widgets/e-canvas-utils.h
-include/gal-2-0/gal/widgets/e-canvas-vbox.h
-include/gal-2-0/gal/widgets/e-canvas.h
-include/gal-2-0/gal/widgets/e-categories-master-list-array.h
-include/gal-2-0/gal/widgets/e-categories-master-list-combo.h
-include/gal-2-0/gal/widgets/e-categories-master-list-dialog-model.h
-include/gal-2-0/gal/widgets/e-categories-master-list-dialog.h
-include/gal-2-0/gal/widgets/e-categories-master-list-option-menu.h
-include/gal-2-0/gal/widgets/e-categories-master-list.h
-include/gal-2-0/gal/widgets/e-categories.h
-include/gal-2-0/gal/widgets/e-colors.h
-include/gal-2-0/gal/widgets/e-cursors.h
-include/gal-2-0/gal/widgets/e-file-selection.h
-include/gal-2-0/gal/widgets/e-font.h
-include/gal-2-0/gal/widgets/e-gui-utils.h
-include/gal-2-0/gal/widgets/e-hscrollbar.h
-include/gal-2-0/gal/widgets/e-hsv-utils.h
-include/gal-2-0/gal/widgets/e-option-menu.h
-include/gal-2-0/gal/widgets/e-popup-menu.h
-include/gal-2-0/gal/widgets/e-printable.h
-include/gal-2-0/gal/widgets/e-reflow-model.h
-include/gal-2-0/gal/widgets/e-reflow.h
-include/gal-2-0/gal/widgets/e-scroll-frame.h
-include/gal-2-0/gal/widgets/e-selection-model-array.h
-include/gal-2-0/gal/widgets/e-selection-model-simple.h
-include/gal-2-0/gal/widgets/e-selection-model.h
-include/gal-2-0/gal/widgets/e-unicode.h
-include/gal-2-0/gal/widgets/e-vscrollbar.h
-include/gal-2-0/gal/widgets/gtk-combo-box.h
-include/gal-2-0/gal/widgets/gtk-combo-stack.h
-include/gal-2-0/gal/widgets/gtk-combo-text.h
-include/gal-2-0/gal/widgets/widget-color-combo.h
-include/gal-2-0/gal/widgets/widget-pixmap-combo.h
-lib/libgal-2-0.a
-lib/libgal-2-0.so
-lib/libgal-2-0.so.2
+include/gal-2.0/gal/a11y/e-table/gal-a11y-e-cell-registry.h
+include/gal-2.0/gal/a11y/e-table/gal-a11y-e-cell-text.h
+include/gal-2.0/gal/a11y/e-table/gal-a11y-e-cell.h
+include/gal-2.0/gal/a11y/e-table/gal-a11y-e-table-factory.h
+include/gal-2.0/gal/a11y/e-table/gal-a11y-e-table-item.h
+include/gal-2.0/gal/a11y/e-table/gal-a11y-e-table.h
+include/gal-2.0/gal/a11y/e-text/gal-a11y-e-text-factory.h
+include/gal-2.0/gal/a11y/e-text/gal-a11y-e-text.h
+include/gal-2.0/gal/a11y/gal-a11y-util.h
+include/gal-2.0/gal/e-paned/e-hpaned.h
+include/gal-2.0/gal/e-paned/e-paned.h
+include/gal-2.0/gal/e-paned/e-vpaned.h
+include/gal-2.0/gal/e-table/e-cell-checkbox.h
+include/gal-2.0/gal/e-table/e-cell-combo.h
+include/gal-2.0/gal/e-table/e-cell-date.h
+include/gal-2.0/gal/e-table/e-cell-float.h
+include/gal-2.0/gal/e-table/e-cell-number.h
+include/gal-2.0/gal/e-table/e-cell-pixbuf.h
+include/gal-2.0/gal/e-table/e-cell-popup.h
+include/gal-2.0/gal/e-table/e-cell-progress.h
+include/gal-2.0/gal/e-table/e-cell-size.h
+include/gal-2.0/gal/e-table/e-cell-spin-button.h
+include/gal-2.0/gal/e-table/e-cell-text.h
+include/gal-2.0/gal/e-table/e-cell-toggle.h
+include/gal-2.0/gal/e-table/e-cell-tree.h
+include/gal-2.0/gal/e-table/e-cell-vbox.h
+include/gal-2.0/gal/e-table/e-cell.h
+include/gal-2.0/gal/e-table/e-table-click-to-add.h
+include/gal-2.0/gal/e-table/e-table-col-dnd.h
+include/gal-2.0/gal/e-table/e-table-col.h
+include/gal-2.0/gal/e-table/e-table-column-specification.h
+include/gal-2.0/gal/e-table/e-table-config.h
+include/gal-2.0/gal/e-table/e-table-defines.h
+include/gal-2.0/gal/e-table/e-table-extras.h
+include/gal-2.0/gal/e-table/e-table-field-chooser-dialog.h
+include/gal-2.0/gal/e-table/e-table-field-chooser-item.h
+include/gal-2.0/gal/e-table/e-table-field-chooser.h
+include/gal-2.0/gal/e-table/e-table-group-container.h
+include/gal-2.0/gal/e-table/e-table-group-leaf.h
+include/gal-2.0/gal/e-table/e-table-group.h
+include/gal-2.0/gal/e-table/e-table-header-item.h
+include/gal-2.0/gal/e-table/e-table-header-utils.h
+include/gal-2.0/gal/e-table/e-table-header.h
+include/gal-2.0/gal/e-table/e-table-item.h
+include/gal-2.0/gal/e-table/e-table-memory-callbacks.h
+include/gal-2.0/gal/e-table/e-table-memory-store.h
+include/gal-2.0/gal/e-table/e-table-memory.h
+include/gal-2.0/gal/e-table/e-table-model.h
+include/gal-2.0/gal/e-table/e-table-one.h
+include/gal-2.0/gal/e-table/e-table-scrolled.h
+include/gal-2.0/gal/e-table/e-table-search.h
+include/gal-2.0/gal/e-table/e-table-selection-model.h
+include/gal-2.0/gal/e-table/e-table-simple.h
+include/gal-2.0/gal/e-table/e-table-sort-info.h
+include/gal-2.0/gal/e-table/e-table-sorted-variable.h
+include/gal-2.0/gal/e-table/e-table-sorted.h
+include/gal-2.0/gal/e-table/e-table-sorter.h
+include/gal-2.0/gal/e-table/e-table-sorting-utils.h
+include/gal-2.0/gal/e-table/e-table-specification.h
+include/gal-2.0/gal/e-table/e-table-state.h
+include/gal-2.0/gal/e-table/e-table-subset-variable.h
+include/gal-2.0/gal/e-table/e-table-subset.h
+include/gal-2.0/gal/e-table/e-table-tooltip.h
+include/gal-2.0/gal/e-table/e-table-utils.h
+include/gal-2.0/gal/e-table/e-table-without.h
+include/gal-2.0/gal/e-table/e-table.h
+include/gal-2.0/gal/e-table/e-tree-memory-callbacks.h
+include/gal-2.0/gal/e-table/e-tree-memory.h
+include/gal-2.0/gal/e-table/e-tree-model.h
+include/gal-2.0/gal/e-table/e-tree-scrolled.h
+include/gal-2.0/gal/e-table/e-tree-selection-model.h
+include/gal-2.0/gal/e-table/e-tree-sorted.h
+include/gal-2.0/gal/e-table/e-tree-table-adapter.h
+include/gal-2.0/gal/e-table/e-tree.h
+include/gal-2.0/gal/e-text/e-completion-match.h
+include/gal-2.0/gal/e-text/e-completion-view.h
+include/gal-2.0/gal/e-text/e-completion.h
+include/gal-2.0/gal/e-text/e-entry.h
+include/gal-2.0/gal/e-text/e-table-text-model.h
+include/gal-2.0/gal/e-text/e-text-model-repos.h
+include/gal-2.0/gal/e-text/e-text-model-uri.h
+include/gal-2.0/gal/e-text/e-text-model.h
+include/gal-2.0/gal/e-text/e-text.h
+include/gal-2.0/gal/menus/gal-define-views-dialog.h
+include/gal-2.0/gal/menus/gal-define-views-model.h
+include/gal-2.0/gal/menus/gal-view-collection.h
+include/gal-2.0/gal/menus/gal-view-etable.h
+include/gal-2.0/gal/menus/gal-view-factory-etable.h
+include/gal-2.0/gal/menus/gal-view-factory.h
+include/gal-2.0/gal/menus/gal-view-instance-save-as-dialog.h
+include/gal-2.0/gal/menus/gal-view-instance.h
+include/gal-2.0/gal/menus/gal-view-new-dialog.h
+include/gal-2.0/gal/menus/gal-view.h
+include/gal-2.0/gal/shortcut-bar/e-group-bar.h
+include/gal-2.0/gal/shortcut-bar/e-icon-bar-bg-item.h
+include/gal-2.0/gal/shortcut-bar/e-icon-bar.h
+include/gal-2.0/gal/shortcut-bar/e-shortcut-bar.h
+include/gal-2.0/gal/shortcut-bar/e-shortcut-model.h
+include/gal-2.0/gal/shortcut-bar/e-vscrolled-bar.h
+include/gal-2.0/gal/util/e-bit-array.h
+include/gal-2.0/gal/util/e-cache.h
+include/gal-2.0/gal/util/e-iconv.h
+include/gal-2.0/gal/util/e-marshal.h
+include/gal-2.0/gal/util/e-sorter-array.h
+include/gal-2.0/gal/util/e-sorter.h
+include/gal-2.0/gal/util/e-text-event-processor-emacs-like.h
+include/gal-2.0/gal/util/e-text-event-processor-types.h
+include/gal-2.0/gal/util/e-text-event-processor.h
+include/gal-2.0/gal/util/e-util.h
+include/gal-2.0/gal/util/e-xml-utils.h
+include/gal-2.0/gal/widgets/color-group.h
+include/gal-2.0/gal/widgets/color-palette.h
+include/gal-2.0/gal/widgets/e-canvas-background.h
+include/gal-2.0/gal/widgets/e-canvas-utils.h
+include/gal-2.0/gal/widgets/e-canvas-vbox.h
+include/gal-2.0/gal/widgets/e-canvas.h
+include/gal-2.0/gal/widgets/e-categories-master-list-array.h
+include/gal-2.0/gal/widgets/e-categories-master-list-combo.h
+include/gal-2.0/gal/widgets/e-categories-master-list-dialog-model.h
+include/gal-2.0/gal/widgets/e-categories-master-list-dialog.h
+include/gal-2.0/gal/widgets/e-categories-master-list-option-menu.h
+include/gal-2.0/gal/widgets/e-categories-master-list.h
+include/gal-2.0/gal/widgets/e-categories.h
+include/gal-2.0/gal/widgets/e-colors.h
+include/gal-2.0/gal/widgets/e-cursors.h
+include/gal-2.0/gal/widgets/e-file-selection.h
+include/gal-2.0/gal/widgets/e-font.h
+include/gal-2.0/gal/widgets/e-gui-utils.h
+include/gal-2.0/gal/widgets/e-hscrollbar.h
+include/gal-2.0/gal/widgets/e-hsv-utils.h
+include/gal-2.0/gal/widgets/e-option-menu.h
+include/gal-2.0/gal/widgets/e-popup-menu.h
+include/gal-2.0/gal/widgets/e-printable.h
+include/gal-2.0/gal/widgets/e-reflow-model.h
+include/gal-2.0/gal/widgets/e-reflow.h
+include/gal-2.0/gal/widgets/e-scroll-frame.h
+include/gal-2.0/gal/widgets/e-selection-model-array.h
+include/gal-2.0/gal/widgets/e-selection-model-simple.h
+include/gal-2.0/gal/widgets/e-selection-model.h
+include/gal-2.0/gal/widgets/e-unicode.h
+include/gal-2.0/gal/widgets/e-vscrollbar.h
+include/gal-2.0/gal/widgets/gtk-combo-box.h
+include/gal-2.0/gal/widgets/gtk-combo-stack.h
+include/gal-2.0/gal/widgets/gtk-combo-text.h
+include/gal-2.0/gal/widgets/widget-color-combo.h
+include/gal-2.0/gal/widgets/widget-pixmap-combo.h
+lib/gtk-2.0/modules/libgal-a11y-2.0.so
+lib/libgal-2.0.a
+lib/libgal-2.0.so
+lib/libgal-2.0.so.0
 libdata/pkgconfig/gal-2.0.pc
 share/doc/gal2/gal-api.sgml
 share/doc/gal2/gal-decl.txt
@@ -144,46 +155,48 @@ share/doc/gal2/gal-sections.txt
 share/doc/gal2/gal.hierarchy
 share/doc/gal2/gal.signals
 share/doc/gal2/gal.types
-share/gnome/gal-2-0/%%VERSION%%/glade/e-categories-master-list-dialog.glade
-share/gnome/gal-2-0/%%VERSION%%/glade/e-table-config-no-group.glade
-share/gnome/gal-2-0/%%VERSION%%/glade/e-table-config.glade
-share/gnome/gal-2-0/%%VERSION%%/glade/e-table-field-chooser.glade
-share/gnome/gal-2-0/%%VERSION%%/glade/e-table-group.glade
-share/gnome/gal-2-0/%%VERSION%%/glade/gal-categories.glade
-share/gnome/gal-2-0/%%VERSION%%/glade/gal-define-views.glade
-share/gnome/gal-2-0/%%VERSION%%/glade/gal-view-instance-save-as-dialog.glade
-share/gnome/gal-2-0/%%VERSION%%/glade/gal-view-new-dialog.glade
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_birthday_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_business_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_favorites_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_gifts_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_goals_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_holiday-cards_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_holiday_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_hot-contacts_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_ideas_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_international_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_key-customer_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_miscellaneous_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_personal_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_phonecalls_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_status_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_strategies_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_suppliers_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_time-and-expenses_16.png
-@dirrm share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories
-@dirrm share/gnome/gal-2-0/%%VERSION%%/pixmaps
-@dirrm share/gnome/gal-2-0/%%VERSION%%/glade
-@dirrm share/gnome/gal-2-0/%%VERSION%%
-@dirrm share/gnome/gal-2-0
+share/gnome/gal-2.0/%%VERSION%%/glade/e-categories-master-list-dialog.glade
+share/gnome/gal-2.0/%%VERSION%%/glade/e-table-config-no-group.glade
+share/gnome/gal-2.0/%%VERSION%%/glade/e-table-config.glade
+share/gnome/gal-2.0/%%VERSION%%/glade/e-table-field-chooser.glade
+share/gnome/gal-2.0/%%VERSION%%/glade/gal-categories.glade
+share/gnome/gal-2.0/%%VERSION%%/glade/gal-define-views.glade
+share/gnome/gal-2.0/%%VERSION%%/glade/gal-view-instance-save-as-dialog.glade
+share/gnome/gal-2.0/%%VERSION%%/glade/gal-view-new-dialog.glade
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_birthday_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_business_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_favorites_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_gifts_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_goals_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_holiday-cards_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_holiday_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_hot-contacts_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_ideas_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_international_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_key-customer_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_miscellaneous_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_personal_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_phonecalls_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_status_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_strategies_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_suppliers_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_time-and-expenses_16.png
+@dirrm share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories
+@dirrm share/gnome/gal-2.0/%%VERSION%%/pixmaps
+@dirrm share/gnome/gal-2.0/%%VERSION%%/glade
+@dirrm share/gnome/gal-2.0/%%VERSION%%
+@dirrm share/gnome/gal-2.0
 @dirrm share/doc/gal2/gal
 @dirrm share/doc/gal2
-@dirrm include/gal-2-0/gal/widgets
-@dirrm include/gal-2-0/gal/util
-@dirrm include/gal-2-0/gal/shortcut-bar
-@dirrm include/gal-2-0/gal/menus
-@dirrm include/gal-2-0/gal/e-text
-@dirrm include/gal-2-0/gal/e-table
-@dirrm include/gal-2-0/gal/e-paned
-@dirrm include/gal-2-0/gal
-@dirrm include/gal-2-0
+@dirrm include/gal-2.0/gal/widgets
+@dirrm include/gal-2.0/gal/util
+@dirrm include/gal-2.0/gal/shortcut-bar
+@dirrm include/gal-2.0/gal/menus
+@dirrm include/gal-2.0/gal/e-text
+@dirrm include/gal-2.0/gal/e-table
+@dirrm include/gal-2.0/gal/e-paned
+@dirrm include/gal-2.0/gal/a11y/e-text
+@dirrm include/gal-2.0/gal/a11y/e-table
+@dirrm include/gal-2.0/gal/a11y
+@dirrm include/gal-2.0/gal
+@dirrm include/gal-2.0