Update to 0.12. Unfortunately it still doesn't work, even with fixed oaf,

however it goes further that earlier and instead of hanging solidly at
startup tries to launch its components, but goes kaboom (i.e. sig 12) and
dies in agony. Therefore, brave souls with loaded debuggers are welcome to
fix this fscking crap and submit their patches to gnome@FreeBSD.org.

24 files changed, 1650 insertions, 384 deletions

diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile
index b12f0cf56dd..f797e1dc54c 100644
--- a/mail/evolution-devel/Makefile
+++ b/mail/evolution-devel/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	0.10
-PORTREVISION=	1
+PORTVERSION=	0.12
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/evolution
 
 MAINTAINER=	gnome@FreeBSD.org
 
-#LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap <- avoid extra dependency until
+LIB_DEPENDS=	bonobo_conf.0:${PORTSDIR}/devel/bonobo-conf
+#ldap.1:${PORTSDIR}/net/openldap <- avoid extra dependency until
 #						   it actually works
 
-BROKEN=		"Out of sync with latest gal"
+#BROKEN=		"Out of sync with latest gal"
 
 USE_GMAKE=	yes
 USE_BISON=	yes
@@ -25,7 +25,9 @@ USE_X_PREFIX=	yes
 USE_GNOME=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	configure libical/configure
-CONFIGURE_ARGS=	# --with-pisock=${LOCALBASE}/pilot --enable-pilot-conduits=yes
+CONFIGURE_ARGS=	--with-db3-libs=${LOCALBASE}/lib \
+		--with-html-dir=${PREFIX}/share/gnome/html
+# --with-pisock=${LOCALBASE}/pilot --enable-pilot-conduits=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
@@ -37,5 +39,11 @@ pre-patch:
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+	@find ${WRKSRC} -type f -name "*.[ch]" | xargs ${GREP} -l '[^g]iconv.h' | \
+		xargs ${PERL} -pi -e 's|([^g])iconv.h|\1giconv.h|g'
+	@find ${WRKSRC} -type f -name "*.[ch]" | xargs ${GREP} -l '<db.h>' | \
+		xargs ${PERL} -pi -e 's|<db.h>|<db3/db.h>|g'
+	@find ${WRKSRC} -type f -name "*.[ch]" | xargs ${GREP} -l 'wrong DB3' | \
+		xargs ${PERL} -pi -e 's|.*wrong DB3.*||'
 
 .include <bsd.port.mk>
diff --git a/mail/evolution-devel/distinfo b/mail/evolution-devel/distinfo
index 8c6c7293dfb..a30b516e403 100644
--- a/mail/evolution-devel/distinfo
+++ b/mail/evolution-devel/distinfo
@@ -1 +1 @@
-MD5 (evolution-0.10.tar.gz) = 49470c746f95cda150efa82eb3ee6d53
+MD5 (evolution-0.12.tar.gz) = c5224f6dfa1154b3cce7c31d35c7a48f
diff --git a/mail/evolution-devel/files/patch-aa b/mail/evolution-devel/files/patch-aa
index 033cdbb90dd..74028d1fe44 100644
--- a/mail/evolution-devel/files/patch-aa
+++ b/mail/evolution-devel/files/patch-aa
@@ -1,6 +1,36 @@
---- configure.orig	Wed Sep 13 09:43:40 2000
-+++ configure	Wed Sep 13 13:19:42 2000
-@@ -5709,8 +5709,8 @@
+
+$FreeBSD$
+
+--- configure.orig	Tue Sep  4 17:59:26 2001
++++ configure	Tue Sep  4 18:11:25 2001
+@@ -5667,7 +5667,7 @@
+ 
+ CPPFLAGS_save="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $DB3_CFLAGS"
+-for ac_hdr in db.h db3/db.h
++for ac_hdr in db3/db.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+@@ -5741,7 +5741,7 @@
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+-  { echo "configure: error: Found db.h is not version $evolution_db_version" 1>&2; exit 1; }
++#  { echo "configure: error: Found db.h is not version $evolution_db_version" 1>&2; exit 1; }
+ fi
+ rm -f conftest*
+ 
+@@ -5852,7 +5852,7 @@
+ 
+ echo "$ac_t""$ac_cv_db3_lib_version_match" 1>&6
+ if test "$ac_cv_db3_lib_version_match" = no; then
+-	{ echo "configure: error: db3 headers and library do not match... multiple copies installed?" 1>&2; exit 1; }
++#	{ echo "configure: error: db3 headers and library do not match... multiple copies installed?" 1>&2; exit 1; }
+ fi
+ 
+ CPPFLAGS="$CPPFLAGS_save"
+@@ -6333,8 +6333,8 @@
  fi
  
  
@@ -11,9 +41,9 @@
  
  
  
-@@ -5837,8 +5837,8 @@
-     { echo "configure: error: Did not find gdkpixbuf installed" 1>&2; exit 1; }
- fi
+@@ -6894,8 +6894,8 @@
+ 	fi
+ 
  
 -GLIB_CFLAGS="`glib-config --cflags`"
 -GLIB_LIBS="`glib-config --libs`"
@@ -22,7 +52,7 @@
  
  
  
-@@ -7915,10 +7915,10 @@
+@@ -9415,10 +9415,10 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
diff --git a/mail/evolution-devel/files/patch-camel::camel-mime-filter-charset.c b/mail/evolution-devel/files/patch-camel::camel-mime-filter-charset.c
deleted file mode 100644
index e000e6e0fe4..00000000000
--- a/mail/evolution-devel/files/patch-camel::camel-mime-filter-charset.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- camel/camel-mime-filter-charset.c	2001/03/16 19:41:33	1.1
-+++ camel/camel-mime-filter-charset.c	2001/03/16 19:41:44
-@@ -19,7 +19,7 @@
-  */
- 
- 
--#include <iconv.h>
-+#include <giconv.h>
- 
- #include <string.h>
- #include <errno.h>
diff --git a/mail/evolution-devel/files/patch-camel::camel-mime-utils.c b/mail/evolution-devel/files/patch-camel::camel-mime-utils.c
deleted file mode 100644
index b62a49522d1..00000000000
--- a/mail/evolution-devel/files/patch-camel::camel-mime-utils.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- camel/camel-mime-utils.c	2001/03/16 19:44:50	1.1
-+++ camel/camel-mime-utils.c	2001/03/16 19:45:05
-@@ -33,7 +33,7 @@
- #include <unistd.h>
- 
- #include <unicode.h>
--#include <iconv.h>
-+#include <giconv.h>
- 
- #include <glib.h>
- #include <time.h>
diff --git a/mail/evolution-devel/files/patch-camel::camel-sasl-digest-md5.c b/mail/evolution-devel/files/patch-camel::camel-sasl-digest-md5.c
deleted file mode 100644
index 1158bf03aea..00000000000
--- a/mail/evolution-devel/files/patch-camel::camel-sasl-digest-md5.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- camel/camel-sasl-digest-md5.c	2001/05/16 07:38:17	1.1
-+++ camel/camel-sasl-digest-md5.c	2001/05/16 07:38:45
-@@ -29,7 +29,7 @@
- #include <ctype.h>
- #include <unistd.h>
- 
--#include <iconv.h>
-+#include <giconv.h>
- 
- #define d(x)
- 
diff --git a/mail/evolution-devel/files/patch-camel::camel-store.h b/mail/evolution-devel/files/patch-camel::camel-store.h
new file mode 100644
index 00000000000..ee23828d642
--- /dev/null
+++ b/mail/evolution-devel/files/patch-camel::camel-store.h
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- camel/camel-store.h	2001/09/04 16:45:47	1.1
++++ camel/camel-store.h	2001/09/04 16:46:32
+@@ -33,6 +33,7 @@
+ #pragma }
+ #endif /* __cplusplus }*/
+ 
++#include <sys/types.h>
+ #include <camel/camel-object.h>
+ #include <camel/camel-service.h>
+ 
diff --git a/mail/evolution-devel/files/patch-filter::filter-input.c b/mail/evolution-devel/files/patch-filter::filter-input.c
new file mode 100644
index 00000000000..c25fab446a1
--- /dev/null
+++ b/mail/evolution-devel/files/patch-filter::filter-input.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- filter/filter-input.c	2001/09/04 16:51:06	1.1
++++ filter/filter-input.c	2001/09/04 16:51:29
+@@ -23,6 +23,7 @@
+ #endif
+ 
+ #include <string.h>
++#include <sys/types.h>
+ #include <regex.h>
+ #include <gtk/gtkobject.h>
+ #include <gtk/gtkwidget.h>
diff --git a/mail/evolution-devel/files/patch-mail::openpgp-utils.c b/mail/evolution-devel/files/patch-mail::openpgp-utils.c
deleted file mode 100644
index cfc909ff21f..00000000000
--- a/mail/evolution-devel/files/patch-mail::openpgp-utils.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- mail/openpgp-utils.c	2001/05/16 07:47:09	1.1
-+++ mail/openpgp-utils.c	2001/05/16 07:47:21
-@@ -45,7 +45,7 @@
- #include <unistd.h>
- #include <signal.h>
- 
--#include <iconv.h>
-+#include <giconv.h>
- 
- #include <glib.h>
- #include <libgnome/gnome-defs.h>
diff --git a/mail/evolution-devel/files/patch-shell::e-shortcuts-view-model.c b/mail/evolution-devel/files/patch-shell::e-shortcuts-view-model.c
new file mode 100644
index 00000000000..f32c70d82e3
--- /dev/null
+++ b/mail/evolution-devel/files/patch-shell::e-shortcuts-view-model.c
@@ -0,0 +1,140 @@
+
+$FreeBSD$
+
+--- shell/e-shortcuts-view-model.c	2001/09/04 16:22:15	1.1
++++ shell/e-shortcuts-view-model.c	2001/09/04 16:30:50
+@@ -45,31 +45,71 @@
+ };
+ 
+ 
++/* Utility functions.  */
++
++static GdkPixbuf *
++get_icon_for_item (EShortcutsViewModel *shortcuts_view_model,
++		   const EShortcutItem *item,
++		   gboolean want_mini)
++{
++	EShortcutsViewModelPrivate *priv;
++
++	priv = shortcuts_view_model->priv;
++
++	if (item->type != NULL) {
++		EStorageSet *storage_set;
++		EFolderTypeRegistry *folder_type_registry;
++
++		storage_set = e_shortcuts_get_storage_set (priv->shortcuts);
++		folder_type_registry = e_storage_set_get_folder_type_registry (storage_set);
++
++		return e_folder_type_registry_get_icon_for_type (folder_type_registry,
++								 item->type,
++								 want_mini);
++	}
++
++	g_print ("(%s is not a folder!)\n", item->name);
++
++	return NULL;
++}
++
++
+ /* View initialization.  */
+ 
++static char *
++get_name_with_unread (const EShortcutItem *item)
++{
++	return g_strdup (item->name);
++}
++
+ static void
+ load_group_into_model (EShortcutsViewModel *shortcuts_view_model,
+ 		       int group_num)
+ {
+ 	EShortcutsViewModelPrivate *priv;
+-	EStorageSet *storage_set;
+ 	const GSList *shortcut_list;
+ 	const GSList *p;
+ 
+ 	priv = shortcuts_view_model->priv;
+ 
+-	storage_set = e_shortcuts_get_storage_set (priv->shortcuts);
+-	g_assert (storage_set != NULL);
+-
+ 	shortcut_list = e_shortcuts_get_shortcuts_in_group (priv->shortcuts, group_num);
+ 	if (shortcut_list == NULL)
+ 		return;
+ 
+ 	for (p = shortcut_list; p != NULL; p = p->next) {
+ 		const EShortcutItem *item;
++		char *name_with_unread;
+ 
+ 		item = (const EShortcutItem *) p->data;
+-		e_shortcut_model_add_item (E_SHORTCUT_MODEL (shortcuts_view_model), group_num, -1, item->uri, item->name);
++		name_with_unread = get_name_with_unread (item);
++
++		e_shortcut_model_add_item (E_SHORTCUT_MODEL (shortcuts_view_model),
++					   group_num, -1,
++					   item->uri,
++					   name_with_unread,
++					   get_icon_for_item (shortcuts_view_model, item, FALSE));
++
++		g_free (name_with_unread);
+ 	}
+ }
+ 
+@@ -153,6 +193,7 @@
+ 	EShortcutsViewModel *shortcuts_view_model;
+ 	EShortcutsViewModelPrivate *priv;
+ 	const EShortcutItem *shortcut_item;
++	char *name_with_unread;
+ 
+ 	shortcuts_view_model = E_SHORTCUTS_VIEW_MODEL (data);
+ 	priv = shortcuts_view_model->priv;
+@@ -160,10 +201,14 @@
+ 	shortcut_item = e_shortcuts_get_shortcut (priv->shortcuts, group_num, item_num);
+ 	g_assert (shortcut_item != NULL);
+ 
++	name_with_unread = get_name_with_unread (shortcut_item);
+ 	e_shortcut_model_add_item (E_SHORTCUT_MODEL (shortcuts_view_model),
+ 				   group_num, item_num,
+ 				   shortcut_item->uri,
+-				   shortcut_item->name);
++				   name_with_unread,
++				   get_icon_for_item (shortcuts_view_model, shortcut_item, FALSE));
++
++	g_free (name_with_unread);
+ }
+ 
+ static void
+@@ -187,6 +232,7 @@
+ 	EShortcutsViewModel *shortcuts_view_model;
+ 	EShortcutsViewModelPrivate *priv;
+ 	const EShortcutItem *shortcut_item;
++	char *name_with_unread;
+ 
+ 	shortcuts_view_model = E_SHORTCUTS_VIEW_MODEL (data);
+ 	priv = shortcuts_view_model->priv;
+@@ -194,10 +240,14 @@
+ 	shortcut_item = e_shortcuts_get_shortcut (priv->shortcuts, group_num, item_num);
+ 	g_assert (shortcut_item != NULL);
+ 
++	name_with_unread = get_name_with_unread (shortcut_item);
+ 	e_shortcut_model_update_item (E_SHORTCUT_MODEL (shortcuts_view_model),
+ 				      group_num, item_num,
+ 				      shortcut_item->uri,
+-				      shortcut_item->name);
++				      name_with_unread,
++				      get_icon_for_item (shortcuts_view_model, shortcut_item, FALSE));
++
++	g_free (name_with_unread);
+ }
+ 
+ 
+@@ -213,6 +263,9 @@
+ 	priv = view_model->priv;
+ 
+ 	g_free (priv);
++
++	if (GTK_OBJECT_CLASS (parent_class)->destroy)
++		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+ }
+ 
+ 
diff --git a/mail/evolution-devel/files/patch-shell::e-shortcuts-view.c b/mail/evolution-devel/files/patch-shell::e-shortcuts-view.c
new file mode 100644
index 00000000000..2ff7af4ec1b
--- /dev/null
+++ b/mail/evolution-devel/files/patch-shell::e-shortcuts-view.c
@@ -0,0 +1,63 @@
+
+$FreeBSD$
+
+--- shell/e-shortcuts-view.c	2001/09/04 16:40:47	1.1
++++ shell/e-shortcuts-view.c	2001/09/04 16:44:17
+@@ -86,47 +86,6 @@
+ 	return colon + 1;
+ }
+ 
+-/* Icon callback for the shortcut bar.  */
+-static GdkPixbuf *
+-icon_callback (EShortcutBar *shortcut_bar,
+-	       const char *uri,
+-	       gpointer data)
+-{
+-	EFolderTypeRegistry *folder_type_registry;
+-	EShortcuts *shortcuts;
+-	EStorageSet *storage_set;
+-	EFolder *folder;
+-	GdkPixbuf *pixbuf;
+-	const char *type;
+-
+-	shortcuts = E_SHORTCUTS (data);
+-
+-	storage_set = e_shortcuts_get_storage_set (shortcuts);
+-	folder_type_registry = e_storage_set_get_folder_type_registry (storage_set);
+-
+-	if (strcmp ("evolution:/My Evolution", uri) == 0) {
+-		type = "My Evolution";
+-	} else {
+-		folder = e_storage_set_get_folder (storage_set,
+-						   get_storage_set_path_from_uri (uri));
+-
+-		if (folder == NULL)
+-			return NULL;
+-		
+-		type = e_folder_get_type_string (folder);
+-		if (type == NULL)
+-			return NULL;
+-	}
+-
+-	/* FIXME mini icons?  */
+-	pixbuf = e_folder_type_registry_get_icon_for_type (folder_type_registry, type, FALSE);
+-
+-	if (pixbuf != NULL)
+-		gdk_pixbuf_ref (pixbuf);
+-
+-	return pixbuf;
+-}
+-
+ 
+ static void
+ show_new_group_dialog (EShortcutsView *view)
+@@ -659,9 +618,6 @@
+ 
+ 	priv->shortcuts = shortcuts;
+ 	gtk_object_ref (GTK_OBJECT (priv->shortcuts));
+-
+-	e_shortcut_bar_set_icon_callback (E_SHORTCUT_BAR (shortcuts_view), icon_callback,
+-					  shortcuts);
+ 
+ 	e_shortcut_bar_set_model (E_SHORTCUT_BAR (shortcuts_view),
+ 				  E_SHORTCUT_MODEL (e_shortcuts_view_model_new (shortcuts)));
diff --git a/mail/evolution-devel/pkg-plist b/mail/evolution-devel/pkg-plist
index 6bde06d3fea..87f6f87489b 100644
--- a/mail/evolution-devel/pkg-plist
+++ b/mail/evolution-devel/pkg-plist
@@ -2,22 +2,31 @@ bin/evolution
 bin/evolution-addressbook
 bin/evolution-alarm-notify
 bin/evolution-calendar
+bin/evolution-elm-importer
 bin/evolution-executive-summary
 bin/evolution-gnomecard-importer
 bin/evolution-mail
 bin/evolution-move-tasks
+bin/evolution-netscape-importer
+bin/evolution-pine-importer
+bin/evolution-vcard-importer
 bin/killev
 bin/load-gnomecard-addressbook
 bin/load-pine-addressbook
-bin/rdf-summary
-bin/test-service
 bin/wombat
 include/camel/broken-date-parser.h
 include/camel/camel-address.h
 include/camel/camel-charset-map.h
+include/camel/camel-cipher-context.h
+include/camel/camel-cms-context.h
 include/camel/camel-data-wrapper.h
+include/camel/camel-digest-folder.h
+include/camel/camel-disco-diary.h
+include/camel/camel-disco-folder.h
+include/camel/camel-disco-store.h
 include/camel/camel-exception-list.def
 include/camel/camel-exception.h
+include/camel/camel-file-utils.h
 include/camel/camel-filter-driver.h
 include/camel/camel-filter-search.h
 include/camel/camel-folder-search.h
@@ -37,6 +46,7 @@ include/camel/camel-internet-address.h
 include/camel/camel-local-folder.h
 include/camel/camel-local-store.h
 include/camel/camel-local-summary.h
+include/camel/camel-lock-client.h
 include/camel/camel-lock.h
 include/camel/camel-maildir-folder.h
 include/camel/camel-maildir-store.h
@@ -57,6 +67,7 @@ include/camel/camel-mime-filter-html.h
 include/camel/camel-mime-filter-index.h
 include/camel/camel-mime-filter-linewrap.h
 include/camel/camel-mime-filter-save.h
+include/camel/camel-mime-filter-stripheader.h
 include/camel/camel-mime-filter.h
 include/camel/camel-mime-message.h
 include/camel/camel-mime-parser.h
@@ -67,6 +78,8 @@ include/camel/camel-movemail.h
 include/camel/camel-multipart.h
 include/camel/camel-object.h
 include/camel/camel-operation.h
+include/camel/camel-pgp-context.h
+include/camel/camel-pgp-mime.h
 include/camel/camel-pop3-folder.h
 include/camel/camel-pop3-store.h
 include/camel/camel-provider.h
@@ -75,6 +88,7 @@ include/camel/camel-sasl-anonymous.h
 include/camel/camel-sasl-cram-md5.h
 include/camel/camel-sasl-digest-md5.h
 include/camel/camel-sasl-kerberos4.h
+include/camel/camel-sasl-login.h
 include/camel/camel-sasl-plain.h
 include/camel/camel-sasl.h
 include/camel/camel-seekable-stream.h
@@ -82,7 +96,12 @@ include/camel/camel-seekable-substream.h
 include/camel/camel-sendmail-transport.h
 include/camel/camel-service.h
 include/camel/camel-session.h
+include/camel/camel-smime-context.h
+include/camel/camel-smime-utils.h
 include/camel/camel-smtp-transport.h
+include/camel/camel-spool-folder.h
+include/camel/camel-spool-store.h
+include/camel/camel-spool-summary.h
 include/camel/camel-store.h
 include/camel/camel-stream-buffer.h
 include/camel/camel-stream-filter.h
@@ -110,6 +129,8 @@ include/ename/e-name-western-tables.h
 include/ename/e-name-western.h
 include/evolution/cal-client/cal-client-types.h
 include/evolution/cal-client/cal-client.h
+include/evolution/cal-client/cal-query.h
+include/evolution/cal-client/evolution-calendar.h
 include/evolution/cal-util/cal-component.h
 include/evolution/cal-util/cal-recur.h
 include/evolution/cal-util/cal-util.h
@@ -120,8 +141,8 @@ include/evolution/ebook/e-book-util.h
 include/evolution/ebook/e-book-view-listener.h
 include/evolution/ebook/e-book-view.h
 include/evolution/ebook/e-book.h
+include/evolution/ebook/e-card-compare.h
 include/evolution/ebook/e-card-cursor.h
-include/evolution/ebook/e-card-pairs.h
 include/evolution/ebook/e-card-simple.h
 include/evolution/ebook/e-card-types.h
 include/evolution/ebook/e-card.h
@@ -131,7 +152,23 @@ include/evolution/importer/evolution-importer-client.h
 include/evolution/importer/evolution-importer-listener.h
 include/evolution/importer/evolution-importer.h
 include/evolution/importer/evolution-intelligent-importer.h
+include/evolution/shell/Evolution.h
+include/evolution/shell/e-folder-tree.h
+include/evolution/shell/evolution-activity-client.h
+include/evolution/shell/evolution-local-storage.h
+include/evolution/shell/evolution-session.h
+include/evolution/shell/evolution-shell-client.h
+include/evolution/shell/evolution-shell-component-client.h
+include/evolution/shell/evolution-shell-component-dnd.h
+include/evolution/shell/evolution-shell-component-utils.h
+include/evolution/shell/evolution-shell-component.h
+include/evolution/shell/evolution-shell-view.h
+include/evolution/shell/evolution-storage-listener.h
+include/evolution/shell/evolution-storage-set-view-listener.h
+include/evolution/shell/evolution-storage.h
+include/evolution/wombat/wombat-client.h
 include/ical.h
+include/icalss.h
 include/libicalvcal/icalvcal.h
 include/libicalvcal/port.h
 include/libicalvcal/vcaltmp.h
@@ -155,15 +192,6 @@ lib/evolution/camel-providers/%%VERSION%%/libcamelsmtp.a
 lib/evolution/camel-providers/%%VERSION%%/libcamelsmtp.so
 lib/evolution/camel-providers/%%VERSION%%/libcamelsmtp.so.0
 lib/evolution/camel-providers/%%VERSION%%/libcamelsmtp.urls
-lib/evolution/evolution-mail-importers/%%VERSION%%/libiielm.a
-lib/evolution/evolution-mail-importers/%%VERSION%%/libiielm.so
-lib/evolution/evolution-mail-importers/%%VERSION%%/libiielm.so.0
-lib/evolution/evolution-mail-importers/%%VERSION%%/libiinetscape.a
-lib/evolution/evolution-mail-importers/%%VERSION%%/libiinetscape.so
-lib/evolution/evolution-mail-importers/%%VERSION%%/libiinetscape.so.0
-lib/evolution/evolution-mail-importers/%%VERSION%%/libiipine.a
-lib/evolution/evolution-mail-importers/%%VERSION%%/libiipine.so
-lib/evolution/evolution-mail-importers/%%VERSION%%/libiipine.so.0
 lib/evolution/evolution-mail-importers/%%VERSION%%/libmbox.a
 lib/evolution/evolution-mail-importers/%%VERSION%%/libmbox.so
 lib/evolution/evolution-mail-importers/%%VERSION%%/libmbox.so.0
@@ -188,19 +216,27 @@ lib/libename.so.0
 lib/libeselectnames.a
 lib/libeselectnames.so
 lib/libeselectnames.so.0
+lib/libeshell.a
+lib/libeshell.so
+lib/libeshell.so.0
 lib/libevolution-importer.a
 lib/libevolution-importer.so
 lib/libevolution-importer.so.0
-lib/libevolution-services.a
-lib/libevolution-services.so
-lib/libevolution-services.so.0
 lib/libical.a
 lib/libical.so
 lib/libical.so.0
+lib/libicalss.a
+lib/libicalss.so
+lib/libicalss.so.0
 lib/libicalvcal.a
 lib/libicalvcal.so
 lib/libicalvcal.so.0
+lib/libwombat.a
+lib/libwombat.so
+lib/libwombat.so.0
+sbin/camel-lock-helper
 share/gnome/apps/Applications/evolution.desktop
+share/gnome/evolution/Locations
 share/gnome/evolution/addresstypes.xml
 share/gnome/evolution/arrow.png
 share/gnome/evolution/default_user/addressbook-sources.xml
@@ -208,7 +244,6 @@ share/gnome/evolution/default_user/local/Calendar/folder-metadata.xml
 share/gnome/evolution/default_user/local/Contacts/create-initial
 share/gnome/evolution/default_user/local/Contacts/folder-metadata.xml
 share/gnome/evolution/default_user/local/Drafts/folder-metadata.xml
-share/gnome/evolution/default_user/local/Executive-Summary/folder-metadata.xml
 share/gnome/evolution/default_user/local/Inbox/folder-metadata.xml
 share/gnome/evolution/default_user/local/Inbox/mbox
 share/gnome/evolution/default_user/local/Outbox/folder-metadata.xml
@@ -216,24 +251,33 @@ share/gnome/evolution/default_user/local/Sent/folder-metadata.xml
 share/gnome/evolution/default_user/local/Tasks/folder-metadata.xml
 share/gnome/evolution/default_user/local/Trash/folder-metadata.xml
 share/gnome/evolution/default_user/searches.xml
-share/gnome/evolution/default_user/shortcuts.xml
 share/gnome/evolution/ecps/medbook.ecps
 share/gnome/evolution/ecps/phonelist.ecps
 share/gnome/evolution/ecps/smallbook.ecps
+share/gnome/evolution/etspec/e-calendar-table.etspec
+share/gnome/evolution/etspec/e-storage-set-view.etspec
+share/gnome/evolution/etspec/meeting-page.etspec
+share/gnome/evolution/etspec/message-list.etspec
 share/gnome/evolution/filtertypes.xml
 share/gnome/evolution/glade/addressbook-config.glade
 share/gnome/evolution/glade/alarm-notify.glade
+share/gnome/evolution/glade/alarm-options.glade
+share/gnome/evolution/glade/alarm-page.glade
 share/gnome/evolution/glade/alphabet.glade
 share/gnome/evolution/glade/cal-prefs-dialog.glade
 share/gnome/evolution/glade/contact-editor.glade
+share/gnome/evolution/glade/contact-list-editor.glade
+share/gnome/evolution/glade/e-active-connection-dialog.glade
+share/gnome/evolution/glade/e-card-duplicate-detected.glade
+share/gnome/evolution/glade/e-card-merging-book-commit-duplicate-detected.glade
 share/gnome/evolution/glade/e-contact-editor-confirm-delete.glade
 share/gnome/evolution/glade/e-contact-print.glade
+share/gnome/evolution/glade/e-delegate-dialog.glade
 share/gnome/evolution/glade/e-itip-control.glade
-share/gnome/evolution/glade/e-meeting-dialog.glade
 share/gnome/evolution/glade/e-msg-composer-attachment.glade
 share/gnome/evolution/glade/e-shell-folder-creation-dialog.glade
-share/gnome/evolution/glade/event-editor-dialog.glade
-share/gnome/evolution/glade/executive-summary-config.glade
+share/gnome/evolution/glade/e-timezone-dialog.glade
+share/gnome/evolution/glade/event-page.glade
 share/gnome/evolution/glade/filter.glade
 share/gnome/evolution/glade/fulladdr.glade
 share/gnome/evolution/glade/fullname.glade
@@ -241,13 +285,17 @@ share/gnome/evolution/glade/goto-dialog.glade
 share/gnome/evolution/glade/import.glade
 share/gnome/evolution/glade/local-config.glade
 share/gnome/evolution/glade/mail-config.glade
+share/gnome/evolution/glade/meeting-page.glade
+share/gnome/evolution/glade/my-evolution.glade
+share/gnome/evolution/glade/recurrence-page.glade
 share/gnome/evolution/glade/select-names.glade
-share/gnome/evolution/glade/task-editor-dialog.glade
-share/gnome/evolution/summary.html
+share/gnome/evolution/glade/task-details-page.glade
+share/gnome/evolution/glade/task-page.glade
 share/gnome/evolution/vfoldertypes.xml
 share/gnome/evolution/views/addressbook/By_Company.galview
 share/gnome/evolution/views/addressbook/Phone_List.galview
 share/gnome/evolution/views/addressbook/galview.xml
+share/gnome/evolution/views/calendar/galview.xml
 share/gnome/evolution/views/mail/By_Sender.galview
 share/gnome/evolution/views/mail/By_Status.galview
 share/gnome/evolution/views/mail/By_Subject.galview
@@ -256,98 +304,12 @@ share/gnome/evolution/views/mail/galview.xml
 share/gnome/evolution/views/tasks/Tasks.galview
 share/gnome/evolution/views/tasks/With_Category.galview
 share/gnome/evolution/views/tasks/galview.xml
-share/gnome/help/evolution/C/aboutbook.html
-share/gnome/help/evolution/C/apx-gloss.html
-share/gnome/help/evolution/C/authors.html
-share/gnome/help/evolution/C/bugs.html
-share/gnome/help/evolution/C/commontasks.html
-share/gnome/help/evolution/C/config-prefs-cal.html
-share/gnome/help/evolution/C/config-prefs-contact.html
-share/gnome/help/evolution/C/config-prefs-general.html
-share/gnome/help/evolution/C/config-prefs.html
-share/gnome/help/evolution/C/config-setupassist.html
-share/gnome/help/evolution/C/config-sync.html
-share/gnome/help/evolution/C/config.html
-share/gnome/help/evolution/C/docbook.css
-share/gnome/help/evolution/C/exec-services-detail.html
-share/gnome/help/evolution/C/fig/calendar.png
-share/gnome/help/evolution/C/fig/config-cal.png
-share/gnome/help/evolution/C/fig/config-mail.png
-share/gnome/help/evolution/C/fig/contact-editor.png
-share/gnome/help/evolution/C/fig/contact.png
-share/gnome/help/evolution/C/fig/filter-assist-fig.png
-share/gnome/help/evolution/C/fig/filter-new-fig.png
-share/gnome/help/evolution/C/fig/mail-composer.png
-share/gnome/help/evolution/C/fig/mail-druid-pic.png
-share/gnome/help/evolution/C/fig/mail-inbox.png
-share/gnome/help/evolution/C/fig/mainwindow-pic.png
-share/gnome/help/evolution/C/fig/print-dest.png
-share/gnome/help/evolution/C/fig/print-preview.png
-share/gnome/help/evolution/C/fig/vfolder-createrule-fig.png
-share/gnome/help/evolution/C/index.html
-share/gnome/help/evolution/C/introduction.html
-share/gnome/help/evolution/C/ln15.html
-share/gnome/help/evolution/C/menuref-cal-editor.html
-share/gnome/help/evolution/C/menuref-cal.html
-share/gnome/help/evolution/C/menuref-contact-editor.html
-share/gnome/help/evolution/C/menuref-exec.html
-share/gnome/help/evolution/C/menuref-mail-editor.html
-share/gnome/help/evolution/C/menuref-mail.html
-share/gnome/help/evolution/C/menuref.html
-share/gnome/help/evolution/C/p2089.html
-share/gnome/help/evolution/C/print-destination.html
-share/gnome/help/evolution/C/stylesheet-images/caution.gif
-share/gnome/help/evolution/C/stylesheet-images/home.gif
-share/gnome/help/evolution/C/stylesheet-images/important.gif
-share/gnome/help/evolution/C/stylesheet-images/next.gif
-share/gnome/help/evolution/C/stylesheet-images/note.gif
-share/gnome/help/evolution/C/stylesheet-images/prev.gif
-share/gnome/help/evolution/C/stylesheet-images/tip.gif
-share/gnome/help/evolution/C/stylesheet-images/toc-blank.gif
-share/gnome/help/evolution/C/stylesheet-images/toc-minus.gif
-share/gnome/help/evolution/C/stylesheet-images/toc-plus.gif
-share/gnome/help/evolution/C/stylesheet-images/up.gif
-share/gnome/help/evolution/C/stylesheet-images/warning.gif
-share/gnome/help/evolution/C/usage-calendar-apts.html
-share/gnome/help/evolution/C/usage-calendar-multiple.html
-share/gnome/help/evolution/C/usage-calendar-todo.html
-share/gnome/help/evolution/C/usage-calendar.html
-share/gnome/help/evolution/C/usage-contact-automate.html
-share/gnome/help/evolution/C/usage-contact-cards.html
-share/gnome/help/evolution/C/usage-contact-organize.html
-share/gnome/help/evolution/C/usage-contact-sharing.html
-share/gnome/help/evolution/C/usage-contact.html
-share/gnome/help/evolution/C/usage-exec-summary.html
-share/gnome/help/evolution/C/usage-mail-organize.html
-share/gnome/help/evolution/C/usage-mail.html
-share/gnome/help/evolution/C/usage-mainwindow-folderbar.html
-share/gnome/help/evolution/C/usage-mainwindow-menubar.html
-share/gnome/help/evolution/C/usage-mainwindow.html
-share/gnome/help/evolution/C/usage-print.html
-share/gnome/help/evolution/C/usage-sync.html
-share/gnome/help/evolution/C/usage.html
-share/gnome/help/evolution/C/x2913.html
-share/gnome/html/evolution-cal-client-decl.txt
-share/gnome/html/evolution-cal-client-sections.txt
-share/gnome/html/evolution-cal-client.args
-share/gnome/html/evolution-cal-client.hierarchy
-share/gnome/html/evolution-cal-client.signals
-share/gnome/html/evolution-cal-client.types
-share/gnome/html/evolution-cal-util-decl.txt
-share/gnome/html/evolution-cal-util-sections.txt
-share/gnome/html/evolution-cal-util.args
-share/gnome/html/evolution-cal-util.hierarchy
-share/gnome/html/evolution-cal-util.signals
-share/gnome/html/evolution-cal-util.types
-share/gnome/html/evolution-services-decl.txt
-share/gnome/html/evolution-services-sections.txt
-share/gnome/html/evolution-services.args
-share/gnome/html/evolution-services.hierarchy
-share/gnome/html/evolution-services.signals
-share/gnome/html/evolution-services.types
 share/gnome/idl/Composer.idl
+share/gnome/idl/Evolution-Activity.idl
 share/gnome/idl/Evolution-Composer.idl
+share/gnome/idl/Evolution-Icon.idl
 share/gnome/idl/Evolution-LocalStorage.idl
+share/gnome/idl/Evolution-Offline.idl
 share/gnome/idl/Evolution-Session.idl
 share/gnome/idl/Evolution-Shell.idl
 share/gnome/idl/Evolution-ShellComponent.idl
@@ -360,8 +322,11 @@ share/gnome/idl/GNOME_Evolution_Importer.idl
 share/gnome/idl/addressbook.idl
 share/gnome/idl/evolution-calendar.idl
 share/gnome/images/evolution/all_contacts.xpm
+share/gnome/images/evolution/apply-filters-16.xpm
+share/gnome/images/evolution/bcg.png
 share/gnome/images/evolution/briefcase.png
 share/gnome/images/evolution/butterfly.png
+share/gnome/images/evolution/buttons/add-attachment.png
 share/gnome/images/evolution/buttons/add-service.png
 share/gnome/images/evolution/buttons/compose-message.png
 share/gnome/images/evolution/buttons/copy-message.png
@@ -371,13 +336,37 @@ share/gnome/images/evolution/buttons/forward.png
 share/gnome/images/evolution/buttons/monthview.xpm
 share/gnome/images/evolution/buttons/move-message.png
 share/gnome/images/evolution/buttons/new_appointment.png
+share/gnome/images/evolution/buttons/next-message.png
+share/gnome/images/evolution/buttons/previous-message.png
+share/gnome/images/evolution/buttons/print-preview-24.png
+share/gnome/images/evolution/buttons/print.png
 share/gnome/images/evolution/buttons/reply-to-all.png
 share/gnome/images/evolution/buttons/reply.png
 share/gnome/images/evolution/buttons/send-24-receive.png
+share/gnome/images/evolution/buttons/send-24.png
 share/gnome/images/evolution/buttons/weekview.xpm
 share/gnome/images/evolution/buttons/workweekview.xpm
 share/gnome/images/evolution/buttons/yearview.xpm
+share/gnome/images/evolution/categories/16_category_birthday.png
+share/gnome/images/evolution/categories/16_category_business.png
+share/gnome/images/evolution/categories/16_category_favorites.png
+share/gnome/images/evolution/categories/16_category_gifts.png
+share/gnome/images/evolution/categories/16_category_goals.png
+share/gnome/images/evolution/categories/16_category_holiday-cards.png
+share/gnome/images/evolution/categories/16_category_holiday.png
+share/gnome/images/evolution/categories/16_category_hot-contacts.png
+share/gnome/images/evolution/categories/16_category_ideas.png
+share/gnome/images/evolution/categories/16_category_international.png
+share/gnome/images/evolution/categories/16_category_key-customer.png
+share/gnome/images/evolution/categories/16_category_miscellaneous.png
+share/gnome/images/evolution/categories/16_category_personal.png
+share/gnome/images/evolution/categories/16_category_phonecalls.png
+share/gnome/images/evolution/categories/16_category_status.png
+share/gnome/images/evolution/categories/16_category_strategies.png
+share/gnome/images/evolution/categories/16_category_suppliers.png
+share/gnome/images/evolution/categories/16_category_time-and-expenses.png
 share/gnome/images/evolution/cellphone.png
+share/gnome/images/evolution/compose-message.png
 share/gnome/images/evolution/conduits/evo-16-address-conduit.png
 share/gnome/images/evolution/conduits/evo-16-calendar-conduit.png
 share/gnome/images/evolution/conduits/evo-16-todo-conduit.png
@@ -388,11 +377,15 @@ share/gnome/images/evolution/configure_16_addressbook.xpm
 share/gnome/images/evolution/configure_16_calendar.xpm
 share/gnome/images/evolution/configure_16_folder.xpm
 share/gnome/images/evolution/configure_16_mail.xpm
+share/gnome/images/evolution/contact-is-a-list.png
 share/gnome/images/evolution/copy_16_message.xpm
 share/gnome/images/evolution/delete_message.xpm
 share/gnome/images/evolution/edit.xpm
+share/gnome/images/evolution/empty.gif
 share/gnome/images/evolution/encrypt.xpm
 share/gnome/images/evolution/envelope.png
+share/gnome/images/evolution/es-appointments.png
+share/gnome/images/evolution/es-weather.png
 share/gnome/images/evolution/evolution-calendar-mini.png
 share/gnome/images/evolution/evolution-calendar.png
 share/gnome/images/evolution/evolution-contacts-mini.png
@@ -410,7 +403,9 @@ share/gnome/images/evolution/evolution-trash-mini.png
 share/gnome/images/evolution/evolution-trash.png
 share/gnome/images/evolution/executive-summary-bg.png
 share/gnome/images/evolution/executive-summary-curve.png
+share/gnome/images/evolution/fetch-mail.png
 share/gnome/images/evolution/find_contact.xpm
+share/gnome/images/evolution/find_message.xpm
 share/gnome/images/evolution/folder.xpm
 share/gnome/images/evolution/forward.xpm
 share/gnome/images/evolution/globe.png
@@ -418,18 +413,40 @@ share/gnome/images/evolution/hide_deleted_messages.xpm
 share/gnome/images/evolution/hide_read_messages.xpm
 share/gnome/images/evolution/hide_selected_messages.xpm
 share/gnome/images/evolution/house.png
+share/gnome/images/evolution/ico-calendar.png
+share/gnome/images/evolution/ico-mail.png
+share/gnome/images/evolution/ico-rdf.png
+share/gnome/images/evolution/ico-weather.png
 share/gnome/images/evolution/import.png
 share/gnome/images/evolution/import.xpm
+share/gnome/images/evolution/mail-config-druid-account-name.png
+share/gnome/images/evolution/mail-config-druid-identity.png
+share/gnome/images/evolution/mail-config-druid-receive.png
+share/gnome/images/evolution/mail-config-druid-send.png
+share/gnome/images/evolution/mail-config-druid.png
 share/gnome/images/evolution/malehead.png
 share/gnome/images/evolution/move_message.xpm
+share/gnome/images/evolution/myweather-clouds.png
+share/gnome/images/evolution/myweather-fog.png
+share/gnome/images/evolution/myweather-rain.png
+share/gnome/images/evolution/myweather-snow.png
+share/gnome/images/evolution/myweather-storm.png
+share/gnome/images/evolution/myweather-sun.png
+share/gnome/images/evolution/myweather-suncloud.png
 share/gnome/images/evolution/new-message.xpm
 share/gnome/images/evolution/new_appointment.xpm
 share/gnome/images/evolution/new_contact.xpm
+share/gnome/images/evolution/offline.png
+share/gnome/images/evolution/online.png
+share/gnome/images/evolution/pattern.png
 share/gnome/images/evolution/print-preview.xpm
 share/gnome/images/evolution/print.xpm
+share/gnome/images/evolution/rdf.png
 share/gnome/images/evolution/reply.xpm
 share/gnome/images/evolution/reply_to_all.xpm
 share/gnome/images/evolution/save.xpm
+share/gnome/images/evolution/send-16.png
+share/gnome/images/evolution/send-later-16.png
 share/gnome/images/evolution/send-receive.xpm
 share/gnome/images/evolution/service-close.png
 share/gnome/images/evolution/service-configure.png
@@ -443,38 +460,420 @@ share/gnome/images/evolution/service-up-disabled.png
 share/gnome/images/evolution/service-up.png
 share/gnome/images/evolution/show_all_messages.xpm
 share/gnome/images/evolution/splash.png
+share/gnome/images/evolution/thankyou.png
 share/gnome/images/evolution/undelete_message.xpm
 share/gnome/images/evolution/work_offline.xpm
+share/gnome/images/evolution/world_map-960.png
+share/gnome/libical/zoneinfo/Africa/Abidjan.ics
+share/gnome/libical/zoneinfo/Africa/Accra.ics
+share/gnome/libical/zoneinfo/Africa/Addis_Ababa.ics
+share/gnome/libical/zoneinfo/Africa/Algiers.ics
+share/gnome/libical/zoneinfo/Africa/Asmera.ics
+share/gnome/libical/zoneinfo/Africa/Bamako.ics
+share/gnome/libical/zoneinfo/Africa/Bangui.ics
+share/gnome/libical/zoneinfo/Africa/Banjul.ics
+share/gnome/libical/zoneinfo/Africa/Bissau.ics
+share/gnome/libical/zoneinfo/Africa/Blantyre.ics
+share/gnome/libical/zoneinfo/Africa/Brazzaville.ics
+share/gnome/libical/zoneinfo/Africa/Bujumbura.ics
+share/gnome/libical/zoneinfo/Africa/Cairo.ics
+share/gnome/libical/zoneinfo/Africa/Casablanca.ics
+share/gnome/libical/zoneinfo/Africa/Ceuta.ics
+share/gnome/libical/zoneinfo/Africa/Conakry.ics
+share/gnome/libical/zoneinfo/Africa/Dakar.ics
+share/gnome/libical/zoneinfo/Africa/Dar_es_Salaam.ics
+share/gnome/libical/zoneinfo/Africa/Djibouti.ics
+share/gnome/libical/zoneinfo/Africa/Douala.ics
+share/gnome/libical/zoneinfo/Africa/El_Aaiun.ics
+share/gnome/libical/zoneinfo/Africa/Freetown.ics
+share/gnome/libical/zoneinfo/Africa/Gaborone.ics
+share/gnome/libical/zoneinfo/Africa/Harare.ics
+share/gnome/libical/zoneinfo/Africa/Johannesburg.ics
+share/gnome/libical/zoneinfo/Africa/Kampala.ics
+share/gnome/libical/zoneinfo/Africa/Khartoum.ics
+share/gnome/libical/zoneinfo/Africa/Kigali.ics
+share/gnome/libical/zoneinfo/Africa/Kinshasa.ics
+share/gnome/libical/zoneinfo/Africa/Lagos.ics
+share/gnome/libical/zoneinfo/Africa/Libreville.ics
+share/gnome/libical/zoneinfo/Africa/Lome.ics
+share/gnome/libical/zoneinfo/Africa/Luanda.ics
+share/gnome/libical/zoneinfo/Africa/Lubumbashi.ics
+share/gnome/libical/zoneinfo/Africa/Lusaka.ics
+share/gnome/libical/zoneinfo/Africa/Malabo.ics
+share/gnome/libical/zoneinfo/Africa/Maputo.ics
+share/gnome/libical/zoneinfo/Africa/Maseru.ics
+share/gnome/libical/zoneinfo/Africa/Mbabane.ics
+share/gnome/libical/zoneinfo/Africa/Mogadishu.ics
+share/gnome/libical/zoneinfo/Africa/Monrovia.ics
+share/gnome/libical/zoneinfo/Africa/Nairobi.ics
+share/gnome/libical/zoneinfo/Africa/Ndjamena.ics
+share/gnome/libical/zoneinfo/Africa/Niamey.ics
+share/gnome/libical/zoneinfo/Africa/Nouakchott.ics
+share/gnome/libical/zoneinfo/Africa/Ouagadougou.ics
+share/gnome/libical/zoneinfo/Africa/Porto-Novo.ics
+share/gnome/libical/zoneinfo/Africa/Sao_Tome.ics
+share/gnome/libical/zoneinfo/Africa/Timbuktu.ics
+share/gnome/libical/zoneinfo/Africa/Tripoli.ics
+share/gnome/libical/zoneinfo/Africa/Tunis.ics
+share/gnome/libical/zoneinfo/Africa/Windhoek.ics
+share/gnome/libical/zoneinfo/America/Adak.ics
+share/gnome/libical/zoneinfo/America/Anchorage.ics
+share/gnome/libical/zoneinfo/America/Anguilla.ics
+share/gnome/libical/zoneinfo/America/Antigua.ics
+share/gnome/libical/zoneinfo/America/Araguaina.ics
+share/gnome/libical/zoneinfo/America/Aruba.ics
+share/gnome/libical/zoneinfo/America/Asuncion.ics
+share/gnome/libical/zoneinfo/America/Barbados.ics
+share/gnome/libical/zoneinfo/America/Belem.ics
+share/gnome/libical/zoneinfo/America/Belize.ics
+share/gnome/libical/zoneinfo/America/Boa_Vista.ics
+share/gnome/libical/zoneinfo/America/Bogota.ics
+share/gnome/libical/zoneinfo/America/Boise.ics
+share/gnome/libical/zoneinfo/America/Buenos_Aires.ics
+share/gnome/libical/zoneinfo/America/Cambridge_Bay.ics
+share/gnome/libical/zoneinfo/America/Cancun.ics
+share/gnome/libical/zoneinfo/America/Caracas.ics
+share/gnome/libical/zoneinfo/America/Catamarca.ics
+share/gnome/libical/zoneinfo/America/Cayenne.ics
+share/gnome/libical/zoneinfo/America/Cayman.ics
+share/gnome/libical/zoneinfo/America/Chicago.ics
+share/gnome/libical/zoneinfo/America/Chihuahua.ics
+share/gnome/libical/zoneinfo/America/Cordoba.ics
+share/gnome/libical/zoneinfo/America/Costa_Rica.ics
+share/gnome/libical/zoneinfo/America/Cuiaba.ics
+share/gnome/libical/zoneinfo/America/Curacao.ics
+share/gnome/libical/zoneinfo/America/Dawson.ics
+share/gnome/libical/zoneinfo/America/Dawson_Creek.ics
+share/gnome/libical/zoneinfo/America/Denver.ics
+share/gnome/libical/zoneinfo/America/Detroit.ics
+share/gnome/libical/zoneinfo/America/Dominica.ics
+share/gnome/libical/zoneinfo/America/Edmonton.ics
+share/gnome/libical/zoneinfo/America/Eirunepe.ics
+share/gnome/libical/zoneinfo/America/El_Salvador.ics
+share/gnome/libical/zoneinfo/America/Fortaleza.ics
+share/gnome/libical/zoneinfo/America/Glace_Bay.ics
+share/gnome/libical/zoneinfo/America/Godthab.ics
+share/gnome/libical/zoneinfo/America/Goose_Bay.ics
+share/gnome/libical/zoneinfo/America/Grand_Turk.ics
+share/gnome/libical/zoneinfo/America/Grenada.ics
+share/gnome/libical/zoneinfo/America/Guadeloupe.ics
+share/gnome/libical/zoneinfo/America/Guatemala.ics
+share/gnome/libical/zoneinfo/America/Guayaquil.ics
+share/gnome/libical/zoneinfo/America/Guyana.ics
+share/gnome/libical/zoneinfo/America/Halifax.ics
+share/gnome/libical/zoneinfo/America/Havana.ics
+share/gnome/libical/zoneinfo/America/Hermosillo.ics
+share/gnome/libical/zoneinfo/America/Indiana/Indianapolis.ics
+share/gnome/libical/zoneinfo/America/Indiana/Knox.ics
+share/gnome/libical/zoneinfo/America/Indiana/Marengo.ics
+share/gnome/libical/zoneinfo/America/Indiana/Vevay.ics
+share/gnome/libical/zoneinfo/America/Indianapolis.ics
+share/gnome/libical/zoneinfo/America/Inuvik.ics
+share/gnome/libical/zoneinfo/America/Iqaluit.ics
+share/gnome/libical/zoneinfo/America/Jamaica.ics
+share/gnome/libical/zoneinfo/America/Jujuy.ics
+share/gnome/libical/zoneinfo/America/Juneau.ics
+share/gnome/libical/zoneinfo/America/Kentucky/Louisville.ics
+share/gnome/libical/zoneinfo/America/Kentucky/Monticello.ics
+share/gnome/libical/zoneinfo/America/La_Paz.ics
+share/gnome/libical/zoneinfo/America/Lima.ics
+share/gnome/libical/zoneinfo/America/Los_Angeles.ics
+share/gnome/libical/zoneinfo/America/Louisville.ics
+share/gnome/libical/zoneinfo/America/Maceio.ics
+share/gnome/libical/zoneinfo/America/Managua.ics
+share/gnome/libical/zoneinfo/America/Manaus.ics
+share/gnome/libical/zoneinfo/America/Martinique.ics
+share/gnome/libical/zoneinfo/America/Mazatlan.ics
+share/gnome/libical/zoneinfo/America/Mendoza.ics
+share/gnome/libical/zoneinfo/America/Menominee.ics
+share/gnome/libical/zoneinfo/America/Merida.ics
+share/gnome/libical/zoneinfo/America/Mexico_City.ics
+share/gnome/libical/zoneinfo/America/Miquelon.ics
+share/gnome/libical/zoneinfo/America/Monterrey.ics
+share/gnome/libical/zoneinfo/America/Montevideo.ics
+share/gnome/libical/zoneinfo/America/Montreal.ics
+share/gnome/libical/zoneinfo/America/Montserrat.ics
+share/gnome/libical/zoneinfo/America/Nassau.ics
+share/gnome/libical/zoneinfo/America/New_York.ics
+share/gnome/libical/zoneinfo/America/Nipigon.ics
+share/gnome/libical/zoneinfo/America/Nome.ics
+share/gnome/libical/zoneinfo/America/Noronha.ics
+share/gnome/libical/zoneinfo/America/Panama.ics
+share/gnome/libical/zoneinfo/America/Pangnirtung.ics
+share/gnome/libical/zoneinfo/America/Paramaribo.ics
+share/gnome/libical/zoneinfo/America/Phoenix.ics
+share/gnome/libical/zoneinfo/America/Port-au-Prince.ics
+share/gnome/libical/zoneinfo/America/Port_of_Spain.ics
+share/gnome/libical/zoneinfo/America/Porto_Velho.ics
+share/gnome/libical/zoneinfo/America/Puerto_Rico.ics
+share/gnome/libical/zoneinfo/America/Rainy_River.ics
+share/gnome/libical/zoneinfo/America/Rankin_Inlet.ics
+share/gnome/libical/zoneinfo/America/Recife.ics
+share/gnome/libical/zoneinfo/America/Regina.ics
+share/gnome/libical/zoneinfo/America/Rio_Branco.ics
+share/gnome/libical/zoneinfo/America/Rosario.ics
+share/gnome/libical/zoneinfo/America/Santiago.ics
+share/gnome/libical/zoneinfo/America/Santo_Domingo.ics
+share/gnome/libical/zoneinfo/America/Sao_Paulo.ics
+share/gnome/libical/zoneinfo/America/Scoresbysund.ics
+share/gnome/libical/zoneinfo/America/Shiprock.ics
+share/gnome/libical/zoneinfo/America/St_Johns.ics
+share/gnome/libical/zoneinfo/America/St_Kitts.ics
+share/gnome/libical/zoneinfo/America/St_Lucia.ics
+share/gnome/libical/zoneinfo/America/St_Thomas.ics
+share/gnome/libical/zoneinfo/America/St_Vincent.ics
+share/gnome/libical/zoneinfo/America/Swift_Current.ics
+share/gnome/libical/zoneinfo/America/Tegucigalpa.ics
+share/gnome/libical/zoneinfo/America/Thule.ics
+share/gnome/libical/zoneinfo/America/Thunder_Bay.ics
+share/gnome/libical/zoneinfo/America/Tijuana.ics
+share/gnome/libical/zoneinfo/America/Tortola.ics
+share/gnome/libical/zoneinfo/America/Vancouver.ics
+share/gnome/libical/zoneinfo/America/Whitehorse.ics
+share/gnome/libical/zoneinfo/America/Winnipeg.ics
+share/gnome/libical/zoneinfo/America/Yakutat.ics
+share/gnome/libical/zoneinfo/America/Yellowknife.ics
+share/gnome/libical/zoneinfo/Antarctica/Casey.ics
+share/gnome/libical/zoneinfo/Antarctica/Davis.ics
+share/gnome/libical/zoneinfo/Antarctica/DumontDUrville.ics
+share/gnome/libical/zoneinfo/Antarctica/Mawson.ics
+share/gnome/libical/zoneinfo/Antarctica/McMurdo.ics
+share/gnome/libical/zoneinfo/Antarctica/Palmer.ics
+share/gnome/libical/zoneinfo/Antarctica/South_Pole.ics
+share/gnome/libical/zoneinfo/Antarctica/Syowa.ics
+share/gnome/libical/zoneinfo/Antarctica/Vostok.ics
+share/gnome/libical/zoneinfo/Arctic/Longyearbyen.ics
+share/gnome/libical/zoneinfo/Asia/Aden.ics
+share/gnome/libical/zoneinfo/Asia/Almaty.ics
+share/gnome/libical/zoneinfo/Asia/Amman.ics
+share/gnome/libical/zoneinfo/Asia/Anadyr.ics
+share/gnome/libical/zoneinfo/Asia/Aqtau.ics
+share/gnome/libical/zoneinfo/Asia/Aqtobe.ics
+share/gnome/libical/zoneinfo/Asia/Ashgabat.ics
+share/gnome/libical/zoneinfo/Asia/Baghdad.ics
+share/gnome/libical/zoneinfo/Asia/Bahrain.ics
+share/gnome/libical/zoneinfo/Asia/Baku.ics
+share/gnome/libical/zoneinfo/Asia/Bangkok.ics
+share/gnome/libical/zoneinfo/Asia/Beirut.ics
+share/gnome/libical/zoneinfo/Asia/Bishkek.ics
+share/gnome/libical/zoneinfo/Asia/Brunei.ics
+share/gnome/libical/zoneinfo/Asia/Calcutta.ics
+share/gnome/libical/zoneinfo/Asia/Chungking.ics
+share/gnome/libical/zoneinfo/Asia/Colombo.ics
+share/gnome/libical/zoneinfo/Asia/Damascus.ics
+share/gnome/libical/zoneinfo/Asia/Dhaka.ics
+share/gnome/libical/zoneinfo/Asia/Dili.ics
+share/gnome/libical/zoneinfo/Asia/Dubai.ics
+share/gnome/libical/zoneinfo/Asia/Dushanbe.ics
+share/gnome/libical/zoneinfo/Asia/Gaza.ics
+share/gnome/libical/zoneinfo/Asia/Harbin.ics
+share/gnome/libical/zoneinfo/Asia/Hong_Kong.ics
+share/gnome/libical/zoneinfo/Asia/Hovd.ics
+share/gnome/libical/zoneinfo/Asia/Irkutsk.ics
+share/gnome/libical/zoneinfo/Asia/Istanbul.ics
+share/gnome/libical/zoneinfo/Asia/Jakarta.ics
+share/gnome/libical/zoneinfo/Asia/Jayapura.ics
+share/gnome/libical/zoneinfo/Asia/Jerusalem.ics
+share/gnome/libical/zoneinfo/Asia/Kabul.ics
+share/gnome/libical/zoneinfo/Asia/Kamchatka.ics
+share/gnome/libical/zoneinfo/Asia/Karachi.ics
+share/gnome/libical/zoneinfo/Asia/Kashgar.ics
+share/gnome/libical/zoneinfo/Asia/Katmandu.ics
+share/gnome/libical/zoneinfo/Asia/Krasnoyarsk.ics
+share/gnome/libical/zoneinfo/Asia/Kuala_Lumpur.ics
+share/gnome/libical/zoneinfo/Asia/Kuching.ics
+share/gnome/libical/zoneinfo/Asia/Kuwait.ics
+share/gnome/libical/zoneinfo/Asia/Macao.ics
+share/gnome/libical/zoneinfo/Asia/Magadan.ics
+share/gnome/libical/zoneinfo/Asia/Manila.ics
+share/gnome/libical/zoneinfo/Asia/Muscat.ics
+share/gnome/libical/zoneinfo/Asia/Nicosia.ics
+share/gnome/libical/zoneinfo/Asia/Novosibirsk.ics
+share/gnome/libical/zoneinfo/Asia/Omsk.ics
+share/gnome/libical/zoneinfo/Asia/Phnom_Penh.ics
+share/gnome/libical/zoneinfo/Asia/Pontianak.ics
+share/gnome/libical/zoneinfo/Asia/Pyongyang.ics
+share/gnome/libical/zoneinfo/Asia/Qatar.ics
+share/gnome/libical/zoneinfo/Asia/Rangoon.ics
+share/gnome/libical/zoneinfo/Asia/Riyadh.ics
+share/gnome/libical/zoneinfo/Asia/Saigon.ics
+share/gnome/libical/zoneinfo/Asia/Samarkand.ics
+share/gnome/libical/zoneinfo/Asia/Seoul.ics
+share/gnome/libical/zoneinfo/Asia/Shanghai.ics
+share/gnome/libical/zoneinfo/Asia/Singapore.ics
+share/gnome/libical/zoneinfo/Asia/Taipei.ics
+share/gnome/libical/zoneinfo/Asia/Tashkent.ics
+share/gnome/libical/zoneinfo/Asia/Tbilisi.ics
+share/gnome/libical/zoneinfo/Asia/Tehran.ics
+share/gnome/libical/zoneinfo/Asia/Thimphu.ics
+share/gnome/libical/zoneinfo/Asia/Tokyo.ics
+share/gnome/libical/zoneinfo/Asia/Ujung_Pandang.ics
+share/gnome/libical/zoneinfo/Asia/Ulaanbaatar.ics
+share/gnome/libical/zoneinfo/Asia/Urumqi.ics
+share/gnome/libical/zoneinfo/Asia/Vientiane.ics
+share/gnome/libical/zoneinfo/Asia/Vladivostok.ics
+share/gnome/libical/zoneinfo/Asia/Yakutsk.ics
+share/gnome/libical/zoneinfo/Asia/Yekaterinburg.ics
+share/gnome/libical/zoneinfo/Asia/Yerevan.ics
+share/gnome/libical/zoneinfo/Atlantic/Azores.ics
+share/gnome/libical/zoneinfo/Atlantic/Bermuda.ics
+share/gnome/libical/zoneinfo/Atlantic/Canary.ics
+share/gnome/libical/zoneinfo/Atlantic/Cape_Verde.ics
+share/gnome/libical/zoneinfo/Atlantic/Faeroe.ics
+share/gnome/libical/zoneinfo/Atlantic/Jan_Mayen.ics
+share/gnome/libical/zoneinfo/Atlantic/Madeira.ics
+share/gnome/libical/zoneinfo/Atlantic/Reykjavik.ics
+share/gnome/libical/zoneinfo/Atlantic/South_Georgia.ics
+share/gnome/libical/zoneinfo/Atlantic/St_Helena.ics
+share/gnome/libical/zoneinfo/Atlantic/Stanley.ics
+share/gnome/libical/zoneinfo/Australia/Adelaide.ics
+share/gnome/libical/zoneinfo/Australia/Brisbane.ics
+share/gnome/libical/zoneinfo/Australia/Broken_Hill.ics
+share/gnome/libical/zoneinfo/Australia/Darwin.ics
+share/gnome/libical/zoneinfo/Australia/Hobart.ics
+share/gnome/libical/zoneinfo/Australia/Lindeman.ics
+share/gnome/libical/zoneinfo/Australia/Lord_Howe.ics
+share/gnome/libical/zoneinfo/Australia/Melbourne.ics
+share/gnome/libical/zoneinfo/Australia/Perth.ics
+share/gnome/libical/zoneinfo/Australia/Sydney.ics
+share/gnome/libical/zoneinfo/Europe/Amsterdam.ics
+share/gnome/libical/zoneinfo/Europe/Andorra.ics
+share/gnome/libical/zoneinfo/Europe/Athens.ics
+share/gnome/libical/zoneinfo/Europe/Belfast.ics
+share/gnome/libical/zoneinfo/Europe/Belgrade.ics
+share/gnome/libical/zoneinfo/Europe/Berlin.ics
+share/gnome/libical/zoneinfo/Europe/Bratislava.ics
+share/gnome/libical/zoneinfo/Europe/Brussels.ics
+share/gnome/libical/zoneinfo/Europe/Bucharest.ics
+share/gnome/libical/zoneinfo/Europe/Budapest.ics
+share/gnome/libical/zoneinfo/Europe/Chisinau.ics
+share/gnome/libical/zoneinfo/Europe/Copenhagen.ics
+share/gnome/libical/zoneinfo/Europe/Dublin.ics
+share/gnome/libical/zoneinfo/Europe/Gibraltar.ics
+share/gnome/libical/zoneinfo/Europe/Helsinki.ics
+share/gnome/libical/zoneinfo/Europe/Istanbul.ics
+share/gnome/libical/zoneinfo/Europe/Kaliningrad.ics
+share/gnome/libical/zoneinfo/Europe/Kiev.ics
+share/gnome/libical/zoneinfo/Europe/Lisbon.ics
+share/gnome/libical/zoneinfo/Europe/Ljubljana.ics
+share/gnome/libical/zoneinfo/Europe/London.ics
+share/gnome/libical/zoneinfo/Europe/Luxembourg.ics
+share/gnome/libical/zoneinfo/Europe/Madrid.ics
+share/gnome/libical/zoneinfo/Europe/Malta.ics
+share/gnome/libical/zoneinfo/Europe/Minsk.ics
+share/gnome/libical/zoneinfo/Europe/Monaco.ics
+share/gnome/libical/zoneinfo/Europe/Moscow.ics
+share/gnome/libical/zoneinfo/Europe/Nicosia.ics
+share/gnome/libical/zoneinfo/Europe/Oslo.ics
+share/gnome/libical/zoneinfo/Europe/Paris.ics
+share/gnome/libical/zoneinfo/Europe/Prague.ics
+share/gnome/libical/zoneinfo/Europe/Riga.ics
+share/gnome/libical/zoneinfo/Europe/Rome.ics
+share/gnome/libical/zoneinfo/Europe/Samara.ics
+share/gnome/libical/zoneinfo/Europe/San_Marino.ics
+share/gnome/libical/zoneinfo/Europe/Sarajevo.ics
+share/gnome/libical/zoneinfo/Europe/Simferopol.ics
+share/gnome/libical/zoneinfo/Europe/Skopje.ics
+share/gnome/libical/zoneinfo/Europe/Sofia.ics
+share/gnome/libical/zoneinfo/Europe/Stockholm.ics
+share/gnome/libical/zoneinfo/Europe/Tallinn.ics
+share/gnome/libical/zoneinfo/Europe/Tirane.ics
+share/gnome/libical/zoneinfo/Europe/Uzhgorod.ics
+share/gnome/libical/zoneinfo/Europe/Vaduz.ics
+share/gnome/libical/zoneinfo/Europe/Vatican.ics
+share/gnome/libical/zoneinfo/Europe/Vienna.ics
+share/gnome/libical/zoneinfo/Europe/Vilnius.ics
+share/gnome/libical/zoneinfo/Europe/Warsaw.ics
+share/gnome/libical/zoneinfo/Europe/Zagreb.ics
+share/gnome/libical/zoneinfo/Europe/Zaporozhye.ics
+share/gnome/libical/zoneinfo/Europe/Zurich.ics
+share/gnome/libical/zoneinfo/Indian/Antananarivo.ics
+share/gnome/libical/zoneinfo/Indian/Chagos.ics
+share/gnome/libical/zoneinfo/Indian/Christmas.ics
+share/gnome/libical/zoneinfo/Indian/Cocos.ics
+share/gnome/libical/zoneinfo/Indian/Comoro.ics
+share/gnome/libical/zoneinfo/Indian/Kerguelen.ics
+share/gnome/libical/zoneinfo/Indian/Mahe.ics
+share/gnome/libical/zoneinfo/Indian/Maldives.ics
+share/gnome/libical/zoneinfo/Indian/Mauritius.ics
+share/gnome/libical/zoneinfo/Indian/Mayotte.ics
+share/gnome/libical/zoneinfo/Indian/Reunion.ics
+share/gnome/libical/zoneinfo/Pacific/Apia.ics
+share/gnome/libical/zoneinfo/Pacific/Auckland.ics
+share/gnome/libical/zoneinfo/Pacific/Chatham.ics
+share/gnome/libical/zoneinfo/Pacific/Easter.ics
+share/gnome/libical/zoneinfo/Pacific/Efate.ics
+share/gnome/libical/zoneinfo/Pacific/Enderbury.ics
+share/gnome/libical/zoneinfo/Pacific/Fakaofo.ics
+share/gnome/libical/zoneinfo/Pacific/Fiji.ics
+share/gnome/libical/zoneinfo/Pacific/Funafuti.ics
+share/gnome/libical/zoneinfo/Pacific/Galapagos.ics
+share/gnome/libical/zoneinfo/Pacific/Gambier.ics
+share/gnome/libical/zoneinfo/Pacific/Guadalcanal.ics
+share/gnome/libical/zoneinfo/Pacific/Guam.ics
+share/gnome/libical/zoneinfo/Pacific/Honolulu.ics
+share/gnome/libical/zoneinfo/Pacific/Johnston.ics
+share/gnome/libical/zoneinfo/Pacific/Kiritimati.ics
+share/gnome/libical/zoneinfo/Pacific/Kosrae.ics
+share/gnome/libical/zoneinfo/Pacific/Kwajalein.ics
+share/gnome/libical/zoneinfo/Pacific/Majuro.ics
+share/gnome/libical/zoneinfo/Pacific/Marquesas.ics
+share/gnome/libical/zoneinfo/Pacific/Midway.ics
+share/gnome/libical/zoneinfo/Pacific/Nauru.ics
+share/gnome/libical/zoneinfo/Pacific/Niue.ics
+share/gnome/libical/zoneinfo/Pacific/Norfolk.ics
+share/gnome/libical/zoneinfo/Pacific/Noumea.ics
+share/gnome/libical/zoneinfo/Pacific/Pago_Pago.ics
+share/gnome/libical/zoneinfo/Pacific/Palau.ics
+share/gnome/libical/zoneinfo/Pacific/Pitcairn.ics
+share/gnome/libical/zoneinfo/Pacific/Ponape.ics
+share/gnome/libical/zoneinfo/Pacific/Port_Moresby.ics
+share/gnome/libical/zoneinfo/Pacific/Rarotonga.ics
+share/gnome/libical/zoneinfo/Pacific/Saipan.ics
+share/gnome/libical/zoneinfo/Pacific/Tahiti.ics
+share/gnome/libical/zoneinfo/Pacific/Tarawa.ics
+share/gnome/libical/zoneinfo/Pacific/Tongatapu.ics
+share/gnome/libical/zoneinfo/Pacific/Truk.ics
+share/gnome/libical/zoneinfo/Pacific/Wake.ics
+share/gnome/libical/zoneinfo/Pacific/Wallis.ics
+share/gnome/libical/zoneinfo/Pacific/Yap.ics
+share/gnome/libical/zoneinfo/zones.tab
 share/gnome/mime-info/evolution.keys
 share/gnome/mime-info/evolution.mime
 share/gnome/oaf/GNOME_Evolution_Addressbook.oaf
-share/gnome/oaf/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf
 share/gnome/oaf/GNOME_Evolution_Addressbook_SelectNames.oaf
+share/gnome/oaf/GNOME_Evolution_Addressbook_VCard_Importer.oaf
 share/gnome/oaf/GNOME_Evolution_Calendar.oaf
 share/gnome/oaf/GNOME_Evolution_Calendar_AlarmNotify.oaf
+share/gnome/oaf/GNOME_Evolution_Elm_Intelligent_Importer.oaf
+share/gnome/oaf/GNOME_Evolution_GnomeCard_Intelligent_Importer.oaf
 share/gnome/oaf/GNOME_Evolution_Mail.oaf
-share/gnome/oaf/GNOME_Evolution_Mail_Elm_Intelligent_Importer.oaf
 share/gnome/oaf/GNOME_Evolution_Mail_Mbox_Importer.oaf
-share/gnome/oaf/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.oaf
 share/gnome/oaf/GNOME_Evolution_Mail_Outlook_Importer.oaf
-share/gnome/oaf/GNOME_Evolution_Mail_Pine_Intelligent_Importer.oaf
+share/gnome/oaf/GNOME_Evolution_Netscape_Intelligent_Importer.oaf
+share/gnome/oaf/GNOME_Evolution_Pine_Intelligent_Importer.oaf
 share/gnome/oaf/GNOME_Evolution_Shell.oaf
 share/gnome/oaf/GNOME_Evolution_Summary.oaf
-share/gnome/oaf/GNOME_Evolution_Summary_rdf.oaf
-share/gnome/oaf/GNOME_Evolution_Summary_test.oaf
 share/gnome/oaf/GNOME_Evolution_Wombat.oaf
 share/gnome/pixmaps/evolution.png
 share/gnome/ui/evolution-addressbook.xml
 share/gnome/ui/evolution-calendar.xml
+share/gnome/ui/evolution-comp-editor.xml
 share/gnome/ui/evolution-contact-editor.xml
+share/gnome/ui/evolution-contact-list-editor.xml
 share/gnome/ui/evolution-event-editor.xml
 share/gnome/ui/evolution-executive-summary.xml
-share/gnome/ui/evolution-mail.xml
+share/gnome/ui/evolution-mail-global.xml
+share/gnome/ui/evolution-mail-list.xml
+share/gnome/ui/evolution-mail-message.xml
+share/gnome/ui/evolution-mail-messagedisplay.xml
 share/gnome/ui/evolution-message-composer.xml
+share/gnome/ui/evolution-signature-editor.xml
 share/gnome/ui/evolution-subscribe.xml
-share/gnome/ui/evolution-task-editor-dialog.xml
+share/gnome/ui/evolution-task-editor.xml
 share/gnome/ui/evolution-tasks.xml
 share/gnome/ui/evolution.xml
+share/gnome/ui/my-evolution.xml
 share/locale/az/LC_MESSAGES/evolution.mo
 share/locale/ca/LC_MESSAGES/evolution.mo
 share/locale/da/LC_MESSAGES/evolution.mo
@@ -497,33 +896,54 @@ share/locale/no/LC_MESSAGES/evolution.mo
 share/locale/pl/LC_MESSAGES/evolution.mo
 share/locale/pt/LC_MESSAGES/evolution.mo
 share/locale/pt_BR/LC_MESSAGES/evolution.mo
+share/locale/ro/LC_MESSAGES/evolution.mo
 share/locale/ru/LC_MESSAGES/evolution.mo
 share/locale/sk/LC_MESSAGES/evolution.mo
 share/locale/sl/LC_MESSAGES/evolution.mo
 share/locale/sv/LC_MESSAGES/evolution.mo
 share/locale/tr/LC_MESSAGES/evolution.mo
 share/locale/uk/LC_MESSAGES/evolution.mo
+@dirrm share/gnome/libical/zoneinfo/Pacific
+@dirrm share/gnome/libical/zoneinfo/Indian
+@dirrm share/gnome/libical/zoneinfo/Europe
+@dirrm share/gnome/libical/zoneinfo/Australia
+@dirrm share/gnome/libical/zoneinfo/Atlantic
+@dirrm share/gnome/libical/zoneinfo/Asia
+@dirrm share/gnome/libical/zoneinfo/Arctic
+@dirrm share/gnome/libical/zoneinfo/Antarctica
+@dirrm share/gnome/libical/zoneinfo/America/Kentucky
+@dirrm share/gnome/libical/zoneinfo/America/Indiana
+@dirrm share/gnome/libical/zoneinfo/America
+@dirrm share/gnome/libical/zoneinfo/Africa
+@dirrm share/gnome/libical/zoneinfo
+@dirrm share/gnome/libical
 @dirrm share/gnome/images/evolution/conduits
+@dirrm share/gnome/images/evolution/categories
 @dirrm share/gnome/images/evolution/buttons
 @dirrm share/gnome/images/evolution
 @dirrm share/gnome/images
-@dirrm share/gnome/help/evolution/C/stylesheet-images
-@dirrm share/gnome/help/evolution/C/fig
+@dirrm share/gnome/html/evolution-devel-guide
+@dirrm share/gnome/html/evolution-cal-util
+@dirrm share/gnome/html/evolution-cal-client
+@dirrm share/gnome/help/evolution/C/evolution-guide/stylesheet-images
+@dirrm share/gnome/help/evolution/C/evolution-guide/fig
+@dirrm share/gnome/help/evolution/C/evolution-guide
+@dirrm share/gnome/help/evolution/C/evolution-faq
 @dirrm share/gnome/help/evolution/C
 @dirrm share/gnome/help/evolution
 @dirrm share/gnome/evolution/views/tasks
 @dirrm share/gnome/evolution/views/mail
+@dirrm share/gnome/evolution/views/calendar
 @dirrm share/gnome/evolution/views/addressbook
 @dirrm share/gnome/evolution/views
 @dirrm share/gnome/evolution/glade
+@dirrm share/gnome/evolution/etspec
 @dirrm share/gnome/evolution/ecps
-@dirrm share/gnome/evolution/default_user/news
 @dirrm share/gnome/evolution/default_user/local/Trash
 @dirrm share/gnome/evolution/default_user/local/Tasks
 @dirrm share/gnome/evolution/default_user/local/Sent
 @dirrm share/gnome/evolution/default_user/local/Outbox
 @dirrm share/gnome/evolution/default_user/local/Inbox
-@dirrm share/gnome/evolution/default_user/local/Executive-Summary
 @dirrm share/gnome/evolution/default_user/local/Drafts
 @dirrm share/gnome/evolution/default_user/local/Contacts
 @dirrm share/gnome/evolution/default_user/local/Calendar
@@ -536,6 +956,8 @@ share/locale/uk/LC_MESSAGES/evolution.mo
 @dirrm lib/evolution/camel-providers
 @dirrm lib/evolution
 @dirrm include/libicalvcal
+@dirrm include/evolution/wombat
+@dirrm include/evolution/shell
 @dirrm include/evolution/importer
 @dirrm include/evolution/ebook
 @dirrm include/evolution/cal-util
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index b12f0cf56dd..f797e1dc54c 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	0.10
-PORTREVISION=	1
+PORTVERSION=	0.12
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/evolution
 
 MAINTAINER=	gnome@FreeBSD.org
 
-#LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap <- avoid extra dependency until
+LIB_DEPENDS=	bonobo_conf.0:${PORTSDIR}/devel/bonobo-conf
+#ldap.1:${PORTSDIR}/net/openldap <- avoid extra dependency until
 #						   it actually works
 
-BROKEN=		"Out of sync with latest gal"
+#BROKEN=		"Out of sync with latest gal"
 
 USE_GMAKE=	yes
 USE_BISON=	yes
@@ -25,7 +25,9 @@ USE_X_PREFIX=	yes
 USE_GNOME=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	configure libical/configure
-CONFIGURE_ARGS=	# --with-pisock=${LOCALBASE}/pilot --enable-pilot-conduits=yes
+CONFIGURE_ARGS=	--with-db3-libs=${LOCALBASE}/lib \
+		--with-html-dir=${PREFIX}/share/gnome/html
+# --with-pisock=${LOCALBASE}/pilot --enable-pilot-conduits=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
@@ -37,5 +39,11 @@ pre-patch:
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+	@find ${WRKSRC} -type f -name "*.[ch]" | xargs ${GREP} -l '[^g]iconv.h' | \
+		xargs ${PERL} -pi -e 's|([^g])iconv.h|\1giconv.h|g'
+	@find ${WRKSRC} -type f -name "*.[ch]" | xargs ${GREP} -l '<db.h>' | \
+		xargs ${PERL} -pi -e 's|<db.h>|<db3/db.h>|g'
+	@find ${WRKSRC} -type f -name "*.[ch]" | xargs ${GREP} -l 'wrong DB3' | \
+		xargs ${PERL} -pi -e 's|.*wrong DB3.*||'
 
 .include <bsd.port.mk>
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 8c6c7293dfb..a30b516e403 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1 +1 @@
-MD5 (evolution-0.10.tar.gz) = 49470c746f95cda150efa82eb3ee6d53
+MD5 (evolution-0.12.tar.gz) = c5224f6dfa1154b3cce7c31d35c7a48f
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index 033cdbb90dd..74028d1fe44 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,6 +1,36 @@
---- configure.orig	Wed Sep 13 09:43:40 2000
-+++ configure	Wed Sep 13 13:19:42 2000
-@@ -5709,8 +5709,8 @@
+
+$FreeBSD$
+
+--- configure.orig	Tue Sep  4 17:59:26 2001
++++ configure	Tue Sep  4 18:11:25 2001
+@@ -5667,7 +5667,7 @@
+ 
+ CPPFLAGS_save="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $DB3_CFLAGS"
+-for ac_hdr in db.h db3/db.h
++for ac_hdr in db3/db.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+@@ -5741,7 +5741,7 @@
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+-  { echo "configure: error: Found db.h is not version $evolution_db_version" 1>&2; exit 1; }
++#  { echo "configure: error: Found db.h is not version $evolution_db_version" 1>&2; exit 1; }
+ fi
+ rm -f conftest*
+ 
+@@ -5852,7 +5852,7 @@
+ 
+ echo "$ac_t""$ac_cv_db3_lib_version_match" 1>&6
+ if test "$ac_cv_db3_lib_version_match" = no; then
+-	{ echo "configure: error: db3 headers and library do not match... multiple copies installed?" 1>&2; exit 1; }
++#	{ echo "configure: error: db3 headers and library do not match... multiple copies installed?" 1>&2; exit 1; }
+ fi
+ 
+ CPPFLAGS="$CPPFLAGS_save"
+@@ -6333,8 +6333,8 @@
  fi
  
  
@@ -11,9 +41,9 @@
  
  
  
-@@ -5837,8 +5837,8 @@
-     { echo "configure: error: Did not find gdkpixbuf installed" 1>&2; exit 1; }
- fi
+@@ -6894,8 +6894,8 @@
+ 	fi
+ 
  
 -GLIB_CFLAGS="`glib-config --cflags`"
 -GLIB_LIBS="`glib-config --libs`"
@@ -22,7 +52,7 @@
  
  
  
-@@ -7915,10 +7915,10 @@
+@@ -9415,10 +9415,10 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
diff --git a/mail/evolution/files/patch-camel::camel-mime-filter-charset.c b/mail/evolution/files/patch-camel::camel-mime-filter-charset.c
deleted file mode 100644
index e000e6e0fe4..00000000000
--- a/mail/evolution/files/patch-camel::camel-mime-filter-charset.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- camel/camel-mime-filter-charset.c	2001/03/16 19:41:33	1.1
-+++ camel/camel-mime-filter-charset.c	2001/03/16 19:41:44
-@@ -19,7 +19,7 @@
-  */
- 
- 
--#include <iconv.h>
-+#include <giconv.h>
- 
- #include <string.h>
- #include <errno.h>
diff --git a/mail/evolution/files/patch-camel::camel-mime-utils.c b/mail/evolution/files/patch-camel::camel-mime-utils.c
deleted file mode 100644
index b62a49522d1..00000000000
--- a/mail/evolution/files/patch-camel::camel-mime-utils.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- camel/camel-mime-utils.c	2001/03/16 19:44:50	1.1
-+++ camel/camel-mime-utils.c	2001/03/16 19:45:05
-@@ -33,7 +33,7 @@
- #include <unistd.h>
- 
- #include <unicode.h>
--#include <iconv.h>
-+#include <giconv.h>
- 
- #include <glib.h>
- #include <time.h>
diff --git a/mail/evolution/files/patch-camel::camel-sasl-digest-md5.c b/mail/evolution/files/patch-camel::camel-sasl-digest-md5.c
deleted file mode 100644
index 1158bf03aea..00000000000
--- a/mail/evolution/files/patch-camel::camel-sasl-digest-md5.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- camel/camel-sasl-digest-md5.c	2001/05/16 07:38:17	1.1
-+++ camel/camel-sasl-digest-md5.c	2001/05/16 07:38:45
-@@ -29,7 +29,7 @@
- #include <ctype.h>
- #include <unistd.h>
- 
--#include <iconv.h>
-+#include <giconv.h>
- 
- #define d(x)
- 
diff --git a/mail/evolution/files/patch-camel::camel-store.h b/mail/evolution/files/patch-camel::camel-store.h
new file mode 100644
index 00000000000..ee23828d642
--- /dev/null
+++ b/mail/evolution/files/patch-camel::camel-store.h
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- camel/camel-store.h	2001/09/04 16:45:47	1.1
++++ camel/camel-store.h	2001/09/04 16:46:32
+@@ -33,6 +33,7 @@
+ #pragma }
+ #endif /* __cplusplus }*/
+ 
++#include <sys/types.h>
+ #include <camel/camel-object.h>
+ #include <camel/camel-service.h>
+ 
diff --git a/mail/evolution/files/patch-filter::filter-input.c b/mail/evolution/files/patch-filter::filter-input.c
new file mode 100644
index 00000000000..c25fab446a1
--- /dev/null
+++ b/mail/evolution/files/patch-filter::filter-input.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- filter/filter-input.c	2001/09/04 16:51:06	1.1
++++ filter/filter-input.c	2001/09/04 16:51:29
+@@ -23,6 +23,7 @@
+ #endif
+ 
+ #include <string.h>
++#include <sys/types.h>
+ #include <regex.h>
+ #include <gtk/gtkobject.h>
+ #include <gtk/gtkwidget.h>
diff --git a/mail/evolution/files/patch-mail::openpgp-utils.c b/mail/evolution/files/patch-mail::openpgp-utils.c
deleted file mode 100644
index cfc909ff21f..00000000000
--- a/mail/evolution/files/patch-mail::openpgp-utils.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- mail/openpgp-utils.c	2001/05/16 07:47:09	1.1
-+++ mail/openpgp-utils.c	2001/05/16 07:47:21
-@@ -45,7 +45,7 @@
- #include <unistd.h>
- #include <signal.h>
- 
--#include <iconv.h>
-+#include <giconv.h>
- 
- #include <glib.h>
- #include <libgnome/gnome-defs.h>
diff --git a/mail/evolution/files/patch-shell::e-shortcuts-view-model.c b/mail/evolution/files/patch-shell::e-shortcuts-view-model.c
new file mode 100644
index 00000000000..f32c70d82e3
--- /dev/null
+++ b/mail/evolution/files/patch-shell::e-shortcuts-view-model.c
@@ -0,0 +1,140 @@
+
+$FreeBSD$
+
+--- shell/e-shortcuts-view-model.c	2001/09/04 16:22:15	1.1
++++ shell/e-shortcuts-view-model.c	2001/09/04 16:30:50
+@@ -45,31 +45,71 @@
+ };
+ 
+ 
++/* Utility functions.  */
++
++static GdkPixbuf *
++get_icon_for_item (EShortcutsViewModel *shortcuts_view_model,
++		   const EShortcutItem *item,
++		   gboolean want_mini)
++{
++	EShortcutsViewModelPrivate *priv;
++
++	priv = shortcuts_view_model->priv;
++
++	if (item->type != NULL) {
++		EStorageSet *storage_set;
++		EFolderTypeRegistry *folder_type_registry;
++
++		storage_set = e_shortcuts_get_storage_set (priv->shortcuts);
++		folder_type_registry = e_storage_set_get_folder_type_registry (storage_set);
++
++		return e_folder_type_registry_get_icon_for_type (folder_type_registry,
++								 item->type,
++								 want_mini);
++	}
++
++	g_print ("(%s is not a folder!)\n", item->name);
++
++	return NULL;
++}
++
++
+ /* View initialization.  */
+ 
++static char *
++get_name_with_unread (const EShortcutItem *item)
++{
++	return g_strdup (item->name);
++}
++
+ static void
+ load_group_into_model (EShortcutsViewModel *shortcuts_view_model,
+ 		       int group_num)
+ {
+ 	EShortcutsViewModelPrivate *priv;
+-	EStorageSet *storage_set;
+ 	const GSList *shortcut_list;
+ 	const GSList *p;
+ 
+ 	priv = shortcuts_view_model->priv;
+ 
+-	storage_set = e_shortcuts_get_storage_set (priv->shortcuts);
+-	g_assert (storage_set != NULL);
+-
+ 	shortcut_list = e_shortcuts_get_shortcuts_in_group (priv->shortcuts, group_num);
+ 	if (shortcut_list == NULL)
+ 		return;
+ 
+ 	for (p = shortcut_list; p != NULL; p = p->next) {
+ 		const EShortcutItem *item;
++		char *name_with_unread;
+ 
+ 		item = (const EShortcutItem *) p->data;
+-		e_shortcut_model_add_item (E_SHORTCUT_MODEL (shortcuts_view_model), group_num, -1, item->uri, item->name);
++		name_with_unread = get_name_with_unread (item);
++
++		e_shortcut_model_add_item (E_SHORTCUT_MODEL (shortcuts_view_model),
++					   group_num, -1,
++					   item->uri,
++					   name_with_unread,
++					   get_icon_for_item (shortcuts_view_model, item, FALSE));
++
++		g_free (name_with_unread);
+ 	}
+ }
+ 
+@@ -153,6 +193,7 @@
+ 	EShortcutsViewModel *shortcuts_view_model;
+ 	EShortcutsViewModelPrivate *priv;
+ 	const EShortcutItem *shortcut_item;
++	char *name_with_unread;
+ 
+ 	shortcuts_view_model = E_SHORTCUTS_VIEW_MODEL (data);
+ 	priv = shortcuts_view_model->priv;
+@@ -160,10 +201,14 @@
+ 	shortcut_item = e_shortcuts_get_shortcut (priv->shortcuts, group_num, item_num);
+ 	g_assert (shortcut_item != NULL);
+ 
++	name_with_unread = get_name_with_unread (shortcut_item);
+ 	e_shortcut_model_add_item (E_SHORTCUT_MODEL (shortcuts_view_model),
+ 				   group_num, item_num,
+ 				   shortcut_item->uri,
+-				   shortcut_item->name);
++				   name_with_unread,
++				   get_icon_for_item (shortcuts_view_model, shortcut_item, FALSE));
++
++	g_free (name_with_unread);
+ }
+ 
+ static void
+@@ -187,6 +232,7 @@
+ 	EShortcutsViewModel *shortcuts_view_model;
+ 	EShortcutsViewModelPrivate *priv;
+ 	const EShortcutItem *shortcut_item;
++	char *name_with_unread;
+ 
+ 	shortcuts_view_model = E_SHORTCUTS_VIEW_MODEL (data);
+ 	priv = shortcuts_view_model->priv;
+@@ -194,10 +240,14 @@
+ 	shortcut_item = e_shortcuts_get_shortcut (priv->shortcuts, group_num, item_num);
+ 	g_assert (shortcut_item != NULL);
+ 
++	name_with_unread = get_name_with_unread (shortcut_item);
+ 	e_shortcut_model_update_item (E_SHORTCUT_MODEL (shortcuts_view_model),
+ 				      group_num, item_num,
+ 				      shortcut_item->uri,
+-				      shortcut_item->name);
++				      name_with_unread,
++				      get_icon_for_item (shortcuts_view_model, shortcut_item, FALSE));
++
++	g_free (name_with_unread);
+ }
+ 
+ 
+@@ -213,6 +263,9 @@
+ 	priv = view_model->priv;
+ 
+ 	g_free (priv);
++
++	if (GTK_OBJECT_CLASS (parent_class)->destroy)
++		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+ }
+ 
+ 
diff --git a/mail/evolution/files/patch-shell::e-shortcuts-view.c b/mail/evolution/files/patch-shell::e-shortcuts-view.c
new file mode 100644
index 00000000000..2ff7af4ec1b
--- /dev/null
+++ b/mail/evolution/files/patch-shell::e-shortcuts-view.c
@@ -0,0 +1,63 @@
+
+$FreeBSD$
+
+--- shell/e-shortcuts-view.c	2001/09/04 16:40:47	1.1
++++ shell/e-shortcuts-view.c	2001/09/04 16:44:17
+@@ -86,47 +86,6 @@
+ 	return colon + 1;
+ }
+ 
+-/* Icon callback for the shortcut bar.  */
+-static GdkPixbuf *
+-icon_callback (EShortcutBar *shortcut_bar,
+-	       const char *uri,
+-	       gpointer data)
+-{
+-	EFolderTypeRegistry *folder_type_registry;
+-	EShortcuts *shortcuts;
+-	EStorageSet *storage_set;
+-	EFolder *folder;
+-	GdkPixbuf *pixbuf;
+-	const char *type;
+-
+-	shortcuts = E_SHORTCUTS (data);
+-
+-	storage_set = e_shortcuts_get_storage_set (shortcuts);
+-	folder_type_registry = e_storage_set_get_folder_type_registry (storage_set);
+-
+-	if (strcmp ("evolution:/My Evolution", uri) == 0) {
+-		type = "My Evolution";
+-	} else {
+-		folder = e_storage_set_get_folder (storage_set,
+-						   get_storage_set_path_from_uri (uri));
+-
+-		if (folder == NULL)
+-			return NULL;
+-		
+-		type = e_folder_get_type_string (folder);
+-		if (type == NULL)
+-			return NULL;
+-	}
+-
+-	/* FIXME mini icons?  */
+-	pixbuf = e_folder_type_registry_get_icon_for_type (folder_type_registry, type, FALSE);
+-
+-	if (pixbuf != NULL)
+-		gdk_pixbuf_ref (pixbuf);
+-
+-	return pixbuf;
+-}
+-
+ 
+ static void
+ show_new_group_dialog (EShortcutsView *view)
+@@ -659,9 +618,6 @@
+ 
+ 	priv->shortcuts = shortcuts;
+ 	gtk_object_ref (GTK_OBJECT (priv->shortcuts));
+-
+-	e_shortcut_bar_set_icon_callback (E_SHORTCUT_BAR (shortcuts_view), icon_callback,
+-					  shortcuts);
+ 
+ 	e_shortcut_bar_set_model (E_SHORTCUT_BAR (shortcuts_view),
+ 				  E_SHORTCUT_MODEL (e_shortcuts_view_model_new (shortcuts)));
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 6bde06d3fea..87f6f87489b 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -2,22 +2,31 @@ bin/evolution
 bin/evolution-addressbook
 bin/evolution-alarm-notify
 bin/evolution-calendar
+bin/evolution-elm-importer
 bin/evolution-executive-summary
 bin/evolution-gnomecard-importer
 bin/evolution-mail
 bin/evolution-move-tasks
+bin/evolution-netscape-importer
+bin/evolution-pine-importer
+bin/evolution-vcard-importer
 bin/killev
 bin/load-gnomecard-addressbook
 bin/load-pine-addressbook
-bin/rdf-summary
-bin/test-service
 bin/wombat
 include/camel/broken-date-parser.h
 include/camel/camel-address.h
 include/camel/camel-charset-map.h
+include/camel/camel-cipher-context.h
+include/camel/camel-cms-context.h
 include/camel/camel-data-wrapper.h
+include/camel/camel-digest-folder.h
+include/camel/camel-disco-diary.h
+include/camel/camel-disco-folder.h
+include/camel/camel-disco-store.h
 include/camel/camel-exception-list.def
 include/camel/camel-exception.h
+include/camel/camel-file-utils.h
 include/camel/camel-filter-driver.h
 include/camel/camel-filter-search.h
 include/camel/camel-folder-search.h
@@ -37,6 +46,7 @@ include/camel/camel-internet-address.h
 include/camel/camel-local-folder.h
 include/camel/camel-local-store.h
 include/camel/camel-local-summary.h
+include/camel/camel-lock-client.h
 include/camel/camel-lock.h
 include/camel/camel-maildir-folder.h
 include/camel/camel-maildir-store.h
@@ -57,6 +67,7 @@ include/camel/camel-mime-filter-html.h
 include/camel/camel-mime-filter-index.h
 include/camel/camel-mime-filter-linewrap.h
 include/camel/camel-mime-filter-save.h
+include/camel/camel-mime-filter-stripheader.h
 include/camel/camel-mime-filter.h
 include/camel/camel-mime-message.h
 include/camel/camel-mime-parser.h
@@ -67,6 +78,8 @@ include/camel/camel-movemail.h
 include/camel/camel-multipart.h
 include/camel/camel-object.h
 include/camel/camel-operation.h
+include/camel/camel-pgp-context.h
+include/camel/camel-pgp-mime.h
 include/camel/camel-pop3-folder.h
 include/camel/camel-pop3-store.h
 include/camel/camel-provider.h
@@ -75,6 +88,7 @@ include/camel/camel-sasl-anonymous.h
 include/camel/camel-sasl-cram-md5.h
 include/camel/camel-sasl-digest-md5.h
 include/camel/camel-sasl-kerberos4.h
+include/camel/camel-sasl-login.h
 include/camel/camel-sasl-plain.h
 include/camel/camel-sasl.h
 include/camel/camel-seekable-stream.h
@@ -82,7 +96,12 @@ include/camel/camel-seekable-substream.h
 include/camel/camel-sendmail-transport.h
 include/camel/camel-service.h
 include/camel/camel-session.h
+include/camel/camel-smime-context.h
+include/camel/camel-smime-utils.h
 include/camel/camel-smtp-transport.h
+include/camel/camel-spool-folder.h
+include/camel/camel-spool-store.h
+include/camel/camel-spool-summary.h
 include/camel/camel-store.h
 include/camel/camel-stream-buffer.h
 include/camel/camel-stream-filter.h
@@ -110,6 +129,8 @@ include/ename/e-name-western-tables.h
 include/ename/e-name-western.h
 include/evolution/cal-client/cal-client-types.h
 include/evolution/cal-client/cal-client.h
+include/evolution/cal-client/cal-query.h
+include/evolution/cal-client/evolution-calendar.h
 include/evolution/cal-util/cal-component.h
 include/evolution/cal-util/cal-recur.h
 include/evolution/cal-util/cal-util.h
@@ -120,8 +141,8 @@ include/evolution/ebook/e-book-util.h
 include/evolution/ebook/e-book-view-listener.h
 include/evolution/ebook/e-book-view.h
 include/evolution/ebook/e-book.h
+include/evolution/ebook/e-card-compare.h
 include/evolution/ebook/e-card-cursor.h
-include/evolution/ebook/e-card-pairs.h
 include/evolution/ebook/e-card-simple.h
 include/evolution/ebook/e-card-types.h
 include/evolution/ebook/e-card.h
@@ -131,7 +152,23 @@ include/evolution/importer/evolution-importer-client.h
 include/evolution/importer/evolution-importer-listener.h
 include/evolution/importer/evolution-importer.h
 include/evolution/importer/evolution-intelligent-importer.h
+include/evolution/shell/Evolution.h
+include/evolution/shell/e-folder-tree.h
+include/evolution/shell/evolution-activity-client.h
+include/evolution/shell/evolution-local-storage.h
+include/evolution/shell/evolution-session.h
+include/evolution/shell/evolution-shell-client.h
+include/evolution/shell/evolution-shell-component-client.h
+include/evolution/shell/evolution-shell-component-dnd.h
+include/evolution/shell/evolution-shell-component-utils.h
+include/evolution/shell/evolution-shell-component.h
+include/evolution/shell/evolution-shell-view.h
+include/evolution/shell/evolution-storage-listener.h
+include/evolution/shell/evolution-storage-set-view-listener.h
+include/evolution/shell/evolution-storage.h
+include/evolution/wombat/wombat-client.h
 include/ical.h
+include/icalss.h
 include/libicalvcal/icalvcal.h
 include/libicalvcal/port.h
 include/libicalvcal/vcaltmp.h
@@ -155,15 +192,6 @@ lib/evolution/camel-providers/%%VERSION%%/libcamelsmtp.a
 lib/evolution/camel-providers/%%VERSION%%/libcamelsmtp.so
 lib/evolution/camel-providers/%%VERSION%%/libcamelsmtp.so.0
 lib/evolution/camel-providers/%%VERSION%%/libcamelsmtp.urls
-lib/evolution/evolution-mail-importers/%%VERSION%%/libiielm.a
-lib/evolution/evolution-mail-importers/%%VERSION%%/libiielm.so
-lib/evolution/evolution-mail-importers/%%VERSION%%/libiielm.so.0
-lib/evolution/evolution-mail-importers/%%VERSION%%/libiinetscape.a
-lib/evolution/evolution-mail-importers/%%VERSION%%/libiinetscape.so
-lib/evolution/evolution-mail-importers/%%VERSION%%/libiinetscape.so.0
-lib/evolution/evolution-mail-importers/%%VERSION%%/libiipine.a
-lib/evolution/evolution-mail-importers/%%VERSION%%/libiipine.so
-lib/evolution/evolution-mail-importers/%%VERSION%%/libiipine.so.0
 lib/evolution/evolution-mail-importers/%%VERSION%%/libmbox.a
 lib/evolution/evolution-mail-importers/%%VERSION%%/libmbox.so
 lib/evolution/evolution-mail-importers/%%VERSION%%/libmbox.so.0
@@ -188,19 +216,27 @@ lib/libename.so.0
 lib/libeselectnames.a
 lib/libeselectnames.so
 lib/libeselectnames.so.0
+lib/libeshell.a
+lib/libeshell.so
+lib/libeshell.so.0
 lib/libevolution-importer.a
 lib/libevolution-importer.so
 lib/libevolution-importer.so.0
-lib/libevolution-services.a
-lib/libevolution-services.so
-lib/libevolution-services.so.0
 lib/libical.a
 lib/libical.so
 lib/libical.so.0
+lib/libicalss.a
+lib/libicalss.so
+lib/libicalss.so.0
 lib/libicalvcal.a
 lib/libicalvcal.so
 lib/libicalvcal.so.0
+lib/libwombat.a
+lib/libwombat.so
+lib/libwombat.so.0
+sbin/camel-lock-helper
 share/gnome/apps/Applications/evolution.desktop
+share/gnome/evolution/Locations
 share/gnome/evolution/addresstypes.xml
 share/gnome/evolution/arrow.png
 share/gnome/evolution/default_user/addressbook-sources.xml
@@ -208,7 +244,6 @@ share/gnome/evolution/default_user/local/Calendar/folder-metadata.xml
 share/gnome/evolution/default_user/local/Contacts/create-initial
 share/gnome/evolution/default_user/local/Contacts/folder-metadata.xml
 share/gnome/evolution/default_user/local/Drafts/folder-metadata.xml
-share/gnome/evolution/default_user/local/Executive-Summary/folder-metadata.xml
 share/gnome/evolution/default_user/local/Inbox/folder-metadata.xml
 share/gnome/evolution/default_user/local/Inbox/mbox
 share/gnome/evolution/default_user/local/Outbox/folder-metadata.xml
@@ -216,24 +251,33 @@ share/gnome/evolution/default_user/local/Sent/folder-metadata.xml
 share/gnome/evolution/default_user/local/Tasks/folder-metadata.xml
 share/gnome/evolution/default_user/local/Trash/folder-metadata.xml
 share/gnome/evolution/default_user/searches.xml
-share/gnome/evolution/default_user/shortcuts.xml
 share/gnome/evolution/ecps/medbook.ecps
 share/gnome/evolution/ecps/phonelist.ecps
 share/gnome/evolution/ecps/smallbook.ecps
+share/gnome/evolution/etspec/e-calendar-table.etspec
+share/gnome/evolution/etspec/e-storage-set-view.etspec
+share/gnome/evolution/etspec/meeting-page.etspec
+share/gnome/evolution/etspec/message-list.etspec
 share/gnome/evolution/filtertypes.xml
 share/gnome/evolution/glade/addressbook-config.glade
 share/gnome/evolution/glade/alarm-notify.glade
+share/gnome/evolution/glade/alarm-options.glade
+share/gnome/evolution/glade/alarm-page.glade
 share/gnome/evolution/glade/alphabet.glade
 share/gnome/evolution/glade/cal-prefs-dialog.glade
 share/gnome/evolution/glade/contact-editor.glade
+share/gnome/evolution/glade/contact-list-editor.glade
+share/gnome/evolution/glade/e-active-connection-dialog.glade
+share/gnome/evolution/glade/e-card-duplicate-detected.glade
+share/gnome/evolution/glade/e-card-merging-book-commit-duplicate-detected.glade
 share/gnome/evolution/glade/e-contact-editor-confirm-delete.glade
 share/gnome/evolution/glade/e-contact-print.glade
+share/gnome/evolution/glade/e-delegate-dialog.glade
 share/gnome/evolution/glade/e-itip-control.glade
-share/gnome/evolution/glade/e-meeting-dialog.glade
 share/gnome/evolution/glade/e-msg-composer-attachment.glade
 share/gnome/evolution/glade/e-shell-folder-creation-dialog.glade
-share/gnome/evolution/glade/event-editor-dialog.glade
-share/gnome/evolution/glade/executive-summary-config.glade
+share/gnome/evolution/glade/e-timezone-dialog.glade
+share/gnome/evolution/glade/event-page.glade
 share/gnome/evolution/glade/filter.glade
 share/gnome/evolution/glade/fulladdr.glade
 share/gnome/evolution/glade/fullname.glade
@@ -241,13 +285,17 @@ share/gnome/evolution/glade/goto-dialog.glade
 share/gnome/evolution/glade/import.glade
 share/gnome/evolution/glade/local-config.glade
 share/gnome/evolution/glade/mail-config.glade
+share/gnome/evolution/glade/meeting-page.glade
+share/gnome/evolution/glade/my-evolution.glade
+share/gnome/evolution/glade/recurrence-page.glade
 share/gnome/evolution/glade/select-names.glade
-share/gnome/evolution/glade/task-editor-dialog.glade
-share/gnome/evolution/summary.html
+share/gnome/evolution/glade/task-details-page.glade
+share/gnome/evolution/glade/task-page.glade
 share/gnome/evolution/vfoldertypes.xml
 share/gnome/evolution/views/addressbook/By_Company.galview
 share/gnome/evolution/views/addressbook/Phone_List.galview
 share/gnome/evolution/views/addressbook/galview.xml
+share/gnome/evolution/views/calendar/galview.xml
 share/gnome/evolution/views/mail/By_Sender.galview
 share/gnome/evolution/views/mail/By_Status.galview
 share/gnome/evolution/views/mail/By_Subject.galview
@@ -256,98 +304,12 @@ share/gnome/evolution/views/mail/galview.xml
 share/gnome/evolution/views/tasks/Tasks.galview
 share/gnome/evolution/views/tasks/With_Category.galview
 share/gnome/evolution/views/tasks/galview.xml
-share/gnome/help/evolution/C/aboutbook.html
-share/gnome/help/evolution/C/apx-gloss.html
-share/gnome/help/evolution/C/authors.html
-share/gnome/help/evolution/C/bugs.html
-share/gnome/help/evolution/C/commontasks.html
-share/gnome/help/evolution/C/config-prefs-cal.html
-share/gnome/help/evolution/C/config-prefs-contact.html
-share/gnome/help/evolution/C/config-prefs-general.html
-share/gnome/help/evolution/C/config-prefs.html
-share/gnome/help/evolution/C/config-setupassist.html
-share/gnome/help/evolution/C/config-sync.html
-share/gnome/help/evolution/C/config.html
-share/gnome/help/evolution/C/docbook.css
-share/gnome/help/evolution/C/exec-services-detail.html
-share/gnome/help/evolution/C/fig/calendar.png
-share/gnome/help/evolution/C/fig/config-cal.png
-share/gnome/help/evolution/C/fig/config-mail.png
-share/gnome/help/evolution/C/fig/contact-editor.png
-share/gnome/help/evolution/C/fig/contact.png
-share/gnome/help/evolution/C/fig/filter-assist-fig.png
-share/gnome/help/evolution/C/fig/filter-new-fig.png
-share/gnome/help/evolution/C/fig/mail-composer.png
-share/gnome/help/evolution/C/fig/mail-druid-pic.png
-share/gnome/help/evolution/C/fig/mail-inbox.png
-share/gnome/help/evolution/C/fig/mainwindow-pic.png
-share/gnome/help/evolution/C/fig/print-dest.png
-share/gnome/help/evolution/C/fig/print-preview.png
-share/gnome/help/evolution/C/fig/vfolder-createrule-fig.png
-share/gnome/help/evolution/C/index.html
-share/gnome/help/evolution/C/introduction.html
-share/gnome/help/evolution/C/ln15.html
-share/gnome/help/evolution/C/menuref-cal-editor.html
-share/gnome/help/evolution/C/menuref-cal.html
-share/gnome/help/evolution/C/menuref-contact-editor.html
-share/gnome/help/evolution/C/menuref-exec.html
-share/gnome/help/evolution/C/menuref-mail-editor.html
-share/gnome/help/evolution/C/menuref-mail.html
-share/gnome/help/evolution/C/menuref.html
-share/gnome/help/evolution/C/p2089.html
-share/gnome/help/evolution/C/print-destination.html
-share/gnome/help/evolution/C/stylesheet-images/caution.gif
-share/gnome/help/evolution/C/stylesheet-images/home.gif
-share/gnome/help/evolution/C/stylesheet-images/important.gif
-share/gnome/help/evolution/C/stylesheet-images/next.gif
-share/gnome/help/evolution/C/stylesheet-images/note.gif
-share/gnome/help/evolution/C/stylesheet-images/prev.gif
-share/gnome/help/evolution/C/stylesheet-images/tip.gif
-share/gnome/help/evolution/C/stylesheet-images/toc-blank.gif
-share/gnome/help/evolution/C/stylesheet-images/toc-minus.gif
-share/gnome/help/evolution/C/stylesheet-images/toc-plus.gif
-share/gnome/help/evolution/C/stylesheet-images/up.gif
-share/gnome/help/evolution/C/stylesheet-images/warning.gif
-share/gnome/help/evolution/C/usage-calendar-apts.html
-share/gnome/help/evolution/C/usage-calendar-multiple.html
-share/gnome/help/evolution/C/usage-calendar-todo.html
-share/gnome/help/evolution/C/usage-calendar.html
-share/gnome/help/evolution/C/usage-contact-automate.html
-share/gnome/help/evolution/C/usage-contact-cards.html
-share/gnome/help/evolution/C/usage-contact-organize.html
-share/gnome/help/evolution/C/usage-contact-sharing.html
-share/gnome/help/evolution/C/usage-contact.html
-share/gnome/help/evolution/C/usage-exec-summary.html
-share/gnome/help/evolution/C/usage-mail-organize.html
-share/gnome/help/evolution/C/usage-mail.html
-share/gnome/help/evolution/C/usage-mainwindow-folderbar.html
-share/gnome/help/evolution/C/usage-mainwindow-menubar.html
-share/gnome/help/evolution/C/usage-mainwindow.html
-share/gnome/help/evolution/C/usage-print.html
-share/gnome/help/evolution/C/usage-sync.html
-share/gnome/help/evolution/C/usage.html
-share/gnome/help/evolution/C/x2913.html
-share/gnome/html/evolution-cal-client-decl.txt
-share/gnome/html/evolution-cal-client-sections.txt
-share/gnome/html/evolution-cal-client.args
-share/gnome/html/evolution-cal-client.hierarchy
-share/gnome/html/evolution-cal-client.signals
-share/gnome/html/evolution-cal-client.types
-share/gnome/html/evolution-cal-util-decl.txt
-share/gnome/html/evolution-cal-util-sections.txt
-share/gnome/html/evolution-cal-util.args
-share/gnome/html/evolution-cal-util.hierarchy
-share/gnome/html/evolution-cal-util.signals
-share/gnome/html/evolution-cal-util.types
-share/gnome/html/evolution-services-decl.txt
-share/gnome/html/evolution-services-sections.txt
-share/gnome/html/evolution-services.args
-share/gnome/html/evolution-services.hierarchy
-share/gnome/html/evolution-services.signals
-share/gnome/html/evolution-services.types
 share/gnome/idl/Composer.idl
+share/gnome/idl/Evolution-Activity.idl
 share/gnome/idl/Evolution-Composer.idl
+share/gnome/idl/Evolution-Icon.idl
 share/gnome/idl/Evolution-LocalStorage.idl
+share/gnome/idl/Evolution-Offline.idl
 share/gnome/idl/Evolution-Session.idl
 share/gnome/idl/Evolution-Shell.idl
 share/gnome/idl/Evolution-ShellComponent.idl
@@ -360,8 +322,11 @@ share/gnome/idl/GNOME_Evolution_Importer.idl
 share/gnome/idl/addressbook.idl
 share/gnome/idl/evolution-calendar.idl
 share/gnome/images/evolution/all_contacts.xpm
+share/gnome/images/evolution/apply-filters-16.xpm
+share/gnome/images/evolution/bcg.png
 share/gnome/images/evolution/briefcase.png
 share/gnome/images/evolution/butterfly.png
+share/gnome/images/evolution/buttons/add-attachment.png
 share/gnome/images/evolution/buttons/add-service.png
 share/gnome/images/evolution/buttons/compose-message.png
 share/gnome/images/evolution/buttons/copy-message.png
@@ -371,13 +336,37 @@ share/gnome/images/evolution/buttons/forward.png
 share/gnome/images/evolution/buttons/monthview.xpm
 share/gnome/images/evolution/buttons/move-message.png
 share/gnome/images/evolution/buttons/new_appointment.png
+share/gnome/images/evolution/buttons/next-message.png
+share/gnome/images/evolution/buttons/previous-message.png
+share/gnome/images/evolution/buttons/print-preview-24.png
+share/gnome/images/evolution/buttons/print.png
 share/gnome/images/evolution/buttons/reply-to-all.png
 share/gnome/images/evolution/buttons/reply.png
 share/gnome/images/evolution/buttons/send-24-receive.png
+share/gnome/images/evolution/buttons/send-24.png
 share/gnome/images/evolution/buttons/weekview.xpm
 share/gnome/images/evolution/buttons/workweekview.xpm
 share/gnome/images/evolution/buttons/yearview.xpm
+share/gnome/images/evolution/categories/16_category_birthday.png
+share/gnome/images/evolution/categories/16_category_business.png
+share/gnome/images/evolution/categories/16_category_favorites.png
+share/gnome/images/evolution/categories/16_category_gifts.png
+share/gnome/images/evolution/categories/16_category_goals.png
+share/gnome/images/evolution/categories/16_category_holiday-cards.png
+share/gnome/images/evolution/categories/16_category_holiday.png
+share/gnome/images/evolution/categories/16_category_hot-contacts.png
+share/gnome/images/evolution/categories/16_category_ideas.png
+share/gnome/images/evolution/categories/16_category_international.png
+share/gnome/images/evolution/categories/16_category_key-customer.png
+share/gnome/images/evolution/categories/16_category_miscellaneous.png
+share/gnome/images/evolution/categories/16_category_personal.png
+share/gnome/images/evolution/categories/16_category_phonecalls.png
+share/gnome/images/evolution/categories/16_category_status.png
+share/gnome/images/evolution/categories/16_category_strategies.png
+share/gnome/images/evolution/categories/16_category_suppliers.png
+share/gnome/images/evolution/categories/16_category_time-and-expenses.png
 share/gnome/images/evolution/cellphone.png
+share/gnome/images/evolution/compose-message.png
 share/gnome/images/evolution/conduits/evo-16-address-conduit.png
 share/gnome/images/evolution/conduits/evo-16-calendar-conduit.png
 share/gnome/images/evolution/conduits/evo-16-todo-conduit.png
@@ -388,11 +377,15 @@ share/gnome/images/evolution/configure_16_addressbook.xpm
 share/gnome/images/evolution/configure_16_calendar.xpm
 share/gnome/images/evolution/configure_16_folder.xpm
 share/gnome/images/evolution/configure_16_mail.xpm
+share/gnome/images/evolution/contact-is-a-list.png
 share/gnome/images/evolution/copy_16_message.xpm
 share/gnome/images/evolution/delete_message.xpm
 share/gnome/images/evolution/edit.xpm
+share/gnome/images/evolution/empty.gif
 share/gnome/images/evolution/encrypt.xpm
 share/gnome/images/evolution/envelope.png
+share/gnome/images/evolution/es-appointments.png
+share/gnome/images/evolution/es-weather.png
 share/gnome/images/evolution/evolution-calendar-mini.png
 share/gnome/images/evolution/evolution-calendar.png
 share/gnome/images/evolution/evolution-contacts-mini.png
@@ -410,7 +403,9 @@ share/gnome/images/evolution/evolution-trash-mini.png
 share/gnome/images/evolution/evolution-trash.png
 share/gnome/images/evolution/executive-summary-bg.png
 share/gnome/images/evolution/executive-summary-curve.png
+share/gnome/images/evolution/fetch-mail.png
 share/gnome/images/evolution/find_contact.xpm
+share/gnome/images/evolution/find_message.xpm
 share/gnome/images/evolution/folder.xpm
 share/gnome/images/evolution/forward.xpm
 share/gnome/images/evolution/globe.png
@@ -418,18 +413,40 @@ share/gnome/images/evolution/hide_deleted_messages.xpm
 share/gnome/images/evolution/hide_read_messages.xpm
 share/gnome/images/evolution/hide_selected_messages.xpm
 share/gnome/images/evolution/house.png
+share/gnome/images/evolution/ico-calendar.png
+share/gnome/images/evolution/ico-mail.png
+share/gnome/images/evolution/ico-rdf.png
+share/gnome/images/evolution/ico-weather.png
 share/gnome/images/evolution/import.png
 share/gnome/images/evolution/import.xpm
+share/gnome/images/evolution/mail-config-druid-account-name.png
+share/gnome/images/evolution/mail-config-druid-identity.png
+share/gnome/images/evolution/mail-config-druid-receive.png
+share/gnome/images/evolution/mail-config-druid-send.png
+share/gnome/images/evolution/mail-config-druid.png
 share/gnome/images/evolution/malehead.png
 share/gnome/images/evolution/move_message.xpm
+share/gnome/images/evolution/myweather-clouds.png
+share/gnome/images/evolution/myweather-fog.png
+share/gnome/images/evolution/myweather-rain.png
+share/gnome/images/evolution/myweather-snow.png
+share/gnome/images/evolution/myweather-storm.png
+share/gnome/images/evolution/myweather-sun.png
+share/gnome/images/evolution/myweather-suncloud.png
 share/gnome/images/evolution/new-message.xpm
 share/gnome/images/evolution/new_appointment.xpm
 share/gnome/images/evolution/new_contact.xpm
+share/gnome/images/evolution/offline.png
+share/gnome/images/evolution/online.png
+share/gnome/images/evolution/pattern.png
 share/gnome/images/evolution/print-preview.xpm
 share/gnome/images/evolution/print.xpm
+share/gnome/images/evolution/rdf.png
 share/gnome/images/evolution/reply.xpm
 share/gnome/images/evolution/reply_to_all.xpm
 share/gnome/images/evolution/save.xpm
+share/gnome/images/evolution/send-16.png
+share/gnome/images/evolution/send-later-16.png
 share/gnome/images/evolution/send-receive.xpm
 share/gnome/images/evolution/service-close.png
 share/gnome/images/evolution/service-configure.png
@@ -443,38 +460,420 @@ share/gnome/images/evolution/service-up-disabled.png
 share/gnome/images/evolution/service-up.png
 share/gnome/images/evolution/show_all_messages.xpm
 share/gnome/images/evolution/splash.png
+share/gnome/images/evolution/thankyou.png
 share/gnome/images/evolution/undelete_message.xpm
 share/gnome/images/evolution/work_offline.xpm
+share/gnome/images/evolution/world_map-960.png
+share/gnome/libical/zoneinfo/Africa/Abidjan.ics
+share/gnome/libical/zoneinfo/Africa/Accra.ics
+share/gnome/libical/zoneinfo/Africa/Addis_Ababa.ics
+share/gnome/libical/zoneinfo/Africa/Algiers.ics
+share/gnome/libical/zoneinfo/Africa/Asmera.ics
+share/gnome/libical/zoneinfo/Africa/Bamako.ics
+share/gnome/libical/zoneinfo/Africa/Bangui.ics
+share/gnome/libical/zoneinfo/Africa/Banjul.ics
+share/gnome/libical/zoneinfo/Africa/Bissau.ics
+share/gnome/libical/zoneinfo/Africa/Blantyre.ics
+share/gnome/libical/zoneinfo/Africa/Brazzaville.ics
+share/gnome/libical/zoneinfo/Africa/Bujumbura.ics
+share/gnome/libical/zoneinfo/Africa/Cairo.ics
+share/gnome/libical/zoneinfo/Africa/Casablanca.ics
+share/gnome/libical/zoneinfo/Africa/Ceuta.ics
+share/gnome/libical/zoneinfo/Africa/Conakry.ics
+share/gnome/libical/zoneinfo/Africa/Dakar.ics
+share/gnome/libical/zoneinfo/Africa/Dar_es_Salaam.ics
+share/gnome/libical/zoneinfo/Africa/Djibouti.ics
+share/gnome/libical/zoneinfo/Africa/Douala.ics
+share/gnome/libical/zoneinfo/Africa/El_Aaiun.ics
+share/gnome/libical/zoneinfo/Africa/Freetown.ics
+share/gnome/libical/zoneinfo/Africa/Gaborone.ics
+share/gnome/libical/zoneinfo/Africa/Harare.ics
+share/gnome/libical/zoneinfo/Africa/Johannesburg.ics
+share/gnome/libical/zoneinfo/Africa/Kampala.ics
+share/gnome/libical/zoneinfo/Africa/Khartoum.ics
+share/gnome/libical/zoneinfo/Africa/Kigali.ics
+share/gnome/libical/zoneinfo/Africa/Kinshasa.ics
+share/gnome/libical/zoneinfo/Africa/Lagos.ics
+share/gnome/libical/zoneinfo/Africa/Libreville.ics
+share/gnome/libical/zoneinfo/Africa/Lome.ics
+share/gnome/libical/zoneinfo/Africa/Luanda.ics
+share/gnome/libical/zoneinfo/Africa/Lubumbashi.ics
+share/gnome/libical/zoneinfo/Africa/Lusaka.ics
+share/gnome/libical/zoneinfo/Africa/Malabo.ics
+share/gnome/libical/zoneinfo/Africa/Maputo.ics
+share/gnome/libical/zoneinfo/Africa/Maseru.ics
+share/gnome/libical/zoneinfo/Africa/Mbabane.ics
+share/gnome/libical/zoneinfo/Africa/Mogadishu.ics
+share/gnome/libical/zoneinfo/Africa/Monrovia.ics
+share/gnome/libical/zoneinfo/Africa/Nairobi.ics
+share/gnome/libical/zoneinfo/Africa/Ndjamena.ics
+share/gnome/libical/zoneinfo/Africa/Niamey.ics
+share/gnome/libical/zoneinfo/Africa/Nouakchott.ics
+share/gnome/libical/zoneinfo/Africa/Ouagadougou.ics
+share/gnome/libical/zoneinfo/Africa/Porto-Novo.ics
+share/gnome/libical/zoneinfo/Africa/Sao_Tome.ics
+share/gnome/libical/zoneinfo/Africa/Timbuktu.ics
+share/gnome/libical/zoneinfo/Africa/Tripoli.ics
+share/gnome/libical/zoneinfo/Africa/Tunis.ics
+share/gnome/libical/zoneinfo/Africa/Windhoek.ics
+share/gnome/libical/zoneinfo/America/Adak.ics
+share/gnome/libical/zoneinfo/America/Anchorage.ics
+share/gnome/libical/zoneinfo/America/Anguilla.ics
+share/gnome/libical/zoneinfo/America/Antigua.ics
+share/gnome/libical/zoneinfo/America/Araguaina.ics
+share/gnome/libical/zoneinfo/America/Aruba.ics
+share/gnome/libical/zoneinfo/America/Asuncion.ics
+share/gnome/libical/zoneinfo/America/Barbados.ics
+share/gnome/libical/zoneinfo/America/Belem.ics
+share/gnome/libical/zoneinfo/America/Belize.ics
+share/gnome/libical/zoneinfo/America/Boa_Vista.ics
+share/gnome/libical/zoneinfo/America/Bogota.ics
+share/gnome/libical/zoneinfo/America/Boise.ics
+share/gnome/libical/zoneinfo/America/Buenos_Aires.ics
+share/gnome/libical/zoneinfo/America/Cambridge_Bay.ics
+share/gnome/libical/zoneinfo/America/Cancun.ics
+share/gnome/libical/zoneinfo/America/Caracas.ics
+share/gnome/libical/zoneinfo/America/Catamarca.ics
+share/gnome/libical/zoneinfo/America/Cayenne.ics
+share/gnome/libical/zoneinfo/America/Cayman.ics
+share/gnome/libical/zoneinfo/America/Chicago.ics
+share/gnome/libical/zoneinfo/America/Chihuahua.ics
+share/gnome/libical/zoneinfo/America/Cordoba.ics
+share/gnome/libical/zoneinfo/America/Costa_Rica.ics
+share/gnome/libical/zoneinfo/America/Cuiaba.ics
+share/gnome/libical/zoneinfo/America/Curacao.ics
+share/gnome/libical/zoneinfo/America/Dawson.ics
+share/gnome/libical/zoneinfo/America/Dawson_Creek.ics
+share/gnome/libical/zoneinfo/America/Denver.ics
+share/gnome/libical/zoneinfo/America/Detroit.ics
+share/gnome/libical/zoneinfo/America/Dominica.ics
+share/gnome/libical/zoneinfo/America/Edmonton.ics
+share/gnome/libical/zoneinfo/America/Eirunepe.ics
+share/gnome/libical/zoneinfo/America/El_Salvador.ics
+share/gnome/libical/zoneinfo/America/Fortaleza.ics
+share/gnome/libical/zoneinfo/America/Glace_Bay.ics
+share/gnome/libical/zoneinfo/America/Godthab.ics
+share/gnome/libical/zoneinfo/America/Goose_Bay.ics
+share/gnome/libical/zoneinfo/America/Grand_Turk.ics
+share/gnome/libical/zoneinfo/America/Grenada.ics
+share/gnome/libical/zoneinfo/America/Guadeloupe.ics
+share/gnome/libical/zoneinfo/America/Guatemala.ics
+share/gnome/libical/zoneinfo/America/Guayaquil.ics
+share/gnome/libical/zoneinfo/America/Guyana.ics
+share/gnome/libical/zoneinfo/America/Halifax.ics
+share/gnome/libical/zoneinfo/America/Havana.ics
+share/gnome/libical/zoneinfo/America/Hermosillo.ics
+share/gnome/libical/zoneinfo/America/Indiana/Indianapolis.ics
+share/gnome/libical/zoneinfo/America/Indiana/Knox.ics
+share/gnome/libical/zoneinfo/America/Indiana/Marengo.ics
+share/gnome/libical/zoneinfo/America/Indiana/Vevay.ics
+share/gnome/libical/zoneinfo/America/Indianapolis.ics
+share/gnome/libical/zoneinfo/America/Inuvik.ics
+share/gnome/libical/zoneinfo/America/Iqaluit.ics
+share/gnome/libical/zoneinfo/America/Jamaica.ics
+share/gnome/libical/zoneinfo/America/Jujuy.ics
+share/gnome/libical/zoneinfo/America/Juneau.ics
+share/gnome/libical/zoneinfo/America/Kentucky/Louisville.ics
+share/gnome/libical/zoneinfo/America/Kentucky/Monticello.ics
+share/gnome/libical/zoneinfo/America/La_Paz.ics
+share/gnome/libical/zoneinfo/America/Lima.ics
+share/gnome/libical/zoneinfo/America/Los_Angeles.ics
+share/gnome/libical/zoneinfo/America/Louisville.ics
+share/gnome/libical/zoneinfo/America/Maceio.ics
+share/gnome/libical/zoneinfo/America/Managua.ics
+share/gnome/libical/zoneinfo/America/Manaus.ics
+share/gnome/libical/zoneinfo/America/Martinique.ics
+share/gnome/libical/zoneinfo/America/Mazatlan.ics
+share/gnome/libical/zoneinfo/America/Mendoza.ics
+share/gnome/libical/zoneinfo/America/Menominee.ics
+share/gnome/libical/zoneinfo/America/Merida.ics
+share/gnome/libical/zoneinfo/America/Mexico_City.ics
+share/gnome/libical/zoneinfo/America/Miquelon.ics
+share/gnome/libical/zoneinfo/America/Monterrey.ics
+share/gnome/libical/zoneinfo/America/Montevideo.ics
+share/gnome/libical/zoneinfo/America/Montreal.ics
+share/gnome/libical/zoneinfo/America/Montserrat.ics
+share/gnome/libical/zoneinfo/America/Nassau.ics
+share/gnome/libical/zoneinfo/America/New_York.ics
+share/gnome/libical/zoneinfo/America/Nipigon.ics
+share/gnome/libical/zoneinfo/America/Nome.ics
+share/gnome/libical/zoneinfo/America/Noronha.ics
+share/gnome/libical/zoneinfo/America/Panama.ics
+share/gnome/libical/zoneinfo/America/Pangnirtung.ics
+share/gnome/libical/zoneinfo/America/Paramaribo.ics
+share/gnome/libical/zoneinfo/America/Phoenix.ics
+share/gnome/libical/zoneinfo/America/Port-au-Prince.ics
+share/gnome/libical/zoneinfo/America/Port_of_Spain.ics
+share/gnome/libical/zoneinfo/America/Porto_Velho.ics
+share/gnome/libical/zoneinfo/America/Puerto_Rico.ics
+share/gnome/libical/zoneinfo/America/Rainy_River.ics
+share/gnome/libical/zoneinfo/America/Rankin_Inlet.ics
+share/gnome/libical/zoneinfo/America/Recife.ics
+share/gnome/libical/zoneinfo/America/Regina.ics
+share/gnome/libical/zoneinfo/America/Rio_Branco.ics
+share/gnome/libical/zoneinfo/America/Rosario.ics
+share/gnome/libical/zoneinfo/America/Santiago.ics
+share/gnome/libical/zoneinfo/America/Santo_Domingo.ics
+share/gnome/libical/zoneinfo/America/Sao_Paulo.ics
+share/gnome/libical/zoneinfo/America/Scoresbysund.ics
+share/gnome/libical/zoneinfo/America/Shiprock.ics
+share/gnome/libical/zoneinfo/America/St_Johns.ics
+share/gnome/libical/zoneinfo/America/St_Kitts.ics
+share/gnome/libical/zoneinfo/America/St_Lucia.ics
+share/gnome/libical/zoneinfo/America/St_Thomas.ics
+share/gnome/libical/zoneinfo/America/St_Vincent.ics
+share/gnome/libical/zoneinfo/America/Swift_Current.ics
+share/gnome/libical/zoneinfo/America/Tegucigalpa.ics
+share/gnome/libical/zoneinfo/America/Thule.ics
+share/gnome/libical/zoneinfo/America/Thunder_Bay.ics
+share/gnome/libical/zoneinfo/America/Tijuana.ics
+share/gnome/libical/zoneinfo/America/Tortola.ics
+share/gnome/libical/zoneinfo/America/Vancouver.ics
+share/gnome/libical/zoneinfo/America/Whitehorse.ics
+share/gnome/libical/zoneinfo/America/Winnipeg.ics
+share/gnome/libical/zoneinfo/America/Yakutat.ics
+share/gnome/libical/zoneinfo/America/Yellowknife.ics
+share/gnome/libical/zoneinfo/Antarctica/Casey.ics
+share/gnome/libical/zoneinfo/Antarctica/Davis.ics
+share/gnome/libical/zoneinfo/Antarctica/DumontDUrville.ics
+share/gnome/libical/zoneinfo/Antarctica/Mawson.ics
+share/gnome/libical/zoneinfo/Antarctica/McMurdo.ics
+share/gnome/libical/zoneinfo/Antarctica/Palmer.ics
+share/gnome/libical/zoneinfo/Antarctica/South_Pole.ics
+share/gnome/libical/zoneinfo/Antarctica/Syowa.ics
+share/gnome/libical/zoneinfo/Antarctica/Vostok.ics
+share/gnome/libical/zoneinfo/Arctic/Longyearbyen.ics
+share/gnome/libical/zoneinfo/Asia/Aden.ics
+share/gnome/libical/zoneinfo/Asia/Almaty.ics
+share/gnome/libical/zoneinfo/Asia/Amman.ics
+share/gnome/libical/zoneinfo/Asia/Anadyr.ics
+share/gnome/libical/zoneinfo/Asia/Aqtau.ics
+share/gnome/libical/zoneinfo/Asia/Aqtobe.ics
+share/gnome/libical/zoneinfo/Asia/Ashgabat.ics
+share/gnome/libical/zoneinfo/Asia/Baghdad.ics
+share/gnome/libical/zoneinfo/Asia/Bahrain.ics
+share/gnome/libical/zoneinfo/Asia/Baku.ics
+share/gnome/libical/zoneinfo/Asia/Bangkok.ics
+share/gnome/libical/zoneinfo/Asia/Beirut.ics
+share/gnome/libical/zoneinfo/Asia/Bishkek.ics
+share/gnome/libical/zoneinfo/Asia/Brunei.ics
+share/gnome/libical/zoneinfo/Asia/Calcutta.ics
+share/gnome/libical/zoneinfo/Asia/Chungking.ics
+share/gnome/libical/zoneinfo/Asia/Colombo.ics
+share/gnome/libical/zoneinfo/Asia/Damascus.ics
+share/gnome/libical/zoneinfo/Asia/Dhaka.ics
+share/gnome/libical/zoneinfo/Asia/Dili.ics
+share/gnome/libical/zoneinfo/Asia/Dubai.ics
+share/gnome/libical/zoneinfo/Asia/Dushanbe.ics
+share/gnome/libical/zoneinfo/Asia/Gaza.ics
+share/gnome/libical/zoneinfo/Asia/Harbin.ics
+share/gnome/libical/zoneinfo/Asia/Hong_Kong.ics
+share/gnome/libical/zoneinfo/Asia/Hovd.ics
+share/gnome/libical/zoneinfo/Asia/Irkutsk.ics
+share/gnome/libical/zoneinfo/Asia/Istanbul.ics
+share/gnome/libical/zoneinfo/Asia/Jakarta.ics
+share/gnome/libical/zoneinfo/Asia/Jayapura.ics
+share/gnome/libical/zoneinfo/Asia/Jerusalem.ics
+share/gnome/libical/zoneinfo/Asia/Kabul.ics
+share/gnome/libical/zoneinfo/Asia/Kamchatka.ics
+share/gnome/libical/zoneinfo/Asia/Karachi.ics
+share/gnome/libical/zoneinfo/Asia/Kashgar.ics
+share/gnome/libical/zoneinfo/Asia/Katmandu.ics
+share/gnome/libical/zoneinfo/Asia/Krasnoyarsk.ics
+share/gnome/libical/zoneinfo/Asia/Kuala_Lumpur.ics
+share/gnome/libical/zoneinfo/Asia/Kuching.ics
+share/gnome/libical/zoneinfo/Asia/Kuwait.ics
+share/gnome/libical/zoneinfo/Asia/Macao.ics
+share/gnome/libical/zoneinfo/Asia/Magadan.ics
+share/gnome/libical/zoneinfo/Asia/Manila.ics
+share/gnome/libical/zoneinfo/Asia/Muscat.ics
+share/gnome/libical/zoneinfo/Asia/Nicosia.ics
+share/gnome/libical/zoneinfo/Asia/Novosibirsk.ics
+share/gnome/libical/zoneinfo/Asia/Omsk.ics
+share/gnome/libical/zoneinfo/Asia/Phnom_Penh.ics
+share/gnome/libical/zoneinfo/Asia/Pontianak.ics
+share/gnome/libical/zoneinfo/Asia/Pyongyang.ics
+share/gnome/libical/zoneinfo/Asia/Qatar.ics
+share/gnome/libical/zoneinfo/Asia/Rangoon.ics
+share/gnome/libical/zoneinfo/Asia/Riyadh.ics
+share/gnome/libical/zoneinfo/Asia/Saigon.ics
+share/gnome/libical/zoneinfo/Asia/Samarkand.ics
+share/gnome/libical/zoneinfo/Asia/Seoul.ics
+share/gnome/libical/zoneinfo/Asia/Shanghai.ics
+share/gnome/libical/zoneinfo/Asia/Singapore.ics
+share/gnome/libical/zoneinfo/Asia/Taipei.ics
+share/gnome/libical/zoneinfo/Asia/Tashkent.ics
+share/gnome/libical/zoneinfo/Asia/Tbilisi.ics
+share/gnome/libical/zoneinfo/Asia/Tehran.ics
+share/gnome/libical/zoneinfo/Asia/Thimphu.ics
+share/gnome/libical/zoneinfo/Asia/Tokyo.ics
+share/gnome/libical/zoneinfo/Asia/Ujung_Pandang.ics
+share/gnome/libical/zoneinfo/Asia/Ulaanbaatar.ics
+share/gnome/libical/zoneinfo/Asia/Urumqi.ics
+share/gnome/libical/zoneinfo/Asia/Vientiane.ics
+share/gnome/libical/zoneinfo/Asia/Vladivostok.ics
+share/gnome/libical/zoneinfo/Asia/Yakutsk.ics
+share/gnome/libical/zoneinfo/Asia/Yekaterinburg.ics
+share/gnome/libical/zoneinfo/Asia/Yerevan.ics
+share/gnome/libical/zoneinfo/Atlantic/Azores.ics
+share/gnome/libical/zoneinfo/Atlantic/Bermuda.ics
+share/gnome/libical/zoneinfo/Atlantic/Canary.ics
+share/gnome/libical/zoneinfo/Atlantic/Cape_Verde.ics
+share/gnome/libical/zoneinfo/Atlantic/Faeroe.ics
+share/gnome/libical/zoneinfo/Atlantic/Jan_Mayen.ics
+share/gnome/libical/zoneinfo/Atlantic/Madeira.ics
+share/gnome/libical/zoneinfo/Atlantic/Reykjavik.ics
+share/gnome/libical/zoneinfo/Atlantic/South_Georgia.ics
+share/gnome/libical/zoneinfo/Atlantic/St_Helena.ics
+share/gnome/libical/zoneinfo/Atlantic/Stanley.ics
+share/gnome/libical/zoneinfo/Australia/Adelaide.ics
+share/gnome/libical/zoneinfo/Australia/Brisbane.ics
+share/gnome/libical/zoneinfo/Australia/Broken_Hill.ics
+share/gnome/libical/zoneinfo/Australia/Darwin.ics
+share/gnome/libical/zoneinfo/Australia/Hobart.ics
+share/gnome/libical/zoneinfo/Australia/Lindeman.ics
+share/gnome/libical/zoneinfo/Australia/Lord_Howe.ics
+share/gnome/libical/zoneinfo/Australia/Melbourne.ics
+share/gnome/libical/zoneinfo/Australia/Perth.ics
+share/gnome/libical/zoneinfo/Australia/Sydney.ics
+share/gnome/libical/zoneinfo/Europe/Amsterdam.ics
+share/gnome/libical/zoneinfo/Europe/Andorra.ics
+share/gnome/libical/zoneinfo/Europe/Athens.ics
+share/gnome/libical/zoneinfo/Europe/Belfast.ics
+share/gnome/libical/zoneinfo/Europe/Belgrade.ics
+share/gnome/libical/zoneinfo/Europe/Berlin.ics
+share/gnome/libical/zoneinfo/Europe/Bratislava.ics
+share/gnome/libical/zoneinfo/Europe/Brussels.ics
+share/gnome/libical/zoneinfo/Europe/Bucharest.ics
+share/gnome/libical/zoneinfo/Europe/Budapest.ics
+share/gnome/libical/zoneinfo/Europe/Chisinau.ics
+share/gnome/libical/zoneinfo/Europe/Copenhagen.ics
+share/gnome/libical/zoneinfo/Europe/Dublin.ics
+share/gnome/libical/zoneinfo/Europe/Gibraltar.ics
+share/gnome/libical/zoneinfo/Europe/Helsinki.ics
+share/gnome/libical/zoneinfo/Europe/Istanbul.ics
+share/gnome/libical/zoneinfo/Europe/Kaliningrad.ics
+share/gnome/libical/zoneinfo/Europe/Kiev.ics
+share/gnome/libical/zoneinfo/Europe/Lisbon.ics
+share/gnome/libical/zoneinfo/Europe/Ljubljana.ics
+share/gnome/libical/zoneinfo/Europe/London.ics
+share/gnome/libical/zoneinfo/Europe/Luxembourg.ics
+share/gnome/libical/zoneinfo/Europe/Madrid.ics
+share/gnome/libical/zoneinfo/Europe/Malta.ics
+share/gnome/libical/zoneinfo/Europe/Minsk.ics
+share/gnome/libical/zoneinfo/Europe/Monaco.ics
+share/gnome/libical/zoneinfo/Europe/Moscow.ics
+share/gnome/libical/zoneinfo/Europe/Nicosia.ics
+share/gnome/libical/zoneinfo/Europe/Oslo.ics
+share/gnome/libical/zoneinfo/Europe/Paris.ics
+share/gnome/libical/zoneinfo/Europe/Prague.ics
+share/gnome/libical/zoneinfo/Europe/Riga.ics
+share/gnome/libical/zoneinfo/Europe/Rome.ics
+share/gnome/libical/zoneinfo/Europe/Samara.ics
+share/gnome/libical/zoneinfo/Europe/San_Marino.ics
+share/gnome/libical/zoneinfo/Europe/Sarajevo.ics
+share/gnome/libical/zoneinfo/Europe/Simferopol.ics
+share/gnome/libical/zoneinfo/Europe/Skopje.ics
+share/gnome/libical/zoneinfo/Europe/Sofia.ics
+share/gnome/libical/zoneinfo/Europe/Stockholm.ics
+share/gnome/libical/zoneinfo/Europe/Tallinn.ics
+share/gnome/libical/zoneinfo/Europe/Tirane.ics
+share/gnome/libical/zoneinfo/Europe/Uzhgorod.ics
+share/gnome/libical/zoneinfo/Europe/Vaduz.ics
+share/gnome/libical/zoneinfo/Europe/Vatican.ics
+share/gnome/libical/zoneinfo/Europe/Vienna.ics
+share/gnome/libical/zoneinfo/Europe/Vilnius.ics
+share/gnome/libical/zoneinfo/Europe/Warsaw.ics
+share/gnome/libical/zoneinfo/Europe/Zagreb.ics
+share/gnome/libical/zoneinfo/Europe/Zaporozhye.ics
+share/gnome/libical/zoneinfo/Europe/Zurich.ics
+share/gnome/libical/zoneinfo/Indian/Antananarivo.ics
+share/gnome/libical/zoneinfo/Indian/Chagos.ics
+share/gnome/libical/zoneinfo/Indian/Christmas.ics
+share/gnome/libical/zoneinfo/Indian/Cocos.ics
+share/gnome/libical/zoneinfo/Indian/Comoro.ics
+share/gnome/libical/zoneinfo/Indian/Kerguelen.ics
+share/gnome/libical/zoneinfo/Indian/Mahe.ics
+share/gnome/libical/zoneinfo/Indian/Maldives.ics
+share/gnome/libical/zoneinfo/Indian/Mauritius.ics
+share/gnome/libical/zoneinfo/Indian/Mayotte.ics
+share/gnome/libical/zoneinfo/Indian/Reunion.ics
+share/gnome/libical/zoneinfo/Pacific/Apia.ics
+share/gnome/libical/zoneinfo/Pacific/Auckland.ics
+share/gnome/libical/zoneinfo/Pacific/Chatham.ics
+share/gnome/libical/zoneinfo/Pacific/Easter.ics
+share/gnome/libical/zoneinfo/Pacific/Efate.ics
+share/gnome/libical/zoneinfo/Pacific/Enderbury.ics
+share/gnome/libical/zoneinfo/Pacific/Fakaofo.ics
+share/gnome/libical/zoneinfo/Pacific/Fiji.ics
+share/gnome/libical/zoneinfo/Pacific/Funafuti.ics
+share/gnome/libical/zoneinfo/Pacific/Galapagos.ics
+share/gnome/libical/zoneinfo/Pacific/Gambier.ics
+share/gnome/libical/zoneinfo/Pacific/Guadalcanal.ics
+share/gnome/libical/zoneinfo/Pacific/Guam.ics
+share/gnome/libical/zoneinfo/Pacific/Honolulu.ics
+share/gnome/libical/zoneinfo/Pacific/Johnston.ics
+share/gnome/libical/zoneinfo/Pacific/Kiritimati.ics
+share/gnome/libical/zoneinfo/Pacific/Kosrae.ics
+share/gnome/libical/zoneinfo/Pacific/Kwajalein.ics
+share/gnome/libical/zoneinfo/Pacific/Majuro.ics
+share/gnome/libical/zoneinfo/Pacific/Marquesas.ics
+share/gnome/libical/zoneinfo/Pacific/Midway.ics
+share/gnome/libical/zoneinfo/Pacific/Nauru.ics
+share/gnome/libical/zoneinfo/Pacific/Niue.ics
+share/gnome/libical/zoneinfo/Pacific/Norfolk.ics
+share/gnome/libical/zoneinfo/Pacific/Noumea.ics
+share/gnome/libical/zoneinfo/Pacific/Pago_Pago.ics
+share/gnome/libical/zoneinfo/Pacific/Palau.ics
+share/gnome/libical/zoneinfo/Pacific/Pitcairn.ics
+share/gnome/libical/zoneinfo/Pacific/Ponape.ics
+share/gnome/libical/zoneinfo/Pacific/Port_Moresby.ics
+share/gnome/libical/zoneinfo/Pacific/Rarotonga.ics
+share/gnome/libical/zoneinfo/Pacific/Saipan.ics
+share/gnome/libical/zoneinfo/Pacific/Tahiti.ics
+share/gnome/libical/zoneinfo/Pacific/Tarawa.ics
+share/gnome/libical/zoneinfo/Pacific/Tongatapu.ics
+share/gnome/libical/zoneinfo/Pacific/Truk.ics
+share/gnome/libical/zoneinfo/Pacific/Wake.ics
+share/gnome/libical/zoneinfo/Pacific/Wallis.ics
+share/gnome/libical/zoneinfo/Pacific/Yap.ics
+share/gnome/libical/zoneinfo/zones.tab
 share/gnome/mime-info/evolution.keys
 share/gnome/mime-info/evolution.mime
 share/gnome/oaf/GNOME_Evolution_Addressbook.oaf
-share/gnome/oaf/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf
 share/gnome/oaf/GNOME_Evolution_Addressbook_SelectNames.oaf
+share/gnome/oaf/GNOME_Evolution_Addressbook_VCard_Importer.oaf
 share/gnome/oaf/GNOME_Evolution_Calendar.oaf
 share/gnome/oaf/GNOME_Evolution_Calendar_AlarmNotify.oaf
+share/gnome/oaf/GNOME_Evolution_Elm_Intelligent_Importer.oaf
+share/gnome/oaf/GNOME_Evolution_GnomeCard_Intelligent_Importer.oaf
 share/gnome/oaf/GNOME_Evolution_Mail.oaf
-share/gnome/oaf/GNOME_Evolution_Mail_Elm_Intelligent_Importer.oaf
 share/gnome/oaf/GNOME_Evolution_Mail_Mbox_Importer.oaf
-share/gnome/oaf/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.oaf
 share/gnome/oaf/GNOME_Evolution_Mail_Outlook_Importer.oaf
-share/gnome/oaf/GNOME_Evolution_Mail_Pine_Intelligent_Importer.oaf
+share/gnome/oaf/GNOME_Evolution_Netscape_Intelligent_Importer.oaf
+share/gnome/oaf/GNOME_Evolution_Pine_Intelligent_Importer.oaf
 share/gnome/oaf/GNOME_Evolution_Shell.oaf
 share/gnome/oaf/GNOME_Evolution_Summary.oaf
-share/gnome/oaf/GNOME_Evolution_Summary_rdf.oaf
-share/gnome/oaf/GNOME_Evolution_Summary_test.oaf
 share/gnome/oaf/GNOME_Evolution_Wombat.oaf
 share/gnome/pixmaps/evolution.png
 share/gnome/ui/evolution-addressbook.xml
 share/gnome/ui/evolution-calendar.xml
+share/gnome/ui/evolution-comp-editor.xml
 share/gnome/ui/evolution-contact-editor.xml
+share/gnome/ui/evolution-contact-list-editor.xml
 share/gnome/ui/evolution-event-editor.xml
 share/gnome/ui/evolution-executive-summary.xml
-share/gnome/ui/evolution-mail.xml
+share/gnome/ui/evolution-mail-global.xml
+share/gnome/ui/evolution-mail-list.xml
+share/gnome/ui/evolution-mail-message.xml
+share/gnome/ui/evolution-mail-messagedisplay.xml
 share/gnome/ui/evolution-message-composer.xml
+share/gnome/ui/evolution-signature-editor.xml
 share/gnome/ui/evolution-subscribe.xml
-share/gnome/ui/evolution-task-editor-dialog.xml
+share/gnome/ui/evolution-task-editor.xml
 share/gnome/ui/evolution-tasks.xml
 share/gnome/ui/evolution.xml
+share/gnome/ui/my-evolution.xml
 share/locale/az/LC_MESSAGES/evolution.mo
 share/locale/ca/LC_MESSAGES/evolution.mo
 share/locale/da/LC_MESSAGES/evolution.mo
@@ -497,33 +896,54 @@ share/locale/no/LC_MESSAGES/evolution.mo
 share/locale/pl/LC_MESSAGES/evolution.mo
 share/locale/pt/LC_MESSAGES/evolution.mo
 share/locale/pt_BR/LC_MESSAGES/evolution.mo
+share/locale/ro/LC_MESSAGES/evolution.mo
 share/locale/ru/LC_MESSAGES/evolution.mo
 share/locale/sk/LC_MESSAGES/evolution.mo
 share/locale/sl/LC_MESSAGES/evolution.mo
 share/locale/sv/LC_MESSAGES/evolution.mo
 share/locale/tr/LC_MESSAGES/evolution.mo
 share/locale/uk/LC_MESSAGES/evolution.mo
+@dirrm share/gnome/libical/zoneinfo/Pacific
+@dirrm share/gnome/libical/zoneinfo/Indian
+@dirrm share/gnome/libical/zoneinfo/Europe
+@dirrm share/gnome/libical/zoneinfo/Australia
+@dirrm share/gnome/libical/zoneinfo/Atlantic
+@dirrm share/gnome/libical/zoneinfo/Asia
+@dirrm share/gnome/libical/zoneinfo/Arctic
+@dirrm share/gnome/libical/zoneinfo/Antarctica
+@dirrm share/gnome/libical/zoneinfo/America/Kentucky
+@dirrm share/gnome/libical/zoneinfo/America/Indiana
+@dirrm share/gnome/libical/zoneinfo/America
+@dirrm share/gnome/libical/zoneinfo/Africa
+@dirrm share/gnome/libical/zoneinfo
+@dirrm share/gnome/libical
 @dirrm share/gnome/images/evolution/conduits
+@dirrm share/gnome/images/evolution/categories
 @dirrm share/gnome/images/evolution/buttons
 @dirrm share/gnome/images/evolution
 @dirrm share/gnome/images
-@dirrm share/gnome/help/evolution/C/stylesheet-images
-@dirrm share/gnome/help/evolution/C/fig
+@dirrm share/gnome/html/evolution-devel-guide
+@dirrm share/gnome/html/evolution-cal-util
+@dirrm share/gnome/html/evolution-cal-client
+@dirrm share/gnome/help/evolution/C/evolution-guide/stylesheet-images
+@dirrm share/gnome/help/evolution/C/evolution-guide/fig
+@dirrm share/gnome/help/evolution/C/evolution-guide
+@dirrm share/gnome/help/evolution/C/evolution-faq
 @dirrm share/gnome/help/evolution/C
 @dirrm share/gnome/help/evolution
 @dirrm share/gnome/evolution/views/tasks
 @dirrm share/gnome/evolution/views/mail
+@dirrm share/gnome/evolution/views/calendar
 @dirrm share/gnome/evolution/views/addressbook
 @dirrm share/gnome/evolution/views
 @dirrm share/gnome/evolution/glade
+@dirrm share/gnome/evolution/etspec
 @dirrm share/gnome/evolution/ecps
-@dirrm share/gnome/evolution/default_user/news
 @dirrm share/gnome/evolution/default_user/local/Trash
 @dirrm share/gnome/evolution/default_user/local/Tasks
 @dirrm share/gnome/evolution/default_user/local/Sent
 @dirrm share/gnome/evolution/default_user/local/Outbox
 @dirrm share/gnome/evolution/default_user/local/Inbox
-@dirrm share/gnome/evolution/default_user/local/Executive-Summary
 @dirrm share/gnome/evolution/default_user/local/Drafts
 @dirrm share/gnome/evolution/default_user/local/Contacts
 @dirrm share/gnome/evolution/default_user/local/Calendar
@@ -536,6 +956,8 @@ share/locale/uk/LC_MESSAGES/evolution.mo
 @dirrm lib/evolution/camel-providers
 @dirrm lib/evolution
 @dirrm include/libicalvcal
+@dirrm include/evolution/wombat
+@dirrm include/evolution/shell
 @dirrm include/evolution/importer
 @dirrm include/evolution/ebook
 @dirrm include/evolution/cal-util