Update evolution to 0.10. This closes PR 13013 by Matthias Scheler

<tron@netbsd.org>

Notable changes include:

Shell:
  - Fixed some usability bugs in the folder selection and creation
    dialogs.
  - Added a --debug option.
  - Added support for drag and drop operations.

Mail:
  - Virtual Trash folders in each mail storage and "Empty Trash" menu
    item to expunge all folders in a store.
  - Email addresses in mail headers are now right-clickable to add
    them to the Addressbook
  - Hide deleted messages is now a mode rather than a one-time
    operation.
  - When sending plain text mail, use the new plain text mode of the
    GtkHTML editor
  - Cancellable operations, cancellable/async dns lookup, slightly
    improved progress reporting.
  - Allow per-identity Draft and Sent folders.
  - Replies quoted with "> " in messages are now displayed dimmed to
    make it easier to find the new bits of text.
  - Saved searches.  Searches now configurable via XML with supporting
    C code.
  - UNMATCHED vFolder
  - SASL Authentication
  - Filter/vFolder on Mailing List.
  - Resend sent items.
  - Allow users to turn on/off headers in the composer and added
    Reply-To header entry in the composer.
  - Numerous OpenPGP
  - Replying to a message chooses account based on message
    addressee's.
  - Redid Forward Inline and Forward Quoted.
  - IMAP fixes: greater configurability for faster startup/mail check
  - IMAP message bodies are now cached to local disk to speed up
    re-access
  - New config dialogs
  - Sorting by a text field in the message list no longer generates a
    random order.
  - Fixed "crash when getting new mail from 2 POP servers" bug.
  - Numerous bugfixes, cleanups and optimisations.

Addressbook:
  - Added support for non editable sources.
  - Added address completion for use in contact entries using the
    select names system.
  - Fixed some major crashes in the addressbook backend.
  - Updated Ximian's contact information.

Calendar:
  - Event creation fixes.
  - Calendar loading fixes and removal of old code.
  - Made the iTIP control have better spacings.
  - i18n fixes.

Tasks:
  - Created a popup list item for ETable to select the Status,
    Classification, Priority, Percent & Transparencey fields.
  - Created a popup date editor item for ETable to set all the dates in the
    tasks.

Importers:
  - Created Intelligent Importers that look for certain files on your disk
    and works out what type of data it is. Currently Intelligent Importers
    exist for Pine, Elm and Netscape.

General:
  - Rewrote ETree in gal.  Changed evolution to support the changes in
    API.
  - Lots of Etable/ETree bug fixes.
  - Lots of i18n/l10n fixes.
    and the Evolution gang)
  - Fixed the shell interface so it could correctly create folders.

9 files changed, 300 insertions, 114 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 838834c2e8b..35597851301 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2001/05/02 11:14:56 zuntum Exp $
+# $NetBSD: Makefile,v 1.3 2001/05/25 06:16:17 rh Exp $
 #
 
-DISTNAME=		evolution-0.9
+DISTNAME=		evolution-0.10
 CATEGORIES=		mail time gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=unstable/sources/evolution/}
 
@@ -9,16 +9,16 @@ MAINTAINER=		rh@netbsd.org
 HOMEPAGE=		http://www.ximian.com/apps/evolution.php3
 COMMENT=		GNOME mailer, calendar, contact manager, and communications tool
 
-DEPENDS+=		gal>=0.4.1:../../devel/gal
-DEPENDS+=		bonobo>=0.30:../../devel/bonobo
+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.1:../../sysutils/gnome-vfs
+DEPENDS+=		gnome-vfs>=0.4.2:../../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+=		gdk-pixbuf>=0.8.0:../../graphics/gdk-pixbuf
-DEPENDS+=		openldap>=1.2.11:../../databases/openldap
+DEPENDS+=		gdk-pixbuf>=0.9.0:../../graphics/gdk-pixbuf
 BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
@@ -26,8 +26,10 @@ USE_GMAKE=		YES
 USE_X11BASE=		YES
 USE_LIBINTL=		YES
 USE_LIBTOOL=		YES
+YACC=			${PREFIX}/bin/bison -y
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+CONFIGURE_ARGS+=	--enable-ldap=no
 CONFIGURE_ENV+=		CFLAGS="-D_POSIX_THREAD_SYSCALL_SOFT=1 ${CFLAGS}"
 CPPFLAGS+=		-D_POSIX_THREAD_SYSCALL_SOFT=1
 
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index f1331fc3840..57c0a947e1b 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,14 +1,16 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $
+$NetBSD: distinfo,v 1.2 2001/05/25 06:16:17 rh Exp $
 
-SHA1 (evolution-0.9.tar.gz) = 3174cd62aac4454e899938d9ae4541b90bfa0453
-Size (evolution-0.9.tar.gz) = 5732419 bytes
-SHA1 (patch-aa) = d4e0bbcb582244de377d7e3a05323dd3e59721f6
-SHA1 (patch-ab) = a67a0dd5411b84c6d3bf02249d76f9e6e8b9f8b6
+SHA1 (evolution-0.10.tar.gz) = 40c1f9ef56a0c1b7033e8c5f9058271fdee48df0
+Size (evolution-0.10.tar.gz) = 6342426 bytes
+SHA1 (patch-aa) = 90d125bb7cd4d05ed4fb73e472a8e62a18cb66a5
+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) = 88ff2a440b5074a00e003019ffa21c7f5a0d5357
-SHA1 (patch-aj) = b6c0d610cfa0261e09b29417f778cbe2d31e3f78
+SHA1 (patch-ai) = 3f4c95b1ba55ebfd561106642adc88b24a47fb6a
+SHA1 (patch-aj) = 33953c59caa04bab39d7eb3e736b37e9c78e56b7
+SHA1 (patch-ak) = 1f367591284d27beeecd8c9f9308ca77dda8f7fb
+SHA1 (patch-al) = 0cd81aecf9192c4d856c381528afb837b8c4a71b
diff --git a/mail/evolution/patches/patch-aa b/mail/evolution/patches/patch-aa
index 4499a56ba0b..23b1e33d235 100644
--- a/mail/evolution/patches/patch-aa
+++ b/mail/evolution/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $
+$NetBSD: patch-aa,v 1.2 2001/05/25 06:16:17 rh Exp $
 
---- configure.orig	Tue Mar 13 19:55:14 2001
+--- configure.orig	Thu Apr 26 23:50:36 2001
 +++ configure
-@@ -4177,13 +4177,13 @@
- if { (eval echo configure:4178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -4660,13 +4660,13 @@
+ if { (eval echo configure:4661: \"$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.1.1.1 2001/04/26 05:57:22 rh Exp $
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -4412,7 +4412,7 @@
+@@ -4895,7 +4895,7 @@
        # We need to process the po/ directory.
        POSUB=po
      else
diff --git a/mail/evolution/patches/patch-ab b/mail/evolution/patches/patch-ab
index 805b748a8be..6fd9dc2ed3e 100644
--- a/mail/evolution/patches/patch-ab
+++ b/mail/evolution/patches/patch-ab
@@ -1,11 +1,12 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $
+$NetBSD: patch-ab,v 1.2 2001/05/25 06:16:17 rh Exp $
 
---- mail/main.c.orig	Tue Apr 24 17:29:10 2001
+--- mail/main.c.orig	Wed Mar 14 00:31:06 2001
 +++ mail/main.c
-@@ -31,6 +31,23 @@
+@@ -31,6 +31,24 @@
  #include "mail.h"
  #include "mail-mt.h"
  
++
 +#ifdef __NetBSD__
 +#include <gtk/gtk.h>
 +#include <pthread.h>
@@ -23,10 +24,10 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $
 +}
 +#endif
 +
- #if 0
- static int blowup(int status)
- {
-@@ -117,6 +134,10 @@
+ /*#define DO_MCHECK*/
+ 
+ #ifdef DO_MCHECK
+@@ -129,6 +147,10 @@
  		g_mutex_free (gdk_threads_mutex);
  		gdk_threads_mutex = NULL;
  	}
diff --git a/mail/evolution/patches/patch-ai b/mail/evolution/patches/patch-ai
index 405e426c9b0..10f6fe93408 100644
--- a/mail/evolution/patches/patch-ai
+++ b/mail/evolution/patches/patch-ai
@@ -1,17 +1,17 @@
-$NetBSD: patch-ai,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $
+$NetBSD: patch-ai,v 1.2 2001/05/25 06:16:18 rh Exp $
 
---- wombat/Makefile.in.orig	Tue Mar 13 21:13:10 2001
+--- wombat/Makefile.in.orig	Thu Apr 26 23:53:05 2001
 +++ wombat/Makefile.in
-@@ -177,7 +177,7 @@
- wombat_SOURCES =  	wombat.c
+@@ -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)
++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)
  
  
- wombat_LDFLAGS = `gnome-config --libs gnorba` 
-@@ -299,6 +299,8 @@
+ oafdir = $(datadir)/oaf
+@@ -295,6 +295,8 @@
  maintainer-clean-libtool:
  
  wombat: $(wombat_OBJECTS) $(wombat_DEPENDENCIES)
diff --git a/mail/evolution/patches/patch-aj b/mail/evolution/patches/patch-aj
index 6ca167f23d2..c3eeffe757d 100644
--- a/mail/evolution/patches/patch-aj
+++ b/mail/evolution/patches/patch-aj
@@ -1,17 +1,17 @@
-$NetBSD: patch-aj,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $
+$NetBSD: patch-aj,v 1.2 2001/05/25 06:16:18 rh Exp $
 
---- calendar/gui/Makefile.in.orig	Tue Mar 13 21:13:07 2001
+--- calendar/gui/Makefile.in.orig	Thu May 24 07:19:17 2001
 +++ calendar/gui/Makefile.in
-@@ -192,7 +192,7 @@
- evolution_calendar_SOURCES =  	$(IDL_GENERATED)				alarm.c						alarm.h						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						popup-menu.c					popup-menu.h					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
+@@ -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
  
  
--evolution_calendar_LDADD =  	$(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						dialogs/libcal-dialogs.a								$(BONOBO_HTML_GNOME_LIBS)								$(BONOBO_VFS_GNOME_LIBS)								$(EXTRA_GNOME_LIBS)									$(INTLLIBS)
-+evolution_calendar_LDADD =  	$(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						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							$(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`
-@@ -330,6 +330,8 @@
+@@ -328,6 +328,8 @@
  maintainer-clean-libtool:
  
  evolution-calendar: $(evolution_calendar_OBJECTS) $(evolution_calendar_DEPENDENCIES)
diff --git a/mail/evolution/patches/patch-ak b/mail/evolution/patches/patch-ak
new file mode 100644
index 00000000000..efd466a689f
--- /dev/null
+++ b/mail/evolution/patches/patch-ak
@@ -0,0 +1,15 @@
+$NetBSD: patch-ak,v 1.1 2001/05/25 06:16:18 rh Exp $
+
+--- composer/e-msg-composer.c.orig	Wed May 23 18:05:52 2001
++++ composer/e-msg-composer.c
+@@ -73,6 +73,10 @@
+ 
+ #define GNOME_GTKHTML_EDITOR_CONTROL_ID "OAFIID:GNOME_GtkHTML_Editor"
+ 
++#ifdef send 
++#undef send
++#endif
++
+ 
+ #define DEFAULT_WIDTH 600
+ #define DEFAULT_HEIGHT 500
diff --git a/mail/evolution/patches/patch-al b/mail/evolution/patches/patch-al
new file mode 100644
index 00000000000..371045ffb8d
--- /dev/null
+++ b/mail/evolution/patches/patch-al
@@ -0,0 +1,22 @@
+$NetBSD: patch-al,v 1.1 2001/05/25 06:16:18 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
+ 
+ 
+-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)
+ 
+ 
+ # 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)
+ 
diff --git a/mail/evolution/pkg/PLIST b/mail/evolution/pkg/PLIST
index e945f4ca425..c2719475f03 100644
--- a/mail/evolution/pkg/PLIST
+++ b/mail/evolution/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/05/25 06:16:18 rh Exp $
 bin/evolution
 bin/evolution-addressbook
+bin/evolution-alarm-notify
 bin/evolution-calendar
 bin/evolution-executive-summary
 bin/evolution-gnomecard-importer
@@ -24,9 +25,9 @@ include/camel/camel-folder-search.h
 include/camel/camel-folder-summary.h
 include/camel/camel-folder-thread.h
 include/camel/camel-folder.h
-include/camel/camel-imap-auth.h
 include/camel/camel-imap-command.h
 include/camel/camel-imap-folder.h
+include/camel/camel-imap-message-cache.h
 include/camel/camel-imap-search.h
 include/camel/camel-imap-store.h
 include/camel/camel-imap-summary.h
@@ -53,6 +54,7 @@ include/camel/camel-mime-filter-bestenc.h
 include/camel/camel-mime-filter-charset.h
 include/camel/camel-mime-filter-crlf.h
 include/camel/camel-mime-filter-from.h
+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
@@ -65,10 +67,17 @@ include/camel/camel-mime-utils.h
 include/camel/camel-movemail.h
 include/camel/camel-multipart.h
 include/camel/camel-object.h
+include/camel/camel-operation.h
 include/camel/camel-pop3-folder.h
 include/camel/camel-pop3-store.h
 include/camel/camel-provider.h
 include/camel/camel-remote-store.h
+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-plain.h
+include/camel/camel-sasl.h
 include/camel/camel-seekable-stream.h
 include/camel/camel-seekable-substream.h
 include/camel/camel-sendmail-transport.h
@@ -82,12 +91,17 @@ include/camel/camel-stream-fs.h
 include/camel/camel-stream-mem.h
 include/camel/camel-stream-null.h
 include/camel/camel-stream.h
+include/camel/camel-tcp-stream-openssl.h
+include/camel/camel-tcp-stream-raw.h
+include/camel/camel-tcp-stream-ssl.h
+include/camel/camel-tcp-stream.h
 include/camel/camel-transport.h
 include/camel/camel-types.h
 include/camel/camel-uid-cache.h
 include/camel/camel-url.h
 include/camel/camel-vee-folder.h
 include/camel/camel-vee-store.h
+include/camel/camel-vtrash-folder.h
 include/camel/camel.h
 include/camel/gstring-util.h
 include/camel/hash-table-utils.h
@@ -103,6 +117,7 @@ include/evolution/cal-util/cal-util.h
 include/evolution/cal-util/timeutil.h
 include/evolution/ebook/e-book-listener.h
 include/evolution/ebook/e-book-types.h
+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
@@ -111,52 +126,73 @@ 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
+include/evolution/ebook/e-destination.h
 include/evolution/importer/GNOME_Evolution_Importer.h
 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/ical.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.9/libcamelimap.a
-lib/evolution/camel-providers/0.9/libcamelimap.la
-lib/evolution/camel-providers/0.9/libcamelimap.so
-lib/evolution/camel-providers/0.9/libcamelimap.so.0
-lib/evolution/camel-providers/0.9/libcamelimap.so.0.0
-lib/evolution/camel-providers/0.9/libcamelimap.urls
-lib/evolution/camel-providers/0.9/libcamellocal.a
-lib/evolution/camel-providers/0.9/libcamellocal.la
-lib/evolution/camel-providers/0.9/libcamellocal.so
-lib/evolution/camel-providers/0.9/libcamellocal.so.0
-lib/evolution/camel-providers/0.9/libcamellocal.so.0.0
-lib/evolution/camel-providers/0.9/libcamellocal.urls
-lib/evolution/camel-providers/0.9/libcamelpop3.a
-lib/evolution/camel-providers/0.9/libcamelpop3.la
-lib/evolution/camel-providers/0.9/libcamelpop3.so
-lib/evolution/camel-providers/0.9/libcamelpop3.so.0
-lib/evolution/camel-providers/0.9/libcamelpop3.so.0.0
-lib/evolution/camel-providers/0.9/libcamelpop3.urls
-lib/evolution/camel-providers/0.9/libcamelsendmail.a
-lib/evolution/camel-providers/0.9/libcamelsendmail.la
-lib/evolution/camel-providers/0.9/libcamelsendmail.so
-lib/evolution/camel-providers/0.9/libcamelsendmail.so.0
-lib/evolution/camel-providers/0.9/libcamelsendmail.so.0.0
-lib/evolution/camel-providers/0.9/libcamelsendmail.urls
-lib/evolution/camel-providers/0.9/libcamelsmtp.a
-lib/evolution/camel-providers/0.9/libcamelsmtp.la
-lib/evolution/camel-providers/0.9/libcamelsmtp.so
-lib/evolution/camel-providers/0.9/libcamelsmtp.so.0
-lib/evolution/camel-providers/0.9/libcamelsmtp.so.0.0
-lib/evolution/camel-providers/0.9/libcamelsmtp.urls
-lib/evolution/camel-providers/0.9/libcamelvee.a
-lib/evolution/camel-providers/0.9/libcamelvee.la
-lib/evolution/camel-providers/0.9/libcamelvee.so
-lib/evolution/camel-providers/0.9/libcamelvee.so.0
-lib/evolution/camel-providers/0.9/libcamelvee.so.0.0
-lib/evolution/camel-providers/0.9/libcamelvee.urls
+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/libcal-client.a
 lib/libcal-client.la
 lib/libcal-client.so
@@ -221,6 +257,7 @@ share/evolution/default_user/local/Outbox/folder-metadata.xml
 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
@@ -250,7 +287,32 @@ share/evolution/glade/select-names.glade
 share/evolution/glade/task-editor-dialog.glade
 share/evolution/summary.html
 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/mail/By_Sender.galview
+share/evolution/views/mail/By_Status.galview
+share/evolution/views/mail/By_Subject.galview
+share/evolution/views/mail/Messages.galview
+share/evolution/views/mail/galview.xml
+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
@@ -265,6 +327,49 @@ 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
@@ -283,10 +388,6 @@ 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/html/evolution-shell-importer-sections.txt
-share/gnome/html/evolution-shell-importer.args
-share/gnome/html/evolution-shell-importer.hierarchy
-share/gnome/html/evolution-shell-importer.types
 share/gnome/ui/evolution-addressbook.xml
 share/gnome/ui/evolution-calendar.xml
 share/gnome/ui/evolution-contact-editor.xml
@@ -304,6 +405,7 @@ share/idl/Evolution-LocalStorage.idl
 share/idl/Evolution-Session.idl
 share/idl/Evolution-Shell.idl
 share/idl/Evolution-ShellComponent.idl
+share/idl/Evolution-ShellComponentDnd.idl
 share/idl/Evolution-ShellView.idl
 share/idl/Evolution-Storage.idl
 share/idl/Evolution-StorageSetView.idl
@@ -311,37 +413,39 @@ share/idl/Evolution.idl
 share/idl/GNOME_Evolution_Importer.idl
 share/idl/addressbook.idl
 share/idl/evolution-calendar.idl
-share/images/evolution/16_configure_addressbook.xpm
-share/images/evolution/16_configure_folder.xpm
-share/images/evolution/16_configure_mail.xpm
-share/images/evolution/16_copy_message.xpm
-share/images/evolution/16_edit.xpm
-share/images/evolution/16_encrypt.xpm
-share/images/evolution/16_forward.xpm
-share/images/evolution/16_move_message.xpm
-share/images/evolution/16_print.xpm
-share/images/evolution/16_reply.xpm
-share/images/evolution/16_reply_to_all.xpm
-share/images/evolution/16_save.xpm
-share/images/evolution/24_all_contacts.xpm
-share/images/evolution/24_find_contact.xpm
+share/images/evolution/all_contacts.xpm
 share/images/evolution/briefcase.png
 share/images/evolution/butterfly.png
 share/images/evolution/buttons/add-service.png
 share/images/evolution/buttons/compose-message.png
 share/images/evolution/buttons/copy-message.png
+share/images/evolution/buttons/dayview.xpm
 share/images/evolution/buttons/fetch-mail.png
 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/reply-to-all.png
 share/images/evolution/buttons/reply.png
+share/images/evolution/buttons/send-24-receive.png
+share/images/evolution/buttons/weekview.xpm
+share/images/evolution/buttons/workweekview.xpm
+share/images/evolution/buttons/yearview.xpm
 share/images/evolution/cellphone.png
-share/images/evolution/conduits/16_evo-address-conduit.png
-share/images/evolution/conduits/16_evo-calendar-conduit.png
-share/images/evolution/conduits/16_evo-todo-conduit.png
-share/images/evolution/conduits/48_evo-address-conduit.png
-share/images/evolution/conduits/48_evo-calendar-conduit.png
-share/images/evolution/conduits/48_evo-todo-conduit.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
+share/images/evolution/conduits/evo-48-address-conduit.png
+share/images/evolution/conduits/evo-48-calendar-conduit.png
+share/images/evolution/conduits/evo-48-todo-conduit.png
+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/copy_16_message.xpm
+share/images/evolution/delete_message.xpm
+share/images/evolution/edit.xpm
+share/images/evolution/encrypt.xpm
 share/images/evolution/envelope.png
 share/images/evolution/evolution-calendar-mini.png
 share/images/evolution/evolution-calendar.png
@@ -349,16 +453,38 @@ share/images/evolution/evolution-contacts-mini.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
 share/images/evolution/evolution-tasks.png
+share/images/evolution/evolution-today-mini.png
 share/images/evolution/evolution-today.png
+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/find_contact.xpm
+share/images/evolution/folder.xpm
+share/images/evolution/forward.xpm
 share/images/evolution/globe.png
+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/import.png
+share/images/evolution/import.xpm
 share/images/evolution/malehead.png
+share/images/evolution/move_message.xpm
+share/images/evolution/new-message.xpm
+share/images/evolution/new_appointment.xpm
+share/images/evolution/new_contact.xpm
+share/images/evolution/print-preview.xpm
+share/images/evolution/print.xpm
+share/images/evolution/reply.xpm
+share/images/evolution/reply_to_all.xpm
+share/images/evolution/save.xpm
+share/images/evolution/send-receive.xpm
 share/images/evolution/service-close.png
 share/images/evolution/service-configure.png
 share/images/evolution/service-down-disabled.png
@@ -369,7 +495,11 @@ share/images/evolution/service-right-disabled.png
 share/images/evolution/service-right.png
 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/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
@@ -398,18 +528,26 @@ ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/evolution.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/evolution.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/evolution.mo
 share/mime-info/evolution.keys
-share/oaf/GNOME_Evolution_Addressbook.oafinfo
-share/oaf/GNOME_Evolution_Addressbook_GnomeCard_Importer.oafinfo
-share/oaf/GNOME_Evolution_Addressbook_SelectNames.oafinfo
-share/oaf/GNOME_Evolution_Calendar.oafinfo
-share/oaf/GNOME_Evolution_Calendar_Control.oafinfo
-share/oaf/GNOME_Evolution_Mail.oafinfo
-share/oaf/GNOME_Evolution_Shell.oafinfo
-share/oaf/GNOME_Evolution_Summary.oafinfo
-share/oaf/GNOME_Evolution_Summary_rdf.oafinfo
-share/oaf/GNOME_Evolution_Summary_test.oafinfo
-share/oaf/GNOME_Evolution_Wombat.oafinfo
+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_Calendar.oaf
+share/oaf/GNOME_Evolution_Calendar_AlarmNotify.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_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/images/evolution/conduits
 @dirrm share/images/evolution/buttons
 @dirrm share/images/evolution
@@ -419,6 +557,10 @@ share/pixmaps/evolution.png
 @dirrm share/gnome/help/evolution
 @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
 @dirrm share/evolution/glade
 @dirrm share/evolution/ecps
 @dirrm share/evolution/default_user/news
@@ -434,7 +576,9 @@ share/pixmaps/evolution.png
 @dirrm share/evolution/default_user/local
 @dirrm share/evolution/default_user
 @dirrm share/evolution
-@dirrm lib/evolution/camel-providers/0.9
+@dirrm lib/evolution/evolution-mail-importers/0.10
+@dirrm lib/evolution/evolution-mail-importers
+@dirrm lib/evolution/camel-providers/0.10
 @dirrm lib/evolution/camel-providers
 @dirrm lib/evolution
 @dirrm include/libicalvcal