Update evolution to 0.12. Changes are too numerous to list here. For

a detailed list, see the release notes on the package's homepage.

13 files changed, 785 insertions, 358 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 35597851301..20c1c1c2eb7 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/05/25 06:16:17 rh Exp $
+# $NetBSD: Makefile,v 1.4 2001/08/11 18:39:25 rh Exp $
 #
 
-DISTNAME=		evolution-0.10
+DISTNAME=		evolution-0.12
 CATEGORIES=		mail time gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=unstable/sources/evolution/}
 
@@ -10,14 +10,16 @@ HOMEPAGE=		http://www.ximian.com/apps/evolution.php3
 COMMENT=		GNOME mailer, calendar, contact manager, and communications tool
 
 DEPENDS+=		bison-*:../../devel/bison
-DEPENDS+=		gal-0.7:../../devel/gal
-DEPENDS+=		bonobo>=0.36:../../devel/bonobo
-DEPENDS+=		gtkhtml>=0.8:../../www/gtkhtml
-DEPENDS+=		gnome-vfs>=0.4.2:../../sysutils/gnome-vfs
+DEPENDS+=		db3-2.9:../../databases/db3
+DEPENDS+=		gal>=0.10:../../devel/gal
+DEPENDS+=		bonobo>=1.0.7:../../devel/bonobo
+DEPENDS+=		bonobo-conf>=0.10:../../devel/bonobo-conf
+DEPENDS+=		gtkhtml>=0.11.1:../../www/gtkhtml
+DEPENDS+=		gnome-vfs>=1.0.1:../../sysutils/gnome-vfs
 DEPENDS+=		libunicode>=0.4:../../textproc/libunicode
-DEPENDS+=		oaf>=0.6.1:../../devel/oaf
-DEPENDS+=		ORBit>=0.5.6:../../net/ORBit
-DEPENDS+=		gnome-print>=0.25:../../print/gnome-print
+DEPENDS+=		oaf>=0.6.5:../../devel/oaf
+DEPENDS+=		ORBit>=0.5.8:../../net/ORBit
+DEPENDS+=		gnome-print>=0.29:../../print/gnome-print
 DEPENDS+=		gdk-pixbuf>=0.9.0:../../graphics/gdk-pixbuf
 BUILD_USES_MSGFMT=	YES
 
@@ -30,7 +32,11 @@ YACC=			${PREFIX}/bin/bison -y
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 CONFIGURE_ARGS+=	--enable-ldap=no
+CONFIGURE_ARGS+=	--with-db3-includes=${LOCALBASE}/include/db3
+CONFIGURE_ARGS+=	--with-db3-libs=${LOCALBASE}/lib
 CONFIGURE_ENV+=		CFLAGS="-D_POSIX_THREAD_SYSCALL_SOFT=1 ${CFLAGS}"
 CPPFLAGS+=		-D_POSIX_THREAD_SYSCALL_SOFT=1
 
+.include "../../security/openssl/buildlink.mk"
+.include "../../databases/db3/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 57c0a947e1b..9c9ce7a464e 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.2 2001/05/25 06:16:17 rh Exp $
+$NetBSD: distinfo,v 1.3 2001/08/11 18:39:25 rh Exp $
 
-SHA1 (evolution-0.10.tar.gz) = 40c1f9ef56a0c1b7033e8c5f9058271fdee48df0
-Size (evolution-0.10.tar.gz) = 6342426 bytes
-SHA1 (patch-aa) = 90d125bb7cd4d05ed4fb73e472a8e62a18cb66a5
+SHA1 (evolution-0.12.tar.gz) = 96358fbc2c6baef334080566b25b5ec16d4084a9
+Size (evolution-0.12.tar.gz) = 7657279 bytes
+SHA1 (patch-aa) = f5a8df5a2c86ff8faa7b215639f7b7f1e8450b80
 SHA1 (patch-ab) = 6c3ed264bccf90052c843c2ef1f4b4ee89997770
-SHA1 (patch-ac) = 8d62f098575113348c0f7b279cd159896f4078a4
-SHA1 (patch-ad) = b94db1ac39ee5875941b6e639f8b681c602bc83c
-SHA1 (patch-ae) = b9b7559c18e9090878c843d357d2281c3ba3ad12
-SHA1 (patch-af) = 782336567f19efb8502c05d7e84db909a27b2cfd
-SHA1 (patch-ag) = 1e3052da3061b9a8b3d0e3c942ee6d01a8a296b8
-SHA1 (patch-ah) = 344bc3ab851daff2bc525796ff3a9b40278c8005
-SHA1 (patch-ai) = 3f4c95b1ba55ebfd561106642adc88b24a47fb6a
-SHA1 (patch-aj) = 33953c59caa04bab39d7eb3e736b37e9c78e56b7
+SHA1 (patch-ac) = bab83268025540badf791e4062c7d7de808c43bc
+SHA1 (patch-ad) = fd7327c9cfbc52bb81304f1a80f0014f4e654d8e
+SHA1 (patch-ae) = 155e692bc82f32d25c37a5c37aa8145615a50329
+SHA1 (patch-af) = 51486b2b20dd497b7faab42f2eaabc7e7968c5f1
+SHA1 (patch-ag) = f6dbc21bce8842c6dd54465e1d659ee5228d4fa6
+SHA1 (patch-ah) = 36662bab9902e7a09f0e56b820beb2d6af03994b
+SHA1 (patch-ai) = 7f6b9212a482fcb1230b1e920daa58aef678b15d
+SHA1 (patch-aj) = 9b24098b338af3eff7e2f2f46d6817e7cf5cd510
 SHA1 (patch-ak) = 1f367591284d27beeecd8c9f9308ca77dda8f7fb
-SHA1 (patch-al) = 0cd81aecf9192c4d856c381528afb837b8c4a71b
+SHA1 (patch-al) = c8e74b698a5472b143b55716d1a4f6df71544f23
diff --git a/mail/evolution/patches/patch-aa b/mail/evolution/patches/patch-aa
index 23b1e33d235..80187165d95 100644
--- a/mail/evolution/patches/patch-aa
+++ b/mail/evolution/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.2 2001/05/25 06:16:17 rh Exp $
+$NetBSD: patch-aa,v 1.3 2001/08/11 18:39:25 rh Exp $
 
---- configure.orig	Thu Apr 26 23:50:36 2001
+--- configure.orig	Tue Jul 31 20:06:13 2001
 +++ configure
-@@ -4660,13 +4660,13 @@
- if { (eval echo configure:4661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -4757,13 +4757,13 @@
+ if { (eval echo configure:4758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    CATOBJEXT=.gmo
 -		   DATADIRNAME=share
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.2 2001/05/25 06:16:17 rh Exp $
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -4895,7 +4895,7 @@
+@@ -4992,7 +4992,7 @@
        # We need to process the po/ directory.
        POSUB=po
      else
@@ -27,3 +27,14 @@ $NetBSD: patch-aa,v 1.2 2001/05/25 06:16:17 rh Exp $
        nls_cv_header_intl=intl/libintl.h
        nls_cv_header_libgt=intl/libgettext.h
      fi
+@@ -5607,8 +5607,8 @@
+ # This can only change between Evolution versions (and then can only
+ # go up.)
+ evolution_db_version_major=3
+-evolution_db_version_minor=1
+-evolution_db_version_patch=17
++evolution_db_version_minor=2
++evolution_db_version_patch=9
+ 
+ evolution_db_version=${evolution_db_version_major}.${evolution_db_version_minor}.${evolution_db_version_patch}
+ cat >> confdefs.h <<EOF
diff --git a/mail/evolution/patches/patch-ac b/mail/evolution/patches/patch-ac
index a031635e621..72bdce3b466 100644
--- a/mail/evolution/patches/patch-ac
+++ b/mail/evolution/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $
+$NetBSD: patch-ac,v 1.2 2001/08/11 18:39:25 rh Exp $
 
---- shell/main.c.orig	Tue Apr 24 17:31:26 2001
+--- shell/main.c.orig	Mon Jul 30 16:22:50 2001
 +++ shell/main.c
-@@ -35,6 +35,23 @@
- 
- #include "e-shell.h"
+@@ -53,6 +53,23 @@
+ static gboolean no_splash = FALSE;
+ extern char *evolution_debug_log;
  
 +#ifdef __NetBSD__
 +#include <gtk/gtk.h>
@@ -24,12 +24,12 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $
 +#endif
 +
  
- #define STARTUP_URI "evolution:/local/Inbox"
- 
-@@ -206,6 +223,10 @@
+ static void
+ no_views_left_cb (EShell *shell, gpointer data)
+@@ -273,6 +290,10 @@
  	}
  
- 	gtk_idle_add (idle_cb, evolution_directory);
+ 	gtk_idle_add (idle_cb, uri_list);
 +
 +#ifdef __NetBSD__
 +	gtk_timeout_add (200, pth_nbschedule, NULL);
diff --git a/mail/evolution/patches/patch-ad b/mail/evolution/patches/patch-ad
index b5584db6404..57bdb999a5c 100644
--- a/mail/evolution/patches/patch-ad
+++ b/mail/evolution/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $
+$NetBSD: patch-ad,v 1.2 2001/08/11 18:39:25 rh Exp $
 
---- camel/providers/imap/camel-imap-store.c.orig	Tue Apr 24 17:50:27 2001
+--- camel/providers/imap/camel-imap-store.c.orig	Thu Jul 26 21:07:40 2001
 +++ camel/providers/imap/camel-imap-store.c
-@@ -22,6 +22,10 @@
+@@ -24,6 +24,11 @@
   *
   */
  
@@ -10,6 +10,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $
 +#undef	_POSIX_THREAD_SYSCALL_SOFT
 +#endif
 +#define	_POSIX_THREAD_SYSCALL_SOFT	0
- 
++
+ #ifdef HAVE_CONFIG_H
  #include <config.h>
- 
+ #endif
diff --git a/mail/evolution/patches/patch-ae b/mail/evolution/patches/patch-ae
index be4403838f1..d3a53b649b9 100644
--- a/mail/evolution/patches/patch-ae
+++ b/mail/evolution/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $
+$NetBSD: patch-ae,v 1.2 2001/08/11 18:39:25 rh Exp $
 
---- camel/camel-remote-store.c.orig	Tue Apr 24 17:56:15 2001
+--- camel/camel-remote-store.c.orig	Tue Jul 17 23:22:19 2001
 +++ camel/camel-remote-store.c
 @@ -23,6 +23,11 @@
   *
@@ -11,6 +11,6 @@ $NetBSD: patch-ae,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $
 +#endif
 +#define	_POSIX_THREAD_SYSCALL_SOFT	0
 +
+ #ifdef HAVE_CONFIG_H
  #include <config.h>
- 
- #include <sys/time.h>
+ #endif
diff --git a/mail/evolution/patches/patch-af b/mail/evolution/patches/patch-af
index 85dd5bbf5be..5f9c0649fd7 100644
--- a/mail/evolution/patches/patch-af
+++ b/mail/evolution/patches/patch-af
@@ -1,25 +1,17 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $
+$NetBSD: patch-af,v 1.2 2001/08/11 18:39:25 rh Exp $
 
---- shell/e-setup.c.orig	Wed Apr 25 18:42:46 2001
-+++ shell/e-setup.c
-@@ -224,9 +224,18 @@
- 			  _("Cannot copy files into\n`%s'."), evolution_directory);
- 		retval = FALSE;
- 	} else {
--		e_notice (NULL, GNOME_MESSAGE_BOX_INFO,
-+		char *cmd2 = g_strconcat ("chmod -R u+w ", evolution_directory,
-+			       NULL);
-+
-+		if (system (cmd2) != 0) {
-+			e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-+			  _("Cannot chmod files in\n`%s'."), evolution_directory);
-+			retval = FALSE;
-+		} else {
-+			e_notice (NULL, GNOME_MESSAGE_BOX_INFO,
- 			  _("Evolution files successfully installed."));
--		retval = TRUE;
-+			retval = TRUE;
-+		}
- 	}
+--- e-util/e-db3-utils.c.orig	Fri Jun  1 03:02:11 2001
++++ e-util/e-db3-utils.c
+@@ -14,9 +14,9 @@
+ #include <libgnome/gnome-util.h>
  
- 	g_free (command);
+ #if DB_VERSION_MAJOR != 3 || \
+-    DB_VERSION_MINOR != 1 || \
+-    DB_VERSION_PATCH != 17
+-#error Including wrong DB3.  Need libdb 3.1.17.
++    DB_VERSION_MINOR != 2 || \
++    DB_VERSION_PATCH != 9
++#error Including wrong DB3.  Need libdb 3.2.9.
+ #endif
+ 
+ static char *
diff --git a/mail/evolution/patches/patch-ag b/mail/evolution/patches/patch-ag
index 3813e00f7a6..c0db9c8134e 100644
--- a/mail/evolution/patches/patch-ag
+++ b/mail/evolution/patches/patch-ag
@@ -1,22 +1,17 @@
-$NetBSD: patch-ag,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $
+$NetBSD: patch-ag,v 1.2 2001/08/11 18:39:25 rh Exp $
 
---- calendar/cal-client/Makefile.in.orig	Tue Mar 13 21:13:06 2001
-+++ calendar/cal-client/Makefile.in
-@@ -212,7 +212,7 @@
- client_test_INCLUDES =  	$(INCLUDES)				-DG_LOG_DOMAIN=\"client-test\"
+--- e-util/e-dbhash.c.orig	Sat Jul 28 00:14:12 2001
++++ e-util/e-dbhash.c
+@@ -16,9 +16,9 @@
+ #include "md5-utils.h"
  
+ #if DB_VERSION_MAJOR != 3 || \
+-    DB_VERSION_MINOR != 1 || \
+-    DB_VERSION_PATCH != 17
+-#error Including wrong DB3.  Need libdb 3.1.17.
++    DB_VERSION_MINOR != 2 || \
++    DB_VERSION_PATCH != 9
++#error Including wrong DB3.  Need libdb 3.2.9.
+ #endif
  
--client_test_LDADD =  	$(BONOBO_VFS_GNOME_LIBS)					$(EXTRA_GNOME_LIBS)						-lunicode							$(top_builddir)/calendar/cal-util/libcal-util.la		$(top_builddir)/libversit/libversit.la				$(top_builddir)/libical/src/libical/libical.la			libcal-client.la
-+client_test_LDADD =  	$(BONOBO_VFS_GNOME_LIBS)					$(EXTRA_GNOME_LIBS)						-lunicode							$(top_builddir)/calendar/cal-util/libcal-util.la		$(top_builddir)/libversit/libversit.la	-L`pwd` -lical			libcal-client.la
- 
- 
- BUILT_SOURCES = $(CORBA_GENERATED)
-@@ -360,6 +360,8 @@
- maintainer-clean-noinstPROGRAMS:
- 
- client-test: $(client_test_OBJECTS) $(client_test_DEPENDENCIES)
-+	cp $(top_builddir)/libical/src/libical/.libs/libical.a .
-+	-cp $(top_builddir)/libical/src/libical/.libs/libical.so* .
- 	@rm -f client-test
- 	$(LINK) $(client_test_LDFLAGS) $(client_test_OBJECTS) $(client_test_LDADD) $(LIBS)
- 
+ struct _EDbHashPrivate 
diff --git a/mail/evolution/patches/patch-ah b/mail/evolution/patches/patch-ah
index 88f9ac4ba5d..766909196e7 100644
--- a/mail/evolution/patches/patch-ah
+++ b/mail/evolution/patches/patch-ah
@@ -1,17 +1,16 @@
-$NetBSD: patch-ah,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $
+$NetBSD: patch-ah,v 1.2 2001/08/11 18:39:26 rh Exp $
 
---- camel/camel-service.c.orig	Wed Apr 25 20:22:29 2001
-+++ camel/camel-service.c
-@@ -23,6 +23,12 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  * USA
+--- camel/camel-tcp-stream-openssl.c.orig	Mon Jul  9 00:15:30 2001
++++ camel/camel-tcp-stream-openssl.c
+@@ -20,6 +20,11 @@
+  *
   */
-+
+ 
 +#ifdef	_POSIX_THREAD_SYSCALL_SOFT
 +#undef	_POSIX_THREAD_SYSCALL_SOFT
 +#endif
 +#define	_POSIX_THREAD_SYSCALL_SOFT	0
 +
+ #ifdef HAVE_CONFIG_H
  #include <config.h>
- #include "camel-service.h"
- #include "camel-session.h"
+ #endif
diff --git a/mail/evolution/patches/patch-ai b/mail/evolution/patches/patch-ai
index 10f6fe93408..d1a0364b535 100644
--- a/mail/evolution/patches/patch-ai
+++ b/mail/evolution/patches/patch-ai
@@ -1,22 +1,16 @@
-$NetBSD: patch-ai,v 1.2 2001/05/25 06:16:18 rh Exp $
+$NetBSD: patch-ai,v 1.3 2001/08/11 18:39:26 rh Exp $
 
---- wombat/Makefile.in.orig	Thu Apr 26 23:53:05 2001
-+++ wombat/Makefile.in
-@@ -172,7 +172,7 @@
- wombat_SOURCES =  	wombat-moniker.c		wombat-moniker.h		wombat.c
- 
- 
--wombat_LDADD =  	$(EXTRA_GNOME_LIBS)						$(BONOBO_VFS_GNOME_LIBS)					$(top_builddir)/addressbook/backend/pas/libpas.a		$(top_builddir)/addressbook/backend/ebook/libebook.la		$(top_builddir)/e-util/ename/libename.la			$(top_builddir)/calendar/pcs/libpcs.a				$(top_builddir)/calendar/cal-util/libcal-util.la		$(top_builddir)/libical/src/libical/libical.la			$(top_builddir)/libversit/libversit.la				$(top_builddir)/e-util/libeutil.la				$(LDAP_LIBS)
-+wombat_LDADD =  	$(EXTRA_GNOME_LIBS)						$(BONOBO_VFS_GNOME_LIBS)					$(top_builddir)/addressbook/backend/pas/libpas.a		$(top_builddir)/addressbook/backend/ebook/libebook.la		$(top_builddir)/e-util/ename/libename.la			$(top_builddir)/calendar/pcs/libpcs.a				$(top_builddir)/calendar/cal-util/libcal-util.la		-L`pwd` -lical			$(top_builddir)/libversit/libversit.la				$(top_builddir)/e-util/libeutil.la				$(LDAP_LIBS)
- 
- 
- oafdir = $(datadir)/oaf
-@@ -295,6 +295,8 @@
- maintainer-clean-libtool:
- 
- wombat: $(wombat_OBJECTS) $(wombat_DEPENDENCIES)
-+	cp $(top_builddir)/libical/src/libical/.libs/libical.a .
-+	-cp $(top_builddir)/libical/src/libical/.libs/libical.so* .
- 	@rm -f wombat
- 	$(LINK) $(wombat_LDFLAGS) $(wombat_OBJECTS) $(wombat_LDADD) $(LIBS)
+--- camel/camel-transport.c.orig	Thu Jun 28 00:43:00 2001
++++ camel/camel-transport.c
+@@ -24,6 +24,11 @@
+  * USA
+  */
  
++#ifdef	_POSIX_THREAD_SYSCALL_SOFT
++#undef	_POSIX_THREAD_SYSCALL_SOFT
++#endif
++#define	_POSIX_THREAD_SYSCALL_SOFT	0
++
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
diff --git a/mail/evolution/patches/patch-aj b/mail/evolution/patches/patch-aj
index c3eeffe757d..a04cf40f79e 100644
--- a/mail/evolution/patches/patch-aj
+++ b/mail/evolution/patches/patch-aj
@@ -1,22 +1,17 @@
-$NetBSD: patch-aj,v 1.2 2001/05/25 06:16:18 rh Exp $
+$NetBSD: patch-aj,v 1.3 2001/08/11 18:39:26 rh Exp $
 
---- calendar/gui/Makefile.in.orig	Thu May 24 07:19:17 2001
-+++ calendar/gui/Makefile.in
-@@ -186,7 +186,7 @@
- evolution_calendar_SOURCES =  	$(IDL_GENERATED)				calendar-config.c				calendar-config.h				calendar-commands.c				calendar-commands.h				calendar-model.c				calendar-model.h				calendar-summary.c				calendar-summary.h				comp-util.c					comp-util.h					control-factory.c				control-factory.h				component-factory.c				component-factory.h				e-calendar-table.h				e-calendar-table.c				e-day-view-main-item.c				e-day-view-main-item.h				e-day-view-time-item.c				e-day-view-time-item.h				e-day-view-top-item.c				e-day-view-top-item.h				e-day-view.c					e-day-view.h					e-itip-control.h				e-itip-control.c				e-meeting-edit.h				e-meeting-edit.c				e-week-view-event-item.c			e-week-view-event-item.h			e-week-view-main-item.c				e-week-view-main-item.h				e-week-view-titles-item.c			e-week-view-titles-item.h			e-week-view.c					e-week-view.h					e-tasks.c					e-tasks.h					event-editor.c					event-editor.h					gnome-cal.c					gnome-cal.h					goto.c						goto.h						itip-utils.c					itip-utils.h					main.c						print.c						print.h						tag-calendar.c					tag-calendar.h					tasks-control-factory.c				tasks-control-factory.h				tasks-control.c					tasks-control.h					tasks-migrate.c					tasks-migrate.h					weekday-picker.c				weekday-picker.h				widget-util.c					widget-util.h
+--- addressbook/backend/pas/pas-backend-file.c.orig	Tue Jul 10 06:49:49 2001
++++ addressbook/backend/pas/pas-backend-file.c
+@@ -18,9 +18,9 @@
+ #include <e-util/e-db3-utils.h>
  
+ #if DB_VERSION_MAJOR != 3 || \
+-    DB_VERSION_MINOR != 1 || \
+-    DB_VERSION_PATCH != 17
+-#error Including wrong DB3.  Need libdb 3.1.17.
++    DB_VERSION_MINOR != 2 || \
++    DB_VERSION_PATCH != 9
++#error Including wrong DB3.  Need libdb 3.2.9.
+ #endif
  
--evolution_calendar_LDADD =  	alarm-notify/libalarm.a									$(top_builddir)/shell/libeshell.a							$(top_builddir)/calendar/cal-client/libcal-client.la					$(top_builddir)/calendar/cal-util/libcal-util.la					$(top_builddir)/e-util/libeutil.la							$(top_builddir)/executive-summary/evolution-services/libevolution-services.la		$(top_builddir)/libversit/libversit.la							$(top_builddir)/libical/src/libical/libical.la						$(top_builddir)/widgets/meeting-time-sel/libevolutionmtsel.a				$(top_builddir)/widgets/misc/libemiscwidgets.a						$(top_builddir)/widgets/menus/libmenus.la						dialogs/libcal-dialogs.a								$(BONOBO_HTML_GNOME_LIBS)								$(BONOBO_VFS_GNOME_LIBS)								$(EXTRA_GNOME_LIBS)									$(INTLLIBS)
-+evolution_calendar_LDADD =  	alarm-notify/libalarm.a									$(top_builddir)/shell/libeshell.a							$(top_builddir)/calendar/cal-client/libcal-client.la					$(top_builddir)/calendar/cal-util/libcal-util.la					$(top_builddir)/e-util/libeutil.la							$(top_builddir)/executive-summary/evolution-services/libevolution-services.la		$(top_builddir)/libversit/libversit.la							-L`pwd` -lical						$(top_builddir)/widgets/meeting-time-sel/libevolutionmtsel.a				$(top_builddir)/widgets/misc/libemiscwidgets.a						$(top_builddir)/widgets/menus/libmenus.la						dialogs/libcal-dialogs.a								$(BONOBO_HTML_GNOME_LIBS)								$(BONOBO_VFS_GNOME_LIBS)								$(EXTRA_GNOME_LIBS)									$(INTLLIBS)
- 
- 
- #evolution_calendar_LDFLAGS = `gnome-config --libs gdk_pixbuf`
-@@ -328,6 +328,8 @@
- maintainer-clean-libtool:
- 
- evolution-calendar: $(evolution_calendar_OBJECTS) $(evolution_calendar_DEPENDENCIES)
-+	cp $(top_builddir)/libical/src/libical/.libs/libical.a .
-+	-cp $(top_builddir)/libical/src/libical/.libs/libical.so* .
- 	@rm -f evolution-calendar
- 	$(LINK) $(evolution_calendar_LDFLAGS) $(evolution_calendar_OBJECTS) $(evolution_calendar_LDADD) $(LIBS)
- 
+ #include <gtk/gtksignal.h>
diff --git a/mail/evolution/patches/patch-al b/mail/evolution/patches/patch-al
index 371045ffb8d..d60533240ca 100644
--- a/mail/evolution/patches/patch-al
+++ b/mail/evolution/patches/patch-al
@@ -1,22 +1,31 @@
-$NetBSD: patch-al,v 1.1 2001/05/25 06:16:18 rh Exp $
+$NetBSD: patch-al,v 1.2 2001/08/11 18:39:26 rh Exp $
 
---- calendar/gui/alarm-notify/Makefile.in.orig	Fri May 25 07:40:13 2001
-+++ calendar/gui/alarm-notify/Makefile.in
-@@ -185,7 +185,7 @@
- evolution_alarm_notify_SOURCES =  	$(CORBA_GENERATED)			alarm-notify.c				alarm-notify.h				alarm-queue.c				alarm-queue.h				notify-main.c
+--- camel/camel-disco-diary.c.orig	Tue May 29 23:07:11 2001
++++ camel/camel-disco-diary.c
+@@ -270,14 +270,14 @@
+ 	off_t size;
+ 	double pc;
  
+-	fseeko (diary->file, 0, SEEK_END);
+-	size = ftello (diary->file);
++	fseek (diary->file, 0, SEEK_END);
++	size = ftell (diary->file);
+ 	g_return_if_fail (size != 0);
+ 	rewind (diary->file);
  
--evolution_alarm_notify_LDADD =  	libalarm.a							$(top_builddir)/calendar/cal-client/libcal-client.la		$(top_builddir)/calendar/cal-util/libcal-util.la		$(top_builddir)/libical/src/libical/libical.la			$(BONOBO_VFS_GNOME_LIBS)					$(EXTRA_GNOME_LIBS)						$(INTLLIBS)
-+evolution_alarm_notify_LDADD =  	libalarm.a							$(top_builddir)/calendar/cal-client/libcal-client.la		$(top_builddir)/calendar/cal-util/libcal-util.la		-L`pwd` -lical			$(BONOBO_VFS_GNOME_LIBS)					$(EXTRA_GNOME_LIBS)						$(INTLLIBS)
+ 	camel_operation_start (NULL, _("Resynchronizing with server"));
+ 	while (!camel_exception_is_set (ex)) {
+-		pc = ftello (diary->file) / size;
++		pc = ftell (diary->file) / size;
+ 		camel_operation_progress (NULL, pc * 100);
  
+ 		if (camel_file_util_decode_uint32 (diary->file, &action) == -1)
+@@ -399,7 +399,7 @@
+ gboolean
+ camel_disco_diary_empty  (CamelDiscoDiary *diary)
+ {
+-	return ftello (diary->file) == 0;
++	return ftell (diary->file) == 0;
+ }
  
- # evolution_alarm_client_SOURCES =	\
-@@ -337,6 +337,8 @@
- 	done
- 
- evolution-alarm-notify: $(evolution_alarm_notify_OBJECTS) $(evolution_alarm_notify_DEPENDENCIES)
-+	cp $(top_builddir)/libical/src/libical/.libs/libical.a .
-+	-cp $(top_builddir)/libical/src/libical/.libs/libical.so* .
- 	@rm -f evolution-alarm-notify
- 	$(LINK) $(evolution_alarm_notify_LDFLAGS) $(evolution_alarm_notify_OBJECTS) $(evolution_alarm_notify_LDADD) $(LIBS)
- 
+ void
diff --git a/mail/evolution/pkg/PLIST b/mail/evolution/pkg/PLIST
index c2719475f03..6d86e7e1c6d 100644
--- a/mail/evolution/pkg/PLIST
+++ b/mail/evolution/pkg/PLIST
@@ -1,24 +1,33 @@
-@comment $NetBSD: PLIST,v 1.2 2001/05/25 06:16:18 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/08/11 18:39:26 rh Exp $
 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
@@ -38,6 +47,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
@@ -58,6 +68,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
@@ -68,6 +79,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
@@ -76,6 +89,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
@@ -83,7 +97,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
@@ -111,6 +130,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
@@ -121,8 +142,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
@@ -132,67 +153,68 @@ 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
 include/libicalvcal/vcc.h
 include/libicalvcal/vobject.h
-lib/evolution/camel-providers/0.10/libcamelimap.a
-lib/evolution/camel-providers/0.10/libcamelimap.la
-lib/evolution/camel-providers/0.10/libcamelimap.so
-lib/evolution/camel-providers/0.10/libcamelimap.so.0
-lib/evolution/camel-providers/0.10/libcamelimap.so.0.0
-lib/evolution/camel-providers/0.10/libcamelimap.urls
-lib/evolution/camel-providers/0.10/libcamellocal.a
-lib/evolution/camel-providers/0.10/libcamellocal.la
-lib/evolution/camel-providers/0.10/libcamellocal.so
-lib/evolution/camel-providers/0.10/libcamellocal.so.0
-lib/evolution/camel-providers/0.10/libcamellocal.so.0.0
-lib/evolution/camel-providers/0.10/libcamellocal.urls
-lib/evolution/camel-providers/0.10/libcamelpop3.a
-lib/evolution/camel-providers/0.10/libcamelpop3.la
-lib/evolution/camel-providers/0.10/libcamelpop3.so
-lib/evolution/camel-providers/0.10/libcamelpop3.so.0
-lib/evolution/camel-providers/0.10/libcamelpop3.so.0.0
-lib/evolution/camel-providers/0.10/libcamelpop3.urls
-lib/evolution/camel-providers/0.10/libcamelsendmail.a
-lib/evolution/camel-providers/0.10/libcamelsendmail.la
-lib/evolution/camel-providers/0.10/libcamelsendmail.so
-lib/evolution/camel-providers/0.10/libcamelsendmail.so.0
-lib/evolution/camel-providers/0.10/libcamelsendmail.so.0.0
-lib/evolution/camel-providers/0.10/libcamelsendmail.urls
-lib/evolution/camel-providers/0.10/libcamelsmtp.a
-lib/evolution/camel-providers/0.10/libcamelsmtp.la
-lib/evolution/camel-providers/0.10/libcamelsmtp.so
-lib/evolution/camel-providers/0.10/libcamelsmtp.so.0
-lib/evolution/camel-providers/0.10/libcamelsmtp.so.0.0
-lib/evolution/camel-providers/0.10/libcamelsmtp.urls
-lib/evolution/evolution-mail-importers/0.10/libiielm.a
-lib/evolution/evolution-mail-importers/0.10/libiielm.la
-lib/evolution/evolution-mail-importers/0.10/libiielm.so
-lib/evolution/evolution-mail-importers/0.10/libiielm.so.0
-lib/evolution/evolution-mail-importers/0.10/libiielm.so.0.0
-lib/evolution/evolution-mail-importers/0.10/libiinetscape.a
-lib/evolution/evolution-mail-importers/0.10/libiinetscape.la
-lib/evolution/evolution-mail-importers/0.10/libiinetscape.so
-lib/evolution/evolution-mail-importers/0.10/libiinetscape.so.0
-lib/evolution/evolution-mail-importers/0.10/libiinetscape.so.0.0
-lib/evolution/evolution-mail-importers/0.10/libiipine.a
-lib/evolution/evolution-mail-importers/0.10/libiipine.la
-lib/evolution/evolution-mail-importers/0.10/libiipine.so
-lib/evolution/evolution-mail-importers/0.10/libiipine.so.0
-lib/evolution/evolution-mail-importers/0.10/libiipine.so.0.0
-lib/evolution/evolution-mail-importers/0.10/libmbox.a
-lib/evolution/evolution-mail-importers/0.10/libmbox.la
-lib/evolution/evolution-mail-importers/0.10/libmbox.so
-lib/evolution/evolution-mail-importers/0.10/libmbox.so.0
-lib/evolution/evolution-mail-importers/0.10/libmbox.so.0.0
-lib/evolution/evolution-mail-importers/0.10/liboutlook.a
-lib/evolution/evolution-mail-importers/0.10/liboutlook.la
-lib/evolution/evolution-mail-importers/0.10/liboutlook.so
-lib/evolution/evolution-mail-importers/0.10/liboutlook.so.0
-lib/evolution/evolution-mail-importers/0.10/liboutlook.so.0.0
+lib/evolution/camel-providers/0.12/libcamelimap.a
+lib/evolution/camel-providers/0.12/libcamelimap.la
+lib/evolution/camel-providers/0.12/libcamelimap.so
+lib/evolution/camel-providers/0.12/libcamelimap.so.0
+lib/evolution/camel-providers/0.12/libcamelimap.so.0.0
+lib/evolution/camel-providers/0.12/libcamelimap.urls
+lib/evolution/camel-providers/0.12/libcamellocal.a
+lib/evolution/camel-providers/0.12/libcamellocal.la
+lib/evolution/camel-providers/0.12/libcamellocal.so
+lib/evolution/camel-providers/0.12/libcamellocal.so.0
+lib/evolution/camel-providers/0.12/libcamellocal.so.0.0
+lib/evolution/camel-providers/0.12/libcamellocal.urls
+lib/evolution/camel-providers/0.12/libcamelpop3.a
+lib/evolution/camel-providers/0.12/libcamelpop3.la
+lib/evolution/camel-providers/0.12/libcamelpop3.so
+lib/evolution/camel-providers/0.12/libcamelpop3.so.0
+lib/evolution/camel-providers/0.12/libcamelpop3.so.0.0
+lib/evolution/camel-providers/0.12/libcamelpop3.urls
+lib/evolution/camel-providers/0.12/libcamelsendmail.a
+lib/evolution/camel-providers/0.12/libcamelsendmail.la
+lib/evolution/camel-providers/0.12/libcamelsendmail.so
+lib/evolution/camel-providers/0.12/libcamelsendmail.so.0
+lib/evolution/camel-providers/0.12/libcamelsendmail.so.0.0
+lib/evolution/camel-providers/0.12/libcamelsendmail.urls
+lib/evolution/camel-providers/0.12/libcamelsmtp.a
+lib/evolution/camel-providers/0.12/libcamelsmtp.la
+lib/evolution/camel-providers/0.12/libcamelsmtp.so
+lib/evolution/camel-providers/0.12/libcamelsmtp.so.0
+lib/evolution/camel-providers/0.12/libcamelsmtp.so.0.0
+lib/evolution/camel-providers/0.12/libcamelsmtp.urls
+lib/evolution/evolution-mail-importers/0.12/libmbox.a
+lib/evolution/evolution-mail-importers/0.12/libmbox.la
+lib/evolution/evolution-mail-importers/0.12/libmbox.so
+lib/evolution/evolution-mail-importers/0.12/libmbox.so.0
+lib/evolution/evolution-mail-importers/0.12/libmbox.so.0.0
+lib/evolution/evolution-mail-importers/0.12/liboutlook.a
+lib/evolution/evolution-mail-importers/0.12/liboutlook.la
+lib/evolution/evolution-mail-importers/0.12/liboutlook.so
+lib/evolution/evolution-mail-importers/0.12/liboutlook.so.0
+lib/evolution/evolution-mail-importers/0.12/liboutlook.so.0.0
 lib/libcal-client.a
 lib/libcal-client.la
 lib/libcal-client.so
@@ -223,26 +245,38 @@ lib/libeselectnames.la
 lib/libeselectnames.so
 lib/libeselectnames.so.0
 lib/libeselectnames.so.0.0
+lib/libeshell.a
+lib/libeshell.la
+lib/libeshell.so
+lib/libeshell.so.0
+lib/libeshell.so.0.0
 lib/libevolution-importer.a
 lib/libevolution-importer.la
 lib/libevolution-importer.so
 lib/libevolution-importer.so.0
 lib/libevolution-importer.so.0.0
-lib/libevolution-services.a
-lib/libevolution-services.la
-lib/libevolution-services.so
-lib/libevolution-services.so.0
-lib/libevolution-services.so.0.0
 lib/libical.a
 lib/libical.la
 lib/libical.so
 lib/libical.so.0
 lib/libical.so.0.0
+lib/libicalss.a
+lib/libicalss.la
+lib/libicalss.so
+lib/libicalss.so.0
+lib/libicalss.so.0.0
 lib/libicalvcal.a
 lib/libicalvcal.la
 lib/libicalvcal.so
 lib/libicalvcal.so.0
 lib/libicalvcal.so.0.0
+lib/libwombat.a
+lib/libwombat.la
+lib/libwombat.so
+lib/libwombat.so.0
+lib/libwombat.so.0.0
+sbin/camel-lock-helper
+share/evolution/Locations
 share/evolution/addresstypes.xml
 share/evolution/arrow.png
 share/evolution/default_user/addressbook-sources.xml
@@ -250,7 +284,6 @@ share/evolution/default_user/local/Calendar/folder-metadata.xml
 share/evolution/default_user/local/Contacts/create-initial
 share/evolution/default_user/local/Contacts/folder-metadata.xml
 share/evolution/default_user/local/Drafts/folder-metadata.xml
-share/evolution/default_user/local/Executive-Summary/folder-metadata.xml
 share/evolution/default_user/local/Inbox/folder-metadata.xml
 share/evolution/default_user/local/Inbox/mbox
 share/evolution/default_user/local/Outbox/folder-metadata.xml
@@ -258,24 +291,33 @@ share/evolution/default_user/local/Sent/folder-metadata.xml
 share/evolution/default_user/local/Tasks/folder-metadata.xml
 share/evolution/default_user/local/Trash/folder-metadata.xml
 share/evolution/default_user/searches.xml
-share/evolution/default_user/shortcuts.xml
 share/evolution/ecps/medbook.ecps
 share/evolution/ecps/phonelist.ecps
 share/evolution/ecps/smallbook.ecps
+share/evolution/etspec/e-calendar-table.etspec
+share/evolution/etspec/e-storage-set-view.etspec
+share/evolution/etspec/meeting-page.etspec
+share/evolution/etspec/message-list.etspec
 share/evolution/filtertypes.xml
 share/evolution/glade/addressbook-config.glade
 share/evolution/glade/alarm-notify.glade
+share/evolution/glade/alarm-options.glade
+share/evolution/glade/alarm-page.glade
 share/evolution/glade/alphabet.glade
 share/evolution/glade/cal-prefs-dialog.glade
 share/evolution/glade/contact-editor.glade
+share/evolution/glade/contact-list-editor.glade
+share/evolution/glade/e-active-connection-dialog.glade
+share/evolution/glade/e-card-duplicate-detected.glade
+share/evolution/glade/e-card-merging-book-commit-duplicate-detected.glade
 share/evolution/glade/e-contact-editor-confirm-delete.glade
 share/evolution/glade/e-contact-print.glade
+share/evolution/glade/e-delegate-dialog.glade
 share/evolution/glade/e-itip-control.glade
-share/evolution/glade/e-meeting-dialog.glade
 share/evolution/glade/e-msg-composer-attachment.glade
 share/evolution/glade/e-shell-folder-creation-dialog.glade
-share/evolution/glade/event-editor-dialog.glade
-share/evolution/glade/executive-summary-config.glade
+share/evolution/glade/e-timezone-dialog.glade
+share/evolution/glade/event-page.glade
 share/evolution/glade/filter.glade
 share/evolution/glade/fulladdr.glade
 share/evolution/glade/fullname.glade
@@ -283,13 +325,17 @@ share/evolution/glade/goto-dialog.glade
 share/evolution/glade/import.glade
 share/evolution/glade/local-config.glade
 share/evolution/glade/mail-config.glade
+share/evolution/glade/meeting-page.glade
+share/evolution/glade/my-evolution.glade
+share/evolution/glade/recurrence-page.glade
 share/evolution/glade/select-names.glade
-share/evolution/glade/task-editor-dialog.glade
-share/evolution/summary.html
+share/evolution/glade/task-details-page.glade
+share/evolution/glade/task-page.glade
 share/evolution/vfoldertypes.xml
 share/evolution/views/addressbook/By_Company.galview
 share/evolution/views/addressbook/Phone_List.galview
 share/evolution/views/addressbook/galview.xml
+share/evolution/views/calendar/galview.xml
 share/evolution/views/mail/By_Sender.galview
 share/evolution/views/mail/By_Status.galview
 share/evolution/views/mail/By_Subject.galview
@@ -299,109 +345,30 @@ share/evolution/views/tasks/Tasks.galview
 share/evolution/views/tasks/With_Category.galview
 share/evolution/views/tasks/galview.xml
 share/gnome/apps/Applications/evolution.desktop
-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/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/idl/Composer.idl
+share/idl/Evolution-Activity.idl
 share/idl/Evolution-Composer.idl
+share/idl/Evolution-Icon.idl
 share/idl/Evolution-LocalStorage.idl
+share/idl/Evolution-Offline.idl
 share/idl/Evolution-Session.idl
 share/idl/Evolution-Shell.idl
 share/idl/Evolution-ShellComponent.idl
@@ -414,8 +381,11 @@ share/idl/GNOME_Evolution_Importer.idl
 share/idl/addressbook.idl
 share/idl/evolution-calendar.idl
 share/images/evolution/all_contacts.xpm
+share/images/evolution/apply-filters-16.xpm
+share/images/evolution/bcg.png
 share/images/evolution/briefcase.png
 share/images/evolution/butterfly.png
+share/images/evolution/buttons/add-attachment.png
 share/images/evolution/buttons/add-service.png
 share/images/evolution/buttons/compose-message.png
 share/images/evolution/buttons/copy-message.png
@@ -425,13 +395,37 @@ share/images/evolution/buttons/forward.png
 share/images/evolution/buttons/monthview.xpm
 share/images/evolution/buttons/move-message.png
 share/images/evolution/buttons/new_appointment.png
+share/images/evolution/buttons/next-message.png
+share/images/evolution/buttons/previous-message.png
+share/images/evolution/buttons/print-preview-24.png
+share/images/evolution/buttons/print.png
 share/images/evolution/buttons/reply-to-all.png
 share/images/evolution/buttons/reply.png
 share/images/evolution/buttons/send-24-receive.png
+share/images/evolution/buttons/send-24.png
 share/images/evolution/buttons/weekview.xpm
 share/images/evolution/buttons/workweekview.xpm
 share/images/evolution/buttons/yearview.xpm
+share/images/evolution/categories/16_category_birthday.png
+share/images/evolution/categories/16_category_business.png
+share/images/evolution/categories/16_category_favorites.png
+share/images/evolution/categories/16_category_gifts.png
+share/images/evolution/categories/16_category_goals.png
+share/images/evolution/categories/16_category_holiday-cards.png
+share/images/evolution/categories/16_category_holiday.png
+share/images/evolution/categories/16_category_hot-contacts.png
+share/images/evolution/categories/16_category_ideas.png
+share/images/evolution/categories/16_category_international.png
+share/images/evolution/categories/16_category_key-customer.png
+share/images/evolution/categories/16_category_miscellaneous.png
+share/images/evolution/categories/16_category_personal.png
+share/images/evolution/categories/16_category_phonecalls.png
+share/images/evolution/categories/16_category_status.png
+share/images/evolution/categories/16_category_strategies.png
+share/images/evolution/categories/16_category_suppliers.png
+share/images/evolution/categories/16_category_time-and-expenses.png
 share/images/evolution/cellphone.png
+share/images/evolution/compose-message.png
 share/images/evolution/conduits/evo-16-address-conduit.png
 share/images/evolution/conduits/evo-16-calendar-conduit.png
 share/images/evolution/conduits/evo-16-todo-conduit.png
@@ -442,18 +436,22 @@ share/images/evolution/configure_16_addressbook.xpm
 share/images/evolution/configure_16_calendar.xpm
 share/images/evolution/configure_16_folder.xpm
 share/images/evolution/configure_16_mail.xpm
+share/images/evolution/contact-is-a-list.png
 share/images/evolution/copy_16_message.xpm
 share/images/evolution/delete_message.xpm
 share/images/evolution/edit.xpm
+share/images/evolution/empty.gif
 share/images/evolution/encrypt.xpm
 share/images/evolution/envelope.png
+share/images/evolution/es-appointments.png
+share/images/evolution/es-weather.png
 share/images/evolution/evolution-calendar-mini.png
 share/images/evolution/evolution-calendar.png
 share/images/evolution/evolution-contacts-mini.png
+share/images/evolution/evolution-contacts-plain.png
 share/images/evolution/evolution-contacts.png
 share/images/evolution/evolution-inbox-mini.png
 share/images/evolution/evolution-inbox.png
-share/images/evolution/evolution-contacts-plain.png
 share/images/evolution/evolution-notes-mini.png
 share/images/evolution/evolution-notes.png
 share/images/evolution/evolution-tasks-mini.png
@@ -464,7 +462,9 @@ share/images/evolution/evolution-trash-mini.png
 share/images/evolution/evolution-trash.png
 share/images/evolution/executive-summary-bg.png
 share/images/evolution/executive-summary-curve.png
+share/images/evolution/fetch-mail.png
 share/images/evolution/find_contact.xpm
+share/images/evolution/find_message.xpm
 share/images/evolution/folder.xpm
 share/images/evolution/forward.xpm
 share/images/evolution/globe.png
@@ -472,18 +472,40 @@ share/images/evolution/hide_deleted_messages.xpm
 share/images/evolution/hide_read_messages.xpm
 share/images/evolution/hide_selected_messages.xpm
 share/images/evolution/house.png
+share/images/evolution/ico-calendar.png
+share/images/evolution/ico-mail.png
+share/images/evolution/ico-rdf.png
+share/images/evolution/ico-weather.png
 share/images/evolution/import.png
 share/images/evolution/import.xpm
+share/images/evolution/mail-config-druid-account-name.png
+share/images/evolution/mail-config-druid-identity.png
+share/images/evolution/mail-config-druid-receive.png
+share/images/evolution/mail-config-druid-send.png
+share/images/evolution/mail-config-druid.png
 share/images/evolution/malehead.png
 share/images/evolution/move_message.xpm
+share/images/evolution/myweather-clouds.png
+share/images/evolution/myweather-fog.png
+share/images/evolution/myweather-rain.png
+share/images/evolution/myweather-snow.png
+share/images/evolution/myweather-storm.png
+share/images/evolution/myweather-sun.png
+share/images/evolution/myweather-suncloud.png
 share/images/evolution/new-message.xpm
 share/images/evolution/new_appointment.xpm
 share/images/evolution/new_contact.xpm
+share/images/evolution/offline.png
+share/images/evolution/online.png
+share/images/evolution/pattern.png
 share/images/evolution/print-preview.xpm
 share/images/evolution/print.xpm
+share/images/evolution/rdf.png
 share/images/evolution/reply.xpm
 share/images/evolution/reply_to_all.xpm
 share/images/evolution/save.xpm
+share/images/evolution/send-16.png
+share/images/evolution/send-later-16.png
 share/images/evolution/send-receive.xpm
 share/images/evolution/service-close.png
 share/images/evolution/service-configure.png
@@ -497,91 +519,494 @@ share/images/evolution/service-up-disabled.png
 share/images/evolution/service-up.png
 share/images/evolution/show_all_messages.xpm
 share/images/evolution/splash.png
+share/images/evolution/thankyou.png
 share/images/evolution/undelete_message.xpm
 share/images/evolution/work_offline.xpm
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/evolution.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/evolution.mo
+share/images/evolution/world_map-960.png
+share/libical/zoneinfo/Africa/Abidjan.ics
+share/libical/zoneinfo/Africa/Accra.ics
+share/libical/zoneinfo/Africa/Addis_Ababa.ics
+share/libical/zoneinfo/Africa/Algiers.ics
+share/libical/zoneinfo/Africa/Asmera.ics
+share/libical/zoneinfo/Africa/Bamako.ics
+share/libical/zoneinfo/Africa/Bangui.ics
+share/libical/zoneinfo/Africa/Banjul.ics
+share/libical/zoneinfo/Africa/Bissau.ics
+share/libical/zoneinfo/Africa/Blantyre.ics
+share/libical/zoneinfo/Africa/Brazzaville.ics
+share/libical/zoneinfo/Africa/Bujumbura.ics
+share/libical/zoneinfo/Africa/Cairo.ics
+share/libical/zoneinfo/Africa/Casablanca.ics
+share/libical/zoneinfo/Africa/Ceuta.ics
+share/libical/zoneinfo/Africa/Conakry.ics
+share/libical/zoneinfo/Africa/Dakar.ics
+share/libical/zoneinfo/Africa/Dar_es_Salaam.ics
+share/libical/zoneinfo/Africa/Djibouti.ics
+share/libical/zoneinfo/Africa/Douala.ics
+share/libical/zoneinfo/Africa/El_Aaiun.ics
+share/libical/zoneinfo/Africa/Freetown.ics
+share/libical/zoneinfo/Africa/Gaborone.ics
+share/libical/zoneinfo/Africa/Harare.ics
+share/libical/zoneinfo/Africa/Johannesburg.ics
+share/libical/zoneinfo/Africa/Kampala.ics
+share/libical/zoneinfo/Africa/Khartoum.ics
+share/libical/zoneinfo/Africa/Kigali.ics
+share/libical/zoneinfo/Africa/Kinshasa.ics
+share/libical/zoneinfo/Africa/Lagos.ics
+share/libical/zoneinfo/Africa/Libreville.ics
+share/libical/zoneinfo/Africa/Lome.ics
+share/libical/zoneinfo/Africa/Luanda.ics
+share/libical/zoneinfo/Africa/Lubumbashi.ics
+share/libical/zoneinfo/Africa/Lusaka.ics
+share/libical/zoneinfo/Africa/Malabo.ics
+share/libical/zoneinfo/Africa/Maputo.ics
+share/libical/zoneinfo/Africa/Maseru.ics
+share/libical/zoneinfo/Africa/Mbabane.ics
+share/libical/zoneinfo/Africa/Mogadishu.ics
+share/libical/zoneinfo/Africa/Monrovia.ics
+share/libical/zoneinfo/Africa/Nairobi.ics
+share/libical/zoneinfo/Africa/Ndjamena.ics
+share/libical/zoneinfo/Africa/Niamey.ics
+share/libical/zoneinfo/Africa/Nouakchott.ics
+share/libical/zoneinfo/Africa/Ouagadougou.ics
+share/libical/zoneinfo/Africa/Porto-Novo.ics
+share/libical/zoneinfo/Africa/Sao_Tome.ics
+share/libical/zoneinfo/Africa/Timbuktu.ics
+share/libical/zoneinfo/Africa/Tripoli.ics
+share/libical/zoneinfo/Africa/Tunis.ics
+share/libical/zoneinfo/Africa/Windhoek.ics
+share/libical/zoneinfo/America/Adak.ics
+share/libical/zoneinfo/America/Anchorage.ics
+share/libical/zoneinfo/America/Anguilla.ics
+share/libical/zoneinfo/America/Antigua.ics
+share/libical/zoneinfo/America/Araguaina.ics
+share/libical/zoneinfo/America/Aruba.ics
+share/libical/zoneinfo/America/Asuncion.ics
+share/libical/zoneinfo/America/Barbados.ics
+share/libical/zoneinfo/America/Belem.ics
+share/libical/zoneinfo/America/Belize.ics
+share/libical/zoneinfo/America/Boa_Vista.ics
+share/libical/zoneinfo/America/Bogota.ics
+share/libical/zoneinfo/America/Boise.ics
+share/libical/zoneinfo/America/Buenos_Aires.ics
+share/libical/zoneinfo/America/Cambridge_Bay.ics
+share/libical/zoneinfo/America/Cancun.ics
+share/libical/zoneinfo/America/Caracas.ics
+share/libical/zoneinfo/America/Catamarca.ics
+share/libical/zoneinfo/America/Cayenne.ics
+share/libical/zoneinfo/America/Cayman.ics
+share/libical/zoneinfo/America/Chicago.ics
+share/libical/zoneinfo/America/Chihuahua.ics
+share/libical/zoneinfo/America/Cordoba.ics
+share/libical/zoneinfo/America/Costa_Rica.ics
+share/libical/zoneinfo/America/Cuiaba.ics
+share/libical/zoneinfo/America/Curacao.ics
+share/libical/zoneinfo/America/Dawson.ics
+share/libical/zoneinfo/America/Dawson_Creek.ics
+share/libical/zoneinfo/America/Denver.ics
+share/libical/zoneinfo/America/Detroit.ics
+share/libical/zoneinfo/America/Dominica.ics
+share/libical/zoneinfo/America/Edmonton.ics
+share/libical/zoneinfo/America/Eirunepe.ics
+share/libical/zoneinfo/America/El_Salvador.ics
+share/libical/zoneinfo/America/Fortaleza.ics
+share/libical/zoneinfo/America/Glace_Bay.ics
+share/libical/zoneinfo/America/Godthab.ics
+share/libical/zoneinfo/America/Goose_Bay.ics
+share/libical/zoneinfo/America/Grand_Turk.ics
+share/libical/zoneinfo/America/Grenada.ics
+share/libical/zoneinfo/America/Guadeloupe.ics
+share/libical/zoneinfo/America/Guatemala.ics
+share/libical/zoneinfo/America/Guayaquil.ics
+share/libical/zoneinfo/America/Guyana.ics
+share/libical/zoneinfo/America/Halifax.ics
+share/libical/zoneinfo/America/Havana.ics
+share/libical/zoneinfo/America/Hermosillo.ics
+share/libical/zoneinfo/America/Indiana/Indianapolis.ics
+share/libical/zoneinfo/America/Indiana/Knox.ics
+share/libical/zoneinfo/America/Indiana/Marengo.ics
+share/libical/zoneinfo/America/Indiana/Vevay.ics
+share/libical/zoneinfo/America/Indianapolis.ics
+share/libical/zoneinfo/America/Inuvik.ics
+share/libical/zoneinfo/America/Iqaluit.ics
+share/libical/zoneinfo/America/Jamaica.ics
+share/libical/zoneinfo/America/Jujuy.ics
+share/libical/zoneinfo/America/Juneau.ics
+share/libical/zoneinfo/America/Kentucky/Louisville.ics
+share/libical/zoneinfo/America/Kentucky/Monticello.ics
+share/libical/zoneinfo/America/La_Paz.ics
+share/libical/zoneinfo/America/Lima.ics
+share/libical/zoneinfo/America/Los_Angeles.ics
+share/libical/zoneinfo/America/Louisville.ics
+share/libical/zoneinfo/America/Maceio.ics
+share/libical/zoneinfo/America/Managua.ics
+share/libical/zoneinfo/America/Manaus.ics
+share/libical/zoneinfo/America/Martinique.ics
+share/libical/zoneinfo/America/Mazatlan.ics
+share/libical/zoneinfo/America/Mendoza.ics
+share/libical/zoneinfo/America/Menominee.ics
+share/libical/zoneinfo/America/Merida.ics
+share/libical/zoneinfo/America/Mexico_City.ics
+share/libical/zoneinfo/America/Miquelon.ics
+share/libical/zoneinfo/America/Monterrey.ics
+share/libical/zoneinfo/America/Montevideo.ics
+share/libical/zoneinfo/America/Montreal.ics
+share/libical/zoneinfo/America/Montserrat.ics
+share/libical/zoneinfo/America/Nassau.ics
+share/libical/zoneinfo/America/New_York.ics
+share/libical/zoneinfo/America/Nipigon.ics
+share/libical/zoneinfo/America/Nome.ics
+share/libical/zoneinfo/America/Noronha.ics
+share/libical/zoneinfo/America/Panama.ics
+share/libical/zoneinfo/America/Pangnirtung.ics
+share/libical/zoneinfo/America/Paramaribo.ics
+share/libical/zoneinfo/America/Phoenix.ics
+share/libical/zoneinfo/America/Port-au-Prince.ics
+share/libical/zoneinfo/America/Port_of_Spain.ics
+share/libical/zoneinfo/America/Porto_Velho.ics
+share/libical/zoneinfo/America/Puerto_Rico.ics
+share/libical/zoneinfo/America/Rainy_River.ics
+share/libical/zoneinfo/America/Rankin_Inlet.ics
+share/libical/zoneinfo/America/Recife.ics
+share/libical/zoneinfo/America/Regina.ics
+share/libical/zoneinfo/America/Rio_Branco.ics
+share/libical/zoneinfo/America/Rosario.ics
+share/libical/zoneinfo/America/Santiago.ics
+share/libical/zoneinfo/America/Santo_Domingo.ics
+share/libical/zoneinfo/America/Sao_Paulo.ics
+share/libical/zoneinfo/America/Scoresbysund.ics
+share/libical/zoneinfo/America/Shiprock.ics
+share/libical/zoneinfo/America/St_Johns.ics
+share/libical/zoneinfo/America/St_Kitts.ics
+share/libical/zoneinfo/America/St_Lucia.ics
+share/libical/zoneinfo/America/St_Thomas.ics
+share/libical/zoneinfo/America/St_Vincent.ics
+share/libical/zoneinfo/America/Swift_Current.ics
+share/libical/zoneinfo/America/Tegucigalpa.ics
+share/libical/zoneinfo/America/Thule.ics
+share/libical/zoneinfo/America/Thunder_Bay.ics
+share/libical/zoneinfo/America/Tijuana.ics
+share/libical/zoneinfo/America/Tortola.ics
+share/libical/zoneinfo/America/Vancouver.ics
+share/libical/zoneinfo/America/Whitehorse.ics
+share/libical/zoneinfo/America/Winnipeg.ics
+share/libical/zoneinfo/America/Yakutat.ics
+share/libical/zoneinfo/America/Yellowknife.ics
+share/libical/zoneinfo/Antarctica/Casey.ics
+share/libical/zoneinfo/Antarctica/Davis.ics
+share/libical/zoneinfo/Antarctica/DumontDUrville.ics
+share/libical/zoneinfo/Antarctica/Mawson.ics
+share/libical/zoneinfo/Antarctica/McMurdo.ics
+share/libical/zoneinfo/Antarctica/Palmer.ics
+share/libical/zoneinfo/Antarctica/South_Pole.ics
+share/libical/zoneinfo/Antarctica/Syowa.ics
+share/libical/zoneinfo/Antarctica/Vostok.ics
+share/libical/zoneinfo/Arctic/Longyearbyen.ics
+share/libical/zoneinfo/Asia/Aden.ics
+share/libical/zoneinfo/Asia/Almaty.ics
+share/libical/zoneinfo/Asia/Amman.ics
+share/libical/zoneinfo/Asia/Anadyr.ics
+share/libical/zoneinfo/Asia/Aqtau.ics
+share/libical/zoneinfo/Asia/Aqtobe.ics
+share/libical/zoneinfo/Asia/Ashgabat.ics
+share/libical/zoneinfo/Asia/Baghdad.ics
+share/libical/zoneinfo/Asia/Bahrain.ics
+share/libical/zoneinfo/Asia/Baku.ics
+share/libical/zoneinfo/Asia/Bangkok.ics
+share/libical/zoneinfo/Asia/Beirut.ics
+share/libical/zoneinfo/Asia/Bishkek.ics
+share/libical/zoneinfo/Asia/Brunei.ics
+share/libical/zoneinfo/Asia/Calcutta.ics
+share/libical/zoneinfo/Asia/Chungking.ics
+share/libical/zoneinfo/Asia/Colombo.ics
+share/libical/zoneinfo/Asia/Damascus.ics
+share/libical/zoneinfo/Asia/Dhaka.ics
+share/libical/zoneinfo/Asia/Dili.ics
+share/libical/zoneinfo/Asia/Dubai.ics
+share/libical/zoneinfo/Asia/Dushanbe.ics
+share/libical/zoneinfo/Asia/Gaza.ics
+share/libical/zoneinfo/Asia/Harbin.ics
+share/libical/zoneinfo/Asia/Hong_Kong.ics
+share/libical/zoneinfo/Asia/Hovd.ics
+share/libical/zoneinfo/Asia/Irkutsk.ics
+share/libical/zoneinfo/Asia/Istanbul.ics
+share/libical/zoneinfo/Asia/Jakarta.ics
+share/libical/zoneinfo/Asia/Jayapura.ics
+share/libical/zoneinfo/Asia/Jerusalem.ics
+share/libical/zoneinfo/Asia/Kabul.ics
+share/libical/zoneinfo/Asia/Kamchatka.ics
+share/libical/zoneinfo/Asia/Karachi.ics
+share/libical/zoneinfo/Asia/Kashgar.ics
+share/libical/zoneinfo/Asia/Katmandu.ics
+share/libical/zoneinfo/Asia/Krasnoyarsk.ics
+share/libical/zoneinfo/Asia/Kuala_Lumpur.ics
+share/libical/zoneinfo/Asia/Kuching.ics
+share/libical/zoneinfo/Asia/Kuwait.ics
+share/libical/zoneinfo/Asia/Macao.ics
+share/libical/zoneinfo/Asia/Magadan.ics
+share/libical/zoneinfo/Asia/Manila.ics
+share/libical/zoneinfo/Asia/Muscat.ics
+share/libical/zoneinfo/Asia/Nicosia.ics
+share/libical/zoneinfo/Asia/Novosibirsk.ics
+share/libical/zoneinfo/Asia/Omsk.ics
+share/libical/zoneinfo/Asia/Phnom_Penh.ics
+share/libical/zoneinfo/Asia/Pontianak.ics
+share/libical/zoneinfo/Asia/Pyongyang.ics
+share/libical/zoneinfo/Asia/Qatar.ics
+share/libical/zoneinfo/Asia/Rangoon.ics
+share/libical/zoneinfo/Asia/Riyadh.ics
+share/libical/zoneinfo/Asia/Saigon.ics
+share/libical/zoneinfo/Asia/Samarkand.ics
+share/libical/zoneinfo/Asia/Seoul.ics
+share/libical/zoneinfo/Asia/Shanghai.ics
+share/libical/zoneinfo/Asia/Singapore.ics
+share/libical/zoneinfo/Asia/Taipei.ics
+share/libical/zoneinfo/Asia/Tashkent.ics
+share/libical/zoneinfo/Asia/Tbilisi.ics
+share/libical/zoneinfo/Asia/Tehran.ics
+share/libical/zoneinfo/Asia/Thimphu.ics
+share/libical/zoneinfo/Asia/Tokyo.ics
+share/libical/zoneinfo/Asia/Ujung_Pandang.ics
+share/libical/zoneinfo/Asia/Ulaanbaatar.ics
+share/libical/zoneinfo/Asia/Urumqi.ics
+share/libical/zoneinfo/Asia/Vientiane.ics
+share/libical/zoneinfo/Asia/Vladivostok.ics
+share/libical/zoneinfo/Asia/Yakutsk.ics
+share/libical/zoneinfo/Asia/Yekaterinburg.ics
+share/libical/zoneinfo/Asia/Yerevan.ics
+share/libical/zoneinfo/Atlantic/Azores.ics
+share/libical/zoneinfo/Atlantic/Bermuda.ics
+share/libical/zoneinfo/Atlantic/Canary.ics
+share/libical/zoneinfo/Atlantic/Cape_Verde.ics
+share/libical/zoneinfo/Atlantic/Faeroe.ics
+share/libical/zoneinfo/Atlantic/Jan_Mayen.ics
+share/libical/zoneinfo/Atlantic/Madeira.ics
+share/libical/zoneinfo/Atlantic/Reykjavik.ics
+share/libical/zoneinfo/Atlantic/South_Georgia.ics
+share/libical/zoneinfo/Atlantic/St_Helena.ics
+share/libical/zoneinfo/Atlantic/Stanley.ics
+share/libical/zoneinfo/Australia/Adelaide.ics
+share/libical/zoneinfo/Australia/Brisbane.ics
+share/libical/zoneinfo/Australia/Broken_Hill.ics
+share/libical/zoneinfo/Australia/Darwin.ics
+share/libical/zoneinfo/Australia/Hobart.ics
+share/libical/zoneinfo/Australia/Lindeman.ics
+share/libical/zoneinfo/Australia/Lord_Howe.ics
+share/libical/zoneinfo/Australia/Melbourne.ics
+share/libical/zoneinfo/Australia/Perth.ics
+share/libical/zoneinfo/Australia/Sydney.ics
+share/libical/zoneinfo/Europe/Amsterdam.ics
+share/libical/zoneinfo/Europe/Andorra.ics
+share/libical/zoneinfo/Europe/Athens.ics
+share/libical/zoneinfo/Europe/Belfast.ics
+share/libical/zoneinfo/Europe/Belgrade.ics
+share/libical/zoneinfo/Europe/Berlin.ics
+share/libical/zoneinfo/Europe/Bratislava.ics
+share/libical/zoneinfo/Europe/Brussels.ics
+share/libical/zoneinfo/Europe/Bucharest.ics
+share/libical/zoneinfo/Europe/Budapest.ics
+share/libical/zoneinfo/Europe/Chisinau.ics
+share/libical/zoneinfo/Europe/Copenhagen.ics
+share/libical/zoneinfo/Europe/Dublin.ics
+share/libical/zoneinfo/Europe/Gibraltar.ics
+share/libical/zoneinfo/Europe/Helsinki.ics
+share/libical/zoneinfo/Europe/Istanbul.ics
+share/libical/zoneinfo/Europe/Kaliningrad.ics
+share/libical/zoneinfo/Europe/Kiev.ics
+share/libical/zoneinfo/Europe/Lisbon.ics
+share/libical/zoneinfo/Europe/Ljubljana.ics
+share/libical/zoneinfo/Europe/London.ics
+share/libical/zoneinfo/Europe/Luxembourg.ics
+share/libical/zoneinfo/Europe/Madrid.ics
+share/libical/zoneinfo/Europe/Malta.ics
+share/libical/zoneinfo/Europe/Minsk.ics
+share/libical/zoneinfo/Europe/Monaco.ics
+share/libical/zoneinfo/Europe/Moscow.ics
+share/libical/zoneinfo/Europe/Nicosia.ics
+share/libical/zoneinfo/Europe/Oslo.ics
+share/libical/zoneinfo/Europe/Paris.ics
+share/libical/zoneinfo/Europe/Prague.ics
+share/libical/zoneinfo/Europe/Riga.ics
+share/libical/zoneinfo/Europe/Rome.ics
+share/libical/zoneinfo/Europe/Samara.ics
+share/libical/zoneinfo/Europe/San_Marino.ics
+share/libical/zoneinfo/Europe/Sarajevo.ics
+share/libical/zoneinfo/Europe/Simferopol.ics
+share/libical/zoneinfo/Europe/Skopje.ics
+share/libical/zoneinfo/Europe/Sofia.ics
+share/libical/zoneinfo/Europe/Stockholm.ics
+share/libical/zoneinfo/Europe/Tallinn.ics
+share/libical/zoneinfo/Europe/Tirane.ics
+share/libical/zoneinfo/Europe/Uzhgorod.ics
+share/libical/zoneinfo/Europe/Vaduz.ics
+share/libical/zoneinfo/Europe/Vatican.ics
+share/libical/zoneinfo/Europe/Vienna.ics
+share/libical/zoneinfo/Europe/Vilnius.ics
+share/libical/zoneinfo/Europe/Warsaw.ics
+share/libical/zoneinfo/Europe/Zagreb.ics
+share/libical/zoneinfo/Europe/Zaporozhye.ics
+share/libical/zoneinfo/Europe/Zurich.ics
+share/libical/zoneinfo/Indian/Antananarivo.ics
+share/libical/zoneinfo/Indian/Chagos.ics
+share/libical/zoneinfo/Indian/Christmas.ics
+share/libical/zoneinfo/Indian/Cocos.ics
+share/libical/zoneinfo/Indian/Comoro.ics
+share/libical/zoneinfo/Indian/Kerguelen.ics
+share/libical/zoneinfo/Indian/Mahe.ics
+share/libical/zoneinfo/Indian/Maldives.ics
+share/libical/zoneinfo/Indian/Mauritius.ics
+share/libical/zoneinfo/Indian/Mayotte.ics
+share/libical/zoneinfo/Indian/Reunion.ics
+share/libical/zoneinfo/Pacific/Apia.ics
+share/libical/zoneinfo/Pacific/Auckland.ics
+share/libical/zoneinfo/Pacific/Chatham.ics
+share/libical/zoneinfo/Pacific/Easter.ics
+share/libical/zoneinfo/Pacific/Efate.ics
+share/libical/zoneinfo/Pacific/Enderbury.ics
+share/libical/zoneinfo/Pacific/Fakaofo.ics
+share/libical/zoneinfo/Pacific/Fiji.ics
+share/libical/zoneinfo/Pacific/Funafuti.ics
+share/libical/zoneinfo/Pacific/Galapagos.ics
+share/libical/zoneinfo/Pacific/Gambier.ics
+share/libical/zoneinfo/Pacific/Guadalcanal.ics
+share/libical/zoneinfo/Pacific/Guam.ics
+share/libical/zoneinfo/Pacific/Honolulu.ics
+share/libical/zoneinfo/Pacific/Johnston.ics
+share/libical/zoneinfo/Pacific/Kiritimati.ics
+share/libical/zoneinfo/Pacific/Kosrae.ics
+share/libical/zoneinfo/Pacific/Kwajalein.ics
+share/libical/zoneinfo/Pacific/Majuro.ics
+share/libical/zoneinfo/Pacific/Marquesas.ics
+share/libical/zoneinfo/Pacific/Midway.ics
+share/libical/zoneinfo/Pacific/Nauru.ics
+share/libical/zoneinfo/Pacific/Niue.ics
+share/libical/zoneinfo/Pacific/Norfolk.ics
+share/libical/zoneinfo/Pacific/Noumea.ics
+share/libical/zoneinfo/Pacific/Pago_Pago.ics
+share/libical/zoneinfo/Pacific/Palau.ics
+share/libical/zoneinfo/Pacific/Pitcairn.ics
+share/libical/zoneinfo/Pacific/Ponape.ics
+share/libical/zoneinfo/Pacific/Port_Moresby.ics
+share/libical/zoneinfo/Pacific/Rarotonga.ics
+share/libical/zoneinfo/Pacific/Saipan.ics
+share/libical/zoneinfo/Pacific/Tahiti.ics
+share/libical/zoneinfo/Pacific/Tarawa.ics
+share/libical/zoneinfo/Pacific/Tongatapu.ics
+share/libical/zoneinfo/Pacific/Truk.ics
+share/libical/zoneinfo/Pacific/Wake.ics
+share/libical/zoneinfo/Pacific/Wallis.ics
+share/libical/zoneinfo/Pacific/Yap.ics
+share/libical/zoneinfo/zones.tab
+share/locale/az/LC_MESSAGES/evolution.mo
+share/locale/ca/LC_MESSAGES/evolution.mo
+share/locale/da/LC_MESSAGES/evolution.mo
+share/locale/de/LC_MESSAGES/evolution.mo
+share/locale/el/LC_MESSAGES/evolution.mo
+share/locale/en_GB/LC_MESSAGES/evolution.mo
+share/locale/es/LC_MESSAGES/evolution.mo
+share/locale/fi/LC_MESSAGES/evolution.mo
+share/locale/fr/LC_MESSAGES/evolution.mo
+share/locale/ga/LC_MESSAGES/evolution.mo
+share/locale/gl/LC_MESSAGES/evolution.mo
+share/locale/hu/LC_MESSAGES/evolution.mo
+share/locale/it/LC_MESSAGES/evolution.mo
+share/locale/ja/LC_MESSAGES/evolution.mo
+share/locale/ko/LC_MESSAGES/evolution.mo
+share/locale/lt/LC_MESSAGES/evolution.mo
+share/locale/nl/LC_MESSAGES/evolution.mo
+share/locale/nn/LC_MESSAGES/evolution.mo
+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
 share/mime-info/evolution.keys
 share/mime-info/evolution.mime
 share/oaf/GNOME_Evolution_Addressbook.oaf
-share/oaf/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf
 share/oaf/GNOME_Evolution_Addressbook_SelectNames.oaf
+share/oaf/GNOME_Evolution_Addressbook_VCard_Importer.oaf
 share/oaf/GNOME_Evolution_Calendar.oaf
 share/oaf/GNOME_Evolution_Calendar_AlarmNotify.oaf
+share/oaf/GNOME_Evolution_Elm_Intelligent_Importer.oaf
+share/oaf/GNOME_Evolution_GnomeCard_Intelligent_Importer.oaf
 share/oaf/GNOME_Evolution_Mail.oaf
-share/oaf/GNOME_Evolution_Mail_Elm_Intelligent_Importer.oaf
 share/oaf/GNOME_Evolution_Mail_Mbox_Importer.oaf
-share/oaf/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.oaf
 share/oaf/GNOME_Evolution_Mail_Outlook_Importer.oaf
-share/oaf/GNOME_Evolution_Mail_Pine_Intelligent_Importer.oaf
+share/oaf/GNOME_Evolution_Netscape_Intelligent_Importer.oaf
+share/oaf/GNOME_Evolution_Pine_Intelligent_Importer.oaf
 share/oaf/GNOME_Evolution_Shell.oaf
 share/oaf/GNOME_Evolution_Summary.oaf
-share/oaf/GNOME_Evolution_Summary_rdf.oaf
-share/oaf/GNOME_Evolution_Summary_test.oaf
 share/oaf/GNOME_Evolution_Wombat.oaf
 share/pixmaps/evolution.png
-@exec mkdir -p %D/share/gnome/help/cal/C
-@exec mkdir -p %D/share/evolution/default_user/news
+@dirrm share/libical/zoneinfo/Pacific
+@dirrm share/libical/zoneinfo/Indian
+@dirrm share/libical/zoneinfo/Europe
+@dirrm share/libical/zoneinfo/Australia
+@dirrm share/libical/zoneinfo/Atlantic
+@dirrm share/libical/zoneinfo/Asia
+@dirrm share/libical/zoneinfo/Arctic
+@dirrm share/libical/zoneinfo/Antarctica
+@dirrm share/libical/zoneinfo/America/Kentucky
+@dirrm share/libical/zoneinfo/America/Indiana
+@dirrm share/libical/zoneinfo/America
+@dirrm share/libical/zoneinfo/Africa
+@dirrm share/libical/zoneinfo
+@dirrm share/libical
 @dirrm share/images/evolution/conduits
+@dirrm share/images/evolution/categories
 @dirrm share/images/evolution/buttons
 @dirrm share/images/evolution
-@dirrm share/gnome/help/evolution/C/stylesheet-images
-@dirrm share/gnome/help/evolution/C/fig
+@exec /bin/mkdir -p /usr/X11R6/share/gnome/html/evolution-devel-guide
+@dirrm share/gnome/html/evolution-devel-guide
+@exec /bin/mkdir -p /usr/X11R6/share/gnome/html/evolution-cal-util
+@dirrm share/gnome/html/evolution-cal-util
+@exec /bin/mkdir -p /usr/X11R6/share/gnome/html/evolution-cal-client
+@dirrm share/gnome/html/evolution-cal-client
+@exec /bin/mkdir -p /usr/X11R6/share/gnome/help/evolution/C/evolution-guide/stylesheet-images
+@dirrm share/gnome/help/evolution/C/evolution-guide/stylesheet-images
+@exec /bin/mkdir -p /usr/X11R6/share/gnome/help/evolution/C/evolution-guide/fig
+@dirrm share/gnome/help/evolution/C/evolution-guide/fig
+@dirrm share/gnome/help/evolution/C/evolution-guide
+@exec /bin/mkdir -p /usr/X11R6/share/gnome/help/evolution/C/evolution-faq
+@dirrm share/gnome/help/evolution/C/evolution-faq
 @dirrm share/gnome/help/evolution/C
 @dirrm share/gnome/help/evolution
+@exec /bin/mkdir -p /usr/X11R6/share/gnome/help/cal/C
 @dirrm share/gnome/help/cal/C
 @dirrm share/gnome/help/cal
 @dirrm share/evolution/views/tasks
-@dirrm share/evolution/views/addressbook
 @dirrm share/evolution/views/mail
+@dirrm share/evolution/views/calendar
+@dirrm share/evolution/views/addressbook
 @dirrm share/evolution/views
 @dirrm share/evolution/glade
+@dirrm share/evolution/etspec
 @dirrm share/evolution/ecps
-@dirrm share/evolution/default_user/news
 @dirrm share/evolution/default_user/local/Trash
 @dirrm share/evolution/default_user/local/Tasks
 @dirrm share/evolution/default_user/local/Sent
 @dirrm share/evolution/default_user/local/Outbox
 @dirrm share/evolution/default_user/local/Inbox
-@dirrm share/evolution/default_user/local/Executive-Summary
 @dirrm share/evolution/default_user/local/Drafts
 @dirrm share/evolution/default_user/local/Contacts
 @dirrm share/evolution/default_user/local/Calendar
 @dirrm share/evolution/default_user/local
 @dirrm share/evolution/default_user
 @dirrm share/evolution
-@dirrm lib/evolution/evolution-mail-importers/0.10
+@dirrm lib/evolution/evolution-mail-importers/0.12
 @dirrm lib/evolution/evolution-mail-importers
-@dirrm lib/evolution/camel-providers/0.10
+@dirrm lib/evolution/camel-providers/0.12
 @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