Update to 3.4.2.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16782 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 434 insertions, 158 deletions

diff --git a/mail/evolution3/Makefile b/mail/evolution3/Makefile
index 3f00de40d..31e887a4b 100644
--- a/mail/evolution3/Makefile
+++ b/mail/evolution3/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution3/Makefile,v 1.22 2012/01/22 11:59:23 kwm Exp $
+#   $MCom: ports/mail/evolution3/Makefile,v 1.23 2012/04/27 02:54:37 mezz Exp $
 #
 
 PORTNAME=	evolution
-PORTVERSION=	3.2.3
+PORTVERSION=	3.4.2
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -15,10 +15,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An integrated mail, calendar and address book distributed suite
 
-LIB_DEPENDS=	nss3.1:${PORTSDIR}/security/nss \
-		goa-1.0.0:${PORTSDIR}/net/gnome-online-accounts \
-		unique-3.0.0:${PORTSDIR}/x11-toolkits/libunique3 \
-		notify.4:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	nss3:${PORTSDIR}/security/nss \
+		goa-1.0:${PORTSDIR}/net/gnome-online-accounts \
+		unique-3.0:${PORTSDIR}/x11-toolkits/libunique3 \
+		notify:${PORTSDIR}/devel/libnotify
 
 CONFLICTS=	evolution-2.[0-9]*
 
@@ -56,8 +56,25 @@ GCONF_SCHEMAS=	apps_evolution_addressbook.schemas \
 		evolution-bogofilter.schemas \
 		evolution-mail.schemas \
 		evolution-spamassassin.schemas
-
-EVO_VERSION=	3.2
+GLIB_SCHEMAS=	org.gnome.evolution.gschema.xml \
+		org.gnome.evolution.addressbook.gschema.xml \
+		org.gnome.evolution.calendar.gschema.xml \
+		org.gnome.evolution.importer.gschema.xml \
+		org.gnome.evolution.mail.gschema.xml \
+		org.gnome.evolution.shell.gschema.xml \
+		org.gnome.evolution.bogofilter.gschema.xml \
+		org.gnome.evolution.spamassassin.gschema.xml \
+		org.gnome.evolution.plugin.attachment-reminder.gschema.xml \
+		org.gnome.evolution.plugin.autocontacts.gschema.xml \
+		org.gnome.evolution.plugin.email-custom-header.gschema.xml \
+		org.gnome.evolution.plugin.external-editor.gschema.xml \
+		org.gnome.evolution.plugin.face-picture.gschema.xml \
+		org.gnome.evolution.plugin.itip.gschema.xml \
+		org.gnome.evolution.plugin.mail-notification.gschema.xml \
+		org.gnome.evolution.plugin.prefer-plain.gschema.xml \
+		org.gnome.evolution.plugin.templates.gschema.xml
+
+EVO_VERSION=	3.4
 PLIST_SUB=	VERSION=${EVO_VERSION} \
 		PORTVERSION=2.12
 
@@ -87,7 +104,6 @@ CONFIGURE_ARGS+=--disable-weather
 PLIST_SUB+=	WEATHER="@comment "
 .endif
 
-
 .if defined(WITH_SPAMASSASSIN)
 RUN_DEPENDS+=	spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 .endif
diff --git a/mail/evolution3/distinfo b/mail/evolution3/distinfo
index a280f46e4..b7e8e4bde 100644
--- a/mail/evolution3/distinfo
+++ b/mail/evolution3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/evolution-3.2.3.tar.xz) = a25d523e775c022ec9e68d7b989316e7252b687d70b9db2f60b72bb833099e9d
-SIZE (gnome3/evolution-3.2.3.tar.xz) = 12419112
+SHA256 (gnome3/evolution-3.4.2.tar.xz) = aa08c5e5abf75b3d617d6ab17d16c5a5b1775558a3cd4415554d5bcd78d1914d
+SIZE (gnome3/evolution-3.4.2.tar.xz) = 12724300
diff --git a/mail/evolution3/files/patch-addressbook_gui_widgets_eab-gui-util.c b/mail/evolution3/files/patch-addressbook_gui_widgets_eab-gui-util.c
deleted file mode 100644
index 291b69e80..000000000
--- a/mail/evolution3/files/patch-addressbook_gui_widgets_eab-gui-util.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- addressbook/gui/widgets/eab-gui-util.c.orig	2011-09-16 16:08:49.000000000 +0200
-+++ addressbook/gui/widgets/eab-gui-util.c	2011-09-16 16:10:29.000000000 +0200
-@@ -655,7 +655,9 @@ get_locales (void)
- 	gchar *dot;
- 	gchar **split;
- 
-+#ifdef __linux__
- 	locale = g_strdup (setlocale (LC_ADDRESS, NULL));
-+#endif
- 	if (!locale)
- 		return NULL;
- 
diff --git a/mail/evolution3/pkg-plist b/mail/evolution3/pkg-plist
index caf3887e0..1fb5fd9e7 100644
--- a/mail/evolution3/pkg-plist
+++ b/mail/evolution3/pkg-plist
@@ -80,11 +80,7 @@ include/evolution-%%VERSION%%/composer/e-composer-post-header.h
 include/evolution-%%VERSION%%/composer/e-composer-private.h
 include/evolution-%%VERSION%%/composer/e-composer-text-header.h
 include/evolution-%%VERSION%%/composer/e-msg-composer.h
-include/evolution-%%VERSION%%/e-util/e-account-utils.h
 include/evolution-%%VERSION%%/e-util/e-activity.h
-include/evolution-%%VERSION%%/e-util/e-alert-dialog.h
-include/evolution-%%VERSION%%/e-util/e-alert-sink.h
-include/evolution-%%VERSION%%/e-util/e-alert.h
 include/evolution-%%VERSION%%/e-util/e-bit-array.h
 include/evolution-%%VERSION%%/e-util/e-categories-config.h
 include/evolution-%%VERSION%%/e-util/e-charset.h
@@ -93,24 +89,18 @@ include/evolution-%%VERSION%%/e-util/e-datetime-format.h
 include/evolution-%%VERSION%%/e-util/e-dialog-utils.h
 include/evolution-%%VERSION%%/e-util/e-dialog-widgets.h
 include/evolution-%%VERSION%%/e-util/e-event.h
-include/evolution-%%VERSION%%/e-util/e-extensible.h
-include/evolution-%%VERSION%%/e-util/e-extension.h
 include/evolution-%%VERSION%%/e-util/e-file-utils.h
 include/evolution-%%VERSION%%/e-util/e-html-utils.h
 include/evolution-%%VERSION%%/e-util/e-icon-factory.h
 include/evolution-%%VERSION%%/e-util/e-import.h
 include/evolution-%%VERSION%%/e-util/e-marshal.h
 include/evolution-%%VERSION%%/e-util/e-mktemp.h
-include/evolution-%%VERSION%%/e-util/e-module.h
 include/evolution-%%VERSION%%/e-util/e-plugin-ui.h
 include/evolution-%%VERSION%%/e-util/e-plugin-util.h
 include/evolution-%%VERSION%%/e-util/e-plugin.h
 include/evolution-%%VERSION%%/e-util/e-poolv.h
 include/evolution-%%VERSION%%/e-util/e-print.h
 include/evolution-%%VERSION%%/e-util/e-selection.h
-include/evolution-%%VERSION%%/e-util/e-signature-list.h
-include/evolution-%%VERSION%%/e-util/e-signature-utils.h
-include/evolution-%%VERSION%%/e-util/e-signature.h
 include/evolution-%%VERSION%%/e-util/e-sorter-array.h
 include/evolution-%%VERSION%%/e-util/e-sorter.h
 include/evolution-%%VERSION%%/e-util/e-text-event-processor-emacs-like.h
@@ -121,8 +111,6 @@ include/evolution-%%VERSION%%/e-util/e-unicode.h
 include/evolution-%%VERSION%%/e-util/e-util-enums.h
 include/evolution-%%VERSION%%/e-util/e-util-enumtypes.h
 include/evolution-%%VERSION%%/e-util/e-util.h
-include/evolution-%%VERSION%%/e-util/e-xml-utils.h
-include/evolution-%%VERSION%%/e-util/gconf-bridge.h
 include/evolution-%%VERSION%%/em-format/em-format-quote.h
 include/evolution-%%VERSION%%/em-format/em-format.h
 include/evolution-%%VERSION%%/em-format/em-inline-filter.h
@@ -139,6 +127,33 @@ include/evolution-%%VERSION%%/filter/e-filter-part.h
 include/evolution-%%VERSION%%/filter/e-filter-rule.h
 include/evolution-%%VERSION%%/filter/e-rule-context.h
 include/evolution-%%VERSION%%/filter/e-rule-editor.h
+include/evolution-%%VERSION%%/libevolution-utils/e-alert.h
+include/evolution-%%VERSION%%/libevolution-utils/e-alert-dialog.h
+include/evolution-%%VERSION%%/libevolution-utils/e-alert-sink.h
+include/evolution-%%VERSION%%/libevolution-utils/e-xml-utils.h
+include/evolution-%%VERSION%%/libevolution-utils/evolution-util.h
+include/evolution-%%VERSION%%/libemail-utils/e-account-utils.h
+include/evolution-%%VERSION%%/libemail-utils/e-signature-list.h
+include/evolution-%%VERSION%%/libemail-utils/e-signature-utils.h
+include/evolution-%%VERSION%%/libemail-utils/e-signature.h
+include/evolution-%%VERSION%%/libemail-utils/em-filter-folder-element.h
+include/evolution-%%VERSION%%/libemail-utils/em-vfolder-context.h
+include/evolution-%%VERSION%%/libemail-utils/em-vfolder-rule.h
+include/evolution-%%VERSION%%/libemail-utils/mail-mt.h
+include/evolution-%%VERSION%%/libemail-engine/camel-null-store.h
+include/evolution-%%VERSION%%/libemail-engine/e-mail-enums.h
+include/evolution-%%VERSION%%/libemail-engine/e-mail-enumtypes.h
+include/evolution-%%VERSION%%/libemail-engine/e-mail-folder-utils.h
+include/evolution-%%VERSION%%/libemail-engine/e-mail-junk-filter.h
+include/evolution-%%VERSION%%/libemail-engine/e-mail-session-utils.h
+include/evolution-%%VERSION%%/libemail-engine/e-mail-session.h
+include/evolution-%%VERSION%%/libemail-engine/e-mail-store-utils.h
+include/evolution-%%VERSION%%/libemail-engine/e-mail-utils.h
+include/evolution-%%VERSION%%/libemail-engine/mail-config.h
+include/evolution-%%VERSION%%/libemail-engine/mail-folder-cache.h
+include/evolution-%%VERSION%%/libemail-engine/mail-ops.h
+include/evolution-%%VERSION%%/libemail-engine/mail-tools.h
+include/evolution-%%VERSION%%/libemail-engine/mail-vfolder.h
 include/evolution-%%VERSION%%/libgnomecanvas/gailcanvas.h
 include/evolution-%%VERSION%%/libgnomecanvas/gailcanvasgroup.h
 include/evolution-%%VERSION%%/libgnomecanvas/gailcanvasgroupfactory.h
@@ -157,33 +172,28 @@ include/evolution-%%VERSION%%/libgnomecanvas/gnome-canvas-util.h
 include/evolution-%%VERSION%%/libgnomecanvas/gnome-canvas-widget.h
 include/evolution-%%VERSION%%/libgnomecanvas/gnome-canvas.h
 include/evolution-%%VERSION%%/libgnomecanvas/libgnomecanvas.h
+include/evolution-%%VERSION%%/mail/e-mail-account-manager.h
+include/evolution-%%VERSION%%/mail/e-mail-account-store.h
+include/evolution-%%VERSION%%/mail/e-mail-account-tree-view.h
+include/evolution-%%VERSION%%/mail/e-mail-ui-session.h
 include/evolution-%%VERSION%%/mail/e-mail-attachment-bar.h
 include/evolution-%%VERSION%%/mail/e-mail-backend.h
 include/evolution-%%VERSION%%/mail/e-mail-browser.h
 include/evolution-%%VERSION%%/mail/e-mail-display.h
-include/evolution-%%VERSION%%/mail/e-mail-enums.h
-include/evolution-%%VERSION%%/mail/e-mail-enumtypes.h
 include/evolution-%%VERSION%%/mail/e-mail-folder-pane.h
-include/evolution-%%VERSION%%/mail/e-mail-folder-utils.h
-include/evolution-%%VERSION%%/mail/e-mail-junk-filter.h
 include/evolution-%%VERSION%%/mail/e-mail-junk-options.h
 include/evolution-%%VERSION%%/mail/e-mail-label-action.h
 include/evolution-%%VERSION%%/mail/e-mail-label-dialog.h
 include/evolution-%%VERSION%%/mail/e-mail-label-list-store.h
 include/evolution-%%VERSION%%/mail/e-mail-label-manager.h
 include/evolution-%%VERSION%%/mail/e-mail-label-tree-view.h
-include/evolution-%%VERSION%%/mail/e-mail-local.h
 include/evolution-%%VERSION%%/mail/e-mail-message-pane.h
 include/evolution-%%VERSION%%/mail/e-mail-migrate.h
 include/evolution-%%VERSION%%/mail/e-mail-notebook-view.h
 include/evolution-%%VERSION%%/mail/e-mail-paned-view.h
 include/evolution-%%VERSION%%/mail/e-mail-reader-utils.h
 include/evolution-%%VERSION%%/mail/e-mail-reader.h
-include/evolution-%%VERSION%%/mail/e-mail-session-utils.h
-include/evolution-%%VERSION%%/mail/e-mail-session.h
 include/evolution-%%VERSION%%/mail/e-mail-sidebar.h
-include/evolution-%%VERSION%%/mail/e-mail-store-utils.h
-include/evolution-%%VERSION%%/mail/e-mail-store.h
 include/evolution-%%VERSION%%/mail/e-mail-tag-editor.h
 include/evolution-%%VERSION%%/mail/e-mail-view.h
 include/evolution-%%VERSION%%/mail/e-mail.h
@@ -192,8 +202,8 @@ include/evolution-%%VERSION%%/mail/em-composer-utils.h
 include/evolution-%%VERSION%%/mail/em-config.h
 include/evolution-%%VERSION%%/mail/em-event.h
 include/evolution-%%VERSION%%/mail/em-filter-context.h
+include/evolution-%%VERSION%%/mail/em-filter-editor-folder-element.h
 include/evolution-%%VERSION%%/mail/em-filter-editor.h
-include/evolution-%%VERSION%%/mail/em-filter-folder-element.h
 include/evolution-%%VERSION%%/mail/em-filter-rule.h
 include/evolution-%%VERSION%%/mail/em-filter-source-element.h
 include/evolution-%%VERSION%%/mail/em-folder-properties.h
@@ -211,17 +221,13 @@ include/evolution-%%VERSION%%/mail/em-search-context.h
 include/evolution-%%VERSION%%/mail/em-subscription-editor.h
 include/evolution-%%VERSION%%/mail/em-sync-stream.h
 include/evolution-%%VERSION%%/mail/em-utils.h
-include/evolution-%%VERSION%%/mail/em-vfolder-context.h
+include/evolution-%%VERSION%%/mail/em-vfolder-editor-context.h
+include/evolution-%%VERSION%%/mail/em-vfolder-editor-rule.h
 include/evolution-%%VERSION%%/mail/em-vfolder-editor.h
-include/evolution-%%VERSION%%/mail/em-vfolder-rule.h
 include/evolution-%%VERSION%%/mail/mail-autofilter.h
-include/evolution-%%VERSION%%/mail/mail-config.h
-include/evolution-%%VERSION%%/mail/mail-folder-cache.h
-include/evolution-%%VERSION%%/mail/mail-mt.h
-include/evolution-%%VERSION%%/mail/mail-ops.h
+include/evolution-%%VERSION%%/mail/mail-guess-servers.h
 include/evolution-%%VERSION%%/mail/mail-send-recv.h
-include/evolution-%%VERSION%%/mail/mail-tools.h
-include/evolution-%%VERSION%%/mail/mail-vfolder.h
+include/evolution-%%VERSION%%/mail/mail-vfolder-ui.h
 include/evolution-%%VERSION%%/mail/message-list.h
 include/evolution-%%VERSION%%/menus/gal-define-views-dialog.h
 include/evolution-%%VERSION%%/menus/gal-define-views-model.h
@@ -234,8 +240,6 @@ include/evolution-%%VERSION%%/menus/gal-view-instance.h
 include/evolution-%%VERSION%%/menus/gal-view-new-dialog.h
 include/evolution-%%VERSION%%/menus/gal-view.h
 include/evolution-%%VERSION%%/misc/e-account-combo-box.h
-include/evolution-%%VERSION%%/misc/e-account-manager.h
-include/evolution-%%VERSION%%/misc/e-account-tree-view.h
 include/evolution-%%VERSION%%/misc/e-action-combo-box.h
 include/evolution-%%VERSION%%/misc/e-activity-bar.h
 include/evolution-%%VERSION%%/misc/e-activity-proxy.h
@@ -251,6 +255,7 @@ include/evolution-%%VERSION%%/misc/e-attachment-store.h
 include/evolution-%%VERSION%%/misc/e-attachment-tree-view.h
 include/evolution-%%VERSION%%/misc/e-attachment-view.h
 include/evolution-%%VERSION%%/misc/e-attachment.h
+include/evolution-%%VERSION%%/misc/e-auth-combo-box.h
 include/evolution-%%VERSION%%/misc/e-buffer-tagger.h
 include/evolution-%%VERSION%%/misc/e-calendar-item.h
 include/evolution-%%VERSION%%/misc/e-calendar.h
@@ -258,15 +263,12 @@ include/evolution-%%VERSION%%/misc/e-canvas-background.h
 include/evolution-%%VERSION%%/misc/e-canvas-utils.h
 include/evolution-%%VERSION%%/misc/e-canvas-vbox.h
 include/evolution-%%VERSION%%/misc/e-canvas.h
-include/evolution-%%VERSION%%/misc/e-cell-renderer-combo.h
 include/evolution-%%VERSION%%/misc/e-charset-combo-box.h
-include/evolution-%%VERSION%%/misc/e-combo-cell-editable.h
 include/evolution-%%VERSION%%/misc/e-contact-map-window.h
 include/evolution-%%VERSION%%/misc/e-contact-map.h
 include/evolution-%%VERSION%%/misc/e-contact-marker.h
 include/evolution-%%VERSION%%/misc/e-dateedit.h
 include/evolution-%%VERSION%%/misc/e-focus-tracker.h
-include/evolution-%%VERSION%%/misc/e-hinted-entry.h
 include/evolution-%%VERSION%%/misc/e-image-chooser.h
 include/evolution-%%VERSION%%/misc/e-import-assistant.h
 include/evolution-%%VERSION%%/misc/e-map.h
@@ -399,95 +401,81 @@ include/evolution-%%VERSION%%/text/gal-a11y-e-text.h
 lib/evolution/%%VERSION%%/libeabutil.a
 lib/evolution/%%VERSION%%/libeabutil.la
 lib/evolution/%%VERSION%%/libeabutil.so
-lib/evolution/%%VERSION%%/libeabutil.so.0
 lib/evolution/%%VERSION%%/libcomposer.a
 lib/evolution/%%VERSION%%/libcomposer.la
 lib/evolution/%%VERSION%%/libcomposer.so
-lib/evolution/%%VERSION%%/libcomposer.so.0
 lib/evolution/%%VERSION%%/libecontacteditor.a
 lib/evolution/%%VERSION%%/libecontacteditor.la
 lib/evolution/%%VERSION%%/libecontacteditor.so
-lib/evolution/%%VERSION%%/libecontacteditor.so.0
 lib/evolution/%%VERSION%%/libecontactlisteditor.a
 lib/evolution/%%VERSION%%/libecontactlisteditor.la
 lib/evolution/%%VERSION%%/libecontactlisteditor.so
-lib/evolution/%%VERSION%%/libecontactlisteditor.so.0
+lib/evolution/%%VERSION%%/libemail-engine.so
+lib/evolution/%%VERSION%%/libemail-engine.la
+lib/evolution/%%VERSION%%/libemail-engine.a
+lib/evolution/%%VERSION%%/libemail-utils.so
+lib/evolution/%%VERSION%%/libemail-utils.la
+lib/evolution/%%VERSION%%/libemail-utils.a
 lib/evolution/%%VERSION%%/libemformat.a
 lib/evolution/%%VERSION%%/libemformat.la
 lib/evolution/%%VERSION%%/libemformat.so
-lib/evolution/%%VERSION%%/libemformat.so.0
 lib/evolution/%%VERSION%%/libemiscwidgets.a
 lib/evolution/%%VERSION%%/libemiscwidgets.la
 lib/evolution/%%VERSION%%/libemiscwidgets.so
-lib/evolution/%%VERSION%%/libemiscwidgets.so.0
 lib/evolution/%%VERSION%%/libeshell.a
 lib/evolution/%%VERSION%%/libeshell.la
 lib/evolution/%%VERSION%%/libeshell.so
-lib/evolution/%%VERSION%%/libeshell.so.0
 lib/evolution/%%VERSION%%/libessmime.a
 lib/evolution/%%VERSION%%/libessmime.la
 lib/evolution/%%VERSION%%/libessmime.so
-lib/evolution/%%VERSION%%/libessmime.so.0
 lib/evolution/%%VERSION%%/libetable.a
 lib/evolution/%%VERSION%%/libetable.la
 lib/evolution/%%VERSION%%/libetable.so
-lib/evolution/%%VERSION%%/libetable.so.0
 lib/evolution/%%VERSION%%/libetext.a
 lib/evolution/%%VERSION%%/libetext.la
 lib/evolution/%%VERSION%%/libetext.so
-lib/evolution/%%VERSION%%/libetext.so.0
 lib/evolution/%%VERSION%%/libetimezonedialog.a
 lib/evolution/%%VERSION%%/libetimezonedialog.la
 lib/evolution/%%VERSION%%/libetimezonedialog.so
-lib/evolution/%%VERSION%%/libetimezonedialog.so.0
 lib/evolution/%%VERSION%%/libeutil.a
 lib/evolution/%%VERSION%%/libeutil.la
 lib/evolution/%%VERSION%%/libeutil.so
-lib/evolution/%%VERSION%%/libeutil.so.0
 lib/evolution/%%VERSION%%/libevolution-a11y.a
 lib/evolution/%%VERSION%%/libevolution-a11y.la
 lib/evolution/%%VERSION%%/libevolution-a11y.so
-lib/evolution/%%VERSION%%/libevolution-a11y.so.0
 lib/evolution/%%VERSION%%/libevolution-addressbook-importers.a
 lib/evolution/%%VERSION%%/libevolution-addressbook-importers.la
 lib/evolution/%%VERSION%%/libevolution-addressbook-importers.so
-lib/evolution/%%VERSION%%/libevolution-addressbook-importers.so.0
 lib/evolution/%%VERSION%%/libevolution-calendar.a
 lib/evolution/%%VERSION%%/libevolution-calendar.la
 lib/evolution/%%VERSION%%/libevolution-calendar.so
-lib/evolution/%%VERSION%%/libevolution-calendar.so.0
 lib/evolution/%%VERSION%%/libevolution-calendar-importers.a
 lib/evolution/%%VERSION%%/libevolution-calendar-importers.la
 lib/evolution/%%VERSION%%/libevolution-calendar-importers.so
-lib/evolution/%%VERSION%%/libevolution-calendar-importers.so.0
 lib/evolution/%%VERSION%%/libevolution-mail.a
 lib/evolution/%%VERSION%%/libevolution-mail.la
 lib/evolution/%%VERSION%%/libevolution-mail.so
-lib/evolution/%%VERSION%%/libevolution-mail.so.0
 lib/evolution/%%VERSION%%/libevolution-mail-importers.a
 lib/evolution/%%VERSION%%/libevolution-mail-importers.la
 lib/evolution/%%VERSION%%/libevolution-mail-importers.so
-lib/evolution/%%VERSION%%/libevolution-mail-importers.so.0
 lib/evolution/%%VERSION%%/libevolution-mail-settings.a
 lib/evolution/%%VERSION%%/libevolution-mail-settings.la
 lib/evolution/%%VERSION%%/libevolution-mail-settings.so
-lib/evolution/%%VERSION%%/libevolution-mail-settings.so.0
 lib/evolution/%%VERSION%%/libevolution-smime.a
 lib/evolution/%%VERSION%%/libevolution-smime.la
 lib/evolution/%%VERSION%%/libevolution-smime.so
-lib/evolution/%%VERSION%%/libevolution-smime.so.0
+lib/evolution/%%VERSION%%/libevolution-utils.so
+lib/evolution/%%VERSION%%/libevolution-utils.la
+lib/evolution/%%VERSION%%/libevolution-utils.a
 lib/evolution/%%VERSION%%/libfilter.a
 lib/evolution/%%VERSION%%/libfilter.la
 lib/evolution/%%VERSION%%/libfilter.so
-lib/evolution/%%VERSION%%/libfilter.so.0
 lib/evolution/%%VERSION%%/libgnomecanvas.a
 lib/evolution/%%VERSION%%/libgnomecanvas.la
 lib/evolution/%%VERSION%%/libgnomecanvas.so
-lib/evolution/%%VERSION%%/libgnomecanvas.so.0
 lib/evolution/%%VERSION%%/libmenus.a
 lib/evolution/%%VERSION%%/libmenus.la
 lib/evolution/%%VERSION%%/libmenus.so
-lib/evolution/%%VERSION%%/libmenus.so.0
 lib/evolution/%%VERSION%%/modules/libevolution-module-mailto-handler.a
 lib/evolution/%%VERSION%%/modules/libevolution-module-mailto-handler.la
 lib/evolution/%%VERSION%%/modules/libevolution-module-mailto-handler.so
@@ -503,6 +491,9 @@ lib/evolution/%%VERSION%%/modules/libevolution-module-calendar.so
 lib/evolution/%%VERSION%%/modules/libevolution-module-mail.a
 lib/evolution/%%VERSION%%/modules/libevolution-module-mail.la
 lib/evolution/%%VERSION%%/modules/libevolution-module-mail.so
+lib/evolution/%%VERSION%%/modules/libevolution-module-mdn.so
+lib/evolution/%%VERSION%%/modules/libevolution-module-mdn.la
+lib/evolution/%%VERSION%%/modules/libevolution-module-mdn.a
 lib/evolution/%%VERSION%%/modules/libevolution-module-online-accounts.a
 lib/evolution/%%VERSION%%/modules/libevolution-module-online-accounts.la
 lib/evolution/%%VERSION%%/modules/libevolution-module-online-accounts.so
@@ -632,17 +623,16 @@ libdata/pkgconfig/evolution-calendar-3.0.pc
 libdata/pkgconfig/evolution-mail-3.0.pc
 libdata/pkgconfig/evolution-plugin-3.0.pc
 libdata/pkgconfig/evolution-shell-3.0.pc
+libdata/pkgconfig/libemail-engine.pc
+libdata/pkgconfig/libemail-utils.pc
+libdata/pkgconfig/libevolution-utils.pc
 libexec/evolution/%%VERSION%%/csv2vcard
-libexec/evolution/%%VERSION%%/evolution-addressbook-clean
 libexec/evolution/%%VERSION%%/evolution-addressbook-export
 libexec/evolution/%%VERSION%%/evolution-alarm-notify
 libexec/evolution/%%VERSION%%/evolution-backup
 libexec/evolution/%%VERSION%%/killev
 share/applications/evolution.desktop
 share/applications/evolution-settings.desktop
-share/doc/eshell/EExtensible.html
-share/doc/eshell/EExtension.html
-share/doc/eshell/EModule.html
 share/doc/eshell/EShell.html
 share/doc/eshell/EShellBackend.html
 share/doc/eshell/EShellContent.html
@@ -657,7 +647,6 @@ share/doc/eshell/ch01.html
 share/doc/eshell/ch02.html
 share/doc/eshell/ch03.html
 share/doc/eshell/ch04.html
-share/doc/eshell/ch05.html
 share/doc/eshell/eshell-Action-Groups.html
 share/doc/eshell/eshell-Bit-Arrays-(Legacy).html
 share/doc/eshell/eshell-Categories.html
@@ -665,7 +654,6 @@ share/doc/eshell/eshell-Container-for-Signatures.html
 share/doc/eshell/eshell-Date-and-Time-Formatting.html
 share/doc/eshell/eshell-Dialog-Utilities-(Legacy).html
 share/doc/eshell/eshell-EPoolv.html
-share/doc/eshell/eshell-GConf-Bridge.html
 share/doc/eshell/eshell-Icon-Utilities-(Legacy).html
 share/doc/eshell/eshell-Mail-Accounts.html
 share/doc/eshell/eshell-Miscellaneous-Utilities.html
@@ -677,7 +665,6 @@ share/doc/eshell/eshell-Shell-Actions.html
 share/doc/eshell/eshell-Shell-Utilities.html
 share/doc/eshell/eshell-Text-to-HTML-Conversion.html
 share/doc/eshell/eshell-User-Alert-Handling.html
-share/doc/eshell/eshell.devhelp
 share/doc/eshell/eshell.devhelp2
 share/doc/eshell/eshell-e-signature-utils.html
 share/doc/eshell/home.png
@@ -1321,7 +1308,6 @@ share/gnome/help/evolution/C/mail-encryption-s-mime-manage.page
 share/gnome/help/evolution/C/mail-encryption-s-mime-signing-encrypting.page
 share/gnome/help/evolution/C/mail-encryption.page
 share/gnome/help/evolution/C/mail-error-failed-to-append-to-sent-folder.page
-share/gnome/help/evolution/C/mail-error-folder-mismatch.page
 share/gnome/help/evolution/C/mail-error-no-provider-available.page
 share/gnome/help/evolution/C/mail-filters-actions.page
 share/gnome/help/evolution/C/mail-filters-conditions.page
@@ -1379,7 +1365,6 @@ share/gnome/help/evolution/C/mail-usenet-subscriptions.page
 share/gnome/help/evolution/C/mail-vertical-view.page
 share/gnome/help/evolution/C/mail-word-wrap.page
 share/gnome/help/evolution/C/mail-working-offline.page
-share/gnome/help/evolution/C/mail-wrong-fonts-in-3-0.page
 share/gnome/help/evolution/C/memos-searching.page
 share/gnome/help/evolution/C/memos-usage-add-memo.page
 share/gnome/help/evolution/C/memos-usage-delete-memo.page
@@ -1548,7 +1533,6 @@ share/gnome/help/evolution/cs/mail-encryption-s-mime-manage.page
 share/gnome/help/evolution/cs/mail-encryption-s-mime-signing-encrypting.page
 share/gnome/help/evolution/cs/mail-encryption.page
 share/gnome/help/evolution/cs/mail-error-failed-to-append-to-sent-folder.page
-share/gnome/help/evolution/cs/mail-error-folder-mismatch.page
 share/gnome/help/evolution/cs/mail-error-no-provider-available.page
 share/gnome/help/evolution/cs/mail-filters-actions.page
 share/gnome/help/evolution/cs/mail-filters-conditions.page
@@ -1606,7 +1590,6 @@ share/gnome/help/evolution/cs/mail-usenet-subscriptions.page
 share/gnome/help/evolution/cs/mail-vertical-view.page
 share/gnome/help/evolution/cs/mail-word-wrap.page
 share/gnome/help/evolution/cs/mail-working-offline.page
-share/gnome/help/evolution/cs/mail-wrong-fonts-in-3-0.page
 share/gnome/help/evolution/cs/memos-searching.page
 share/gnome/help/evolution/cs/memos-usage-add-memo.page
 share/gnome/help/evolution/cs/memos-usage-delete-memo.page
@@ -1775,7 +1758,6 @@ share/gnome/help/evolution/de/mail-encryption-s-mime-manage.page
 share/gnome/help/evolution/de/mail-encryption-s-mime-signing-encrypting.page
 share/gnome/help/evolution/de/mail-encryption.page
 share/gnome/help/evolution/de/mail-error-failed-to-append-to-sent-folder.page
-share/gnome/help/evolution/de/mail-error-folder-mismatch.page
 share/gnome/help/evolution/de/mail-error-no-provider-available.page
 share/gnome/help/evolution/de/mail-filters-actions.page
 share/gnome/help/evolution/de/mail-filters-conditions.page
@@ -1833,7 +1815,6 @@ share/gnome/help/evolution/de/mail-usenet-subscriptions.page
 share/gnome/help/evolution/de/mail-vertical-view.page
 share/gnome/help/evolution/de/mail-word-wrap.page
 share/gnome/help/evolution/de/mail-working-offline.page
-share/gnome/help/evolution/de/mail-wrong-fonts-in-3-0.page
 share/gnome/help/evolution/de/memos-searching.page
 share/gnome/help/evolution/de/memos-usage-add-memo.page
 share/gnome/help/evolution/de/memos-usage-delete-memo.page
@@ -2002,7 +1983,6 @@ share/gnome/help/evolution/el/mail-encryption-s-mime-manage.page
 share/gnome/help/evolution/el/mail-encryption-s-mime-signing-encrypting.page
 share/gnome/help/evolution/el/mail-encryption.page
 share/gnome/help/evolution/el/mail-error-failed-to-append-to-sent-folder.page
-share/gnome/help/evolution/el/mail-error-folder-mismatch.page
 share/gnome/help/evolution/el/mail-error-no-provider-available.page
 share/gnome/help/evolution/el/mail-filters-actions.page
 share/gnome/help/evolution/el/mail-filters-conditions.page
@@ -2060,7 +2040,6 @@ share/gnome/help/evolution/el/mail-usenet-subscriptions.page
 share/gnome/help/evolution/el/mail-vertical-view.page
 share/gnome/help/evolution/el/mail-word-wrap.page
 share/gnome/help/evolution/el/mail-working-offline.page
-share/gnome/help/evolution/el/mail-wrong-fonts-in-3-0.page
 share/gnome/help/evolution/el/memos-searching.page
 share/gnome/help/evolution/el/memos-usage-add-memo.page
 share/gnome/help/evolution/el/memos-usage-delete-memo.page
@@ -2229,7 +2208,6 @@ share/gnome/help/evolution/en_GB/mail-encryption-s-mime-manage.page
 share/gnome/help/evolution/en_GB/mail-encryption-s-mime-signing-encrypting.page
 share/gnome/help/evolution/en_GB/mail-encryption.page
 share/gnome/help/evolution/en_GB/mail-error-failed-to-append-to-sent-folder.page
-share/gnome/help/evolution/en_GB/mail-error-folder-mismatch.page
 share/gnome/help/evolution/en_GB/mail-error-no-provider-available.page
 share/gnome/help/evolution/en_GB/mail-filters-actions.page
 share/gnome/help/evolution/en_GB/mail-filters-conditions.page
@@ -2287,7 +2265,6 @@ share/gnome/help/evolution/en_GB/mail-usenet-subscriptions.page
 share/gnome/help/evolution/en_GB/mail-vertical-view.page
 share/gnome/help/evolution/en_GB/mail-word-wrap.page
 share/gnome/help/evolution/en_GB/mail-working-offline.page
-share/gnome/help/evolution/en_GB/mail-wrong-fonts-in-3-0.page
 share/gnome/help/evolution/en_GB/memos-searching.page
 share/gnome/help/evolution/en_GB/memos-usage-add-memo.page
 share/gnome/help/evolution/en_GB/memos-usage-delete-memo.page
@@ -2456,7 +2433,6 @@ share/gnome/help/evolution/es/mail-encryption-s-mime-manage.page
 share/gnome/help/evolution/es/mail-encryption-s-mime-signing-encrypting.page
 share/gnome/help/evolution/es/mail-encryption.page
 share/gnome/help/evolution/es/mail-error-failed-to-append-to-sent-folder.page
-share/gnome/help/evolution/es/mail-error-folder-mismatch.page
 share/gnome/help/evolution/es/mail-error-no-provider-available.page
 share/gnome/help/evolution/es/mail-filters-actions.page
 share/gnome/help/evolution/es/mail-filters-conditions.page
@@ -2514,7 +2490,6 @@ share/gnome/help/evolution/es/mail-usenet-subscriptions.page
 share/gnome/help/evolution/es/mail-vertical-view.page
 share/gnome/help/evolution/es/mail-word-wrap.page
 share/gnome/help/evolution/es/mail-working-offline.page
-share/gnome/help/evolution/es/mail-wrong-fonts-in-3-0.page
 share/gnome/help/evolution/es/memos-searching.page
 share/gnome/help/evolution/es/memos-usage-add-memo.page
 share/gnome/help/evolution/es/memos-usage-delete-memo.page
@@ -2683,7 +2658,6 @@ share/gnome/help/evolution/eu/mail-encryption-s-mime-manage.page
 share/gnome/help/evolution/eu/mail-encryption-s-mime-signing-encrypting.page
 share/gnome/help/evolution/eu/mail-encryption.page
 share/gnome/help/evolution/eu/mail-error-failed-to-append-to-sent-folder.page
-share/gnome/help/evolution/eu/mail-error-folder-mismatch.page
 share/gnome/help/evolution/eu/mail-error-no-provider-available.page
 share/gnome/help/evolution/eu/mail-filters-actions.page
 share/gnome/help/evolution/eu/mail-filters-conditions.page
@@ -2741,7 +2715,6 @@ share/gnome/help/evolution/eu/mail-usenet-subscriptions.page
 share/gnome/help/evolution/eu/mail-vertical-view.page
 share/gnome/help/evolution/eu/mail-word-wrap.page
 share/gnome/help/evolution/eu/mail-working-offline.page
-share/gnome/help/evolution/eu/mail-wrong-fonts-in-3-0.page
 share/gnome/help/evolution/eu/memos-searching.page
 share/gnome/help/evolution/eu/memos-usage-add-memo.page
 share/gnome/help/evolution/eu/memos-usage-delete-memo.page
@@ -2910,7 +2883,6 @@ share/gnome/help/evolution/fr/mail-encryption-s-mime-manage.page
 share/gnome/help/evolution/fr/mail-encryption-s-mime-signing-encrypting.page
 share/gnome/help/evolution/fr/mail-encryption.page
 share/gnome/help/evolution/fr/mail-error-failed-to-append-to-sent-folder.page
-share/gnome/help/evolution/fr/mail-error-folder-mismatch.page
 share/gnome/help/evolution/fr/mail-error-no-provider-available.page
 share/gnome/help/evolution/fr/mail-filters-actions.page
 share/gnome/help/evolution/fr/mail-filters-conditions.page
@@ -2968,7 +2940,6 @@ share/gnome/help/evolution/fr/mail-usenet-subscriptions.page
 share/gnome/help/evolution/fr/mail-vertical-view.page
 share/gnome/help/evolution/fr/mail-word-wrap.page
 share/gnome/help/evolution/fr/mail-working-offline.page
-share/gnome/help/evolution/fr/mail-wrong-fonts-in-3-0.page
 share/gnome/help/evolution/fr/memos-searching.page
 share/gnome/help/evolution/fr/memos-usage-add-memo.page
 share/gnome/help/evolution/fr/memos-usage-delete-memo.page
@@ -3137,7 +3108,6 @@ share/gnome/help/evolution/gl/mail-encryption-s-mime-manage.page
 share/gnome/help/evolution/gl/mail-encryption-s-mime-signing-encrypting.page
 share/gnome/help/evolution/gl/mail-encryption.page
 share/gnome/help/evolution/gl/mail-error-failed-to-append-to-sent-folder.page
-share/gnome/help/evolution/gl/mail-error-folder-mismatch.page
 share/gnome/help/evolution/gl/mail-error-no-provider-available.page
 share/gnome/help/evolution/gl/mail-filters-actions.page
 share/gnome/help/evolution/gl/mail-filters-conditions.page
@@ -3195,7 +3165,6 @@ share/gnome/help/evolution/gl/mail-usenet-subscriptions.page
 share/gnome/help/evolution/gl/mail-vertical-view.page
 share/gnome/help/evolution/gl/mail-word-wrap.page
 share/gnome/help/evolution/gl/mail-working-offline.page
-share/gnome/help/evolution/gl/mail-wrong-fonts-in-3-0.page
 share/gnome/help/evolution/gl/memos-searching.page
 share/gnome/help/evolution/gl/memos-usage-add-memo.page
 share/gnome/help/evolution/gl/memos-usage-delete-memo.page
@@ -3364,7 +3333,6 @@ share/gnome/help/evolution/hu/mail-encryption-s-mime-manage.page
 share/gnome/help/evolution/hu/mail-encryption-s-mime-signing-encrypting.page
 share/gnome/help/evolution/hu/mail-encryption.page
 share/gnome/help/evolution/hu/mail-error-failed-to-append-to-sent-folder.page
-share/gnome/help/evolution/hu/mail-error-folder-mismatch.page
 share/gnome/help/evolution/hu/mail-error-no-provider-available.page
 share/gnome/help/evolution/hu/mail-filters-actions.page
 share/gnome/help/evolution/hu/mail-filters-conditions.page
@@ -3422,7 +3390,6 @@ share/gnome/help/evolution/hu/mail-usenet-subscriptions.page
 share/gnome/help/evolution/hu/mail-vertical-view.page
 share/gnome/help/evolution/hu/mail-word-wrap.page
 share/gnome/help/evolution/hu/mail-working-offline.page
-share/gnome/help/evolution/hu/mail-wrong-fonts-in-3-0.page
 share/gnome/help/evolution/hu/memos-searching.page
 share/gnome/help/evolution/hu/memos-usage-add-memo.page
 share/gnome/help/evolution/hu/memos-usage-delete-memo.page
@@ -3591,7 +3558,6 @@ share/gnome/help/evolution/mk/mail-encryption-s-mime-manage.page
 share/gnome/help/evolution/mk/mail-encryption-s-mime-signing-encrypting.page
 share/gnome/help/evolution/mk/mail-encryption.page
 share/gnome/help/evolution/mk/mail-error-failed-to-append-to-sent-folder.page
-share/gnome/help/evolution/mk/mail-error-folder-mismatch.page
 share/gnome/help/evolution/mk/mail-error-no-provider-available.page
 share/gnome/help/evolution/mk/mail-filters-actions.page
 share/gnome/help/evolution/mk/mail-filters-conditions.page
@@ -3649,7 +3615,6 @@ share/gnome/help/evolution/mk/mail-usenet-subscriptions.page
 share/gnome/help/evolution/mk/mail-vertical-view.page
 share/gnome/help/evolution/mk/mail-word-wrap.page
 share/gnome/help/evolution/mk/mail-working-offline.page
-share/gnome/help/evolution/mk/mail-wrong-fonts-in-3-0.page
 share/gnome/help/evolution/mk/memos-searching.page
 share/gnome/help/evolution/mk/memos-usage-add-memo.page
 share/gnome/help/evolution/mk/memos-usage-delete-memo.page
@@ -3818,7 +3783,6 @@ share/gnome/help/evolution/oc/mail-encryption-s-mime-manage.page
 share/gnome/help/evolution/oc/mail-encryption-s-mime-signing-encrypting.page
 share/gnome/help/evolution/oc/mail-encryption.page
 share/gnome/help/evolution/oc/mail-error-failed-to-append-to-sent-folder.page
-share/gnome/help/evolution/oc/mail-error-folder-mismatch.page
 share/gnome/help/evolution/oc/mail-error-no-provider-available.page
 share/gnome/help/evolution/oc/mail-filters-actions.page
 share/gnome/help/evolution/oc/mail-filters-conditions.page
@@ -3876,7 +3840,6 @@ share/gnome/help/evolution/oc/mail-usenet-subscriptions.page
 share/gnome/help/evolution/oc/mail-vertical-view.page
 share/gnome/help/evolution/oc/mail-word-wrap.page
 share/gnome/help/evolution/oc/mail-working-offline.page
-share/gnome/help/evolution/oc/mail-wrong-fonts-in-3-0.page
 share/gnome/help/evolution/oc/memos-searching.page
 share/gnome/help/evolution/oc/memos-usage-add-memo.page
 share/gnome/help/evolution/oc/memos-usage-delete-memo.page
@@ -4045,7 +4008,6 @@ share/gnome/help/evolution/ru/mail-encryption-s-mime-manage.page
 share/gnome/help/evolution/ru/mail-encryption-s-mime-signing-encrypting.page
 share/gnome/help/evolution/ru/mail-encryption.page
 share/gnome/help/evolution/ru/mail-error-failed-to-append-to-sent-folder.page
-share/gnome/help/evolution/ru/mail-error-folder-mismatch.page
 share/gnome/help/evolution/ru/mail-error-no-provider-available.page
 share/gnome/help/evolution/ru/mail-filters-actions.page
 share/gnome/help/evolution/ru/mail-filters-conditions.page
@@ -4103,7 +4065,6 @@ share/gnome/help/evolution/ru/mail-usenet-subscriptions.page
 share/gnome/help/evolution/ru/mail-vertical-view.page
 share/gnome/help/evolution/ru/mail-word-wrap.page
 share/gnome/help/evolution/ru/mail-working-offline.page
-share/gnome/help/evolution/ru/mail-wrong-fonts-in-3-0.page
 share/gnome/help/evolution/ru/memos-searching.page
 share/gnome/help/evolution/ru/memos-usage-add-memo.page
 share/gnome/help/evolution/ru/memos-usage-delete-memo.page
@@ -4272,7 +4233,6 @@ share/gnome/help/evolution/sl/mail-encryption-s-mime-manage.page
 share/gnome/help/evolution/sl/mail-encryption-s-mime-signing-encrypting.page
 share/gnome/help/evolution/sl/mail-encryption.page
 share/gnome/help/evolution/sl/mail-error-failed-to-append-to-sent-folder.page
-share/gnome/help/evolution/sl/mail-error-folder-mismatch.page
 share/gnome/help/evolution/sl/mail-error-no-provider-available.page
 share/gnome/help/evolution/sl/mail-filters-actions.page
 share/gnome/help/evolution/sl/mail-filters-conditions.page
@@ -4330,7 +4290,6 @@ share/gnome/help/evolution/sl/mail-usenet-subscriptions.page
 share/gnome/help/evolution/sl/mail-vertical-view.page
 share/gnome/help/evolution/sl/mail-word-wrap.page
 share/gnome/help/evolution/sl/mail-working-offline.page
-share/gnome/help/evolution/sl/mail-wrong-fonts-in-3-0.page
 share/gnome/help/evolution/sl/memos-searching.page
 share/gnome/help/evolution/sl/memos-usage-add-memo.page
 share/gnome/help/evolution/sl/memos-usage-delete-memo.page
@@ -4499,7 +4458,6 @@ share/gnome/help/evolution/sv/mail-encryption-s-mime-manage.page
 share/gnome/help/evolution/sv/mail-encryption-s-mime-signing-encrypting.page
 share/gnome/help/evolution/sv/mail-encryption.page
 share/gnome/help/evolution/sv/mail-error-failed-to-append-to-sent-folder.page
-share/gnome/help/evolution/sv/mail-error-folder-mismatch.page
 share/gnome/help/evolution/sv/mail-error-no-provider-available.page
 share/gnome/help/evolution/sv/mail-filters-actions.page
 share/gnome/help/evolution/sv/mail-filters-conditions.page
@@ -4557,7 +4515,6 @@ share/gnome/help/evolution/sv/mail-usenet-subscriptions.page
 share/gnome/help/evolution/sv/mail-vertical-view.page
 share/gnome/help/evolution/sv/mail-word-wrap.page
 share/gnome/help/evolution/sv/mail-working-offline.page
-share/gnome/help/evolution/sv/mail-wrong-fonts-in-3-0.page
 share/gnome/help/evolution/sv/memos-searching.page
 share/gnome/help/evolution/sv/memos-usage-add-memo.page
 share/gnome/help/evolution/sv/memos-usage-delete-memo.page
@@ -4726,7 +4683,6 @@ share/gnome/help/evolution/zh_CN/mail-encryption-s-mime-manage.page
 share/gnome/help/evolution/zh_CN/mail-encryption-s-mime-signing-encrypting.page
 share/gnome/help/evolution/zh_CN/mail-encryption.page
 share/gnome/help/evolution/zh_CN/mail-error-failed-to-append-to-sent-folder.page
-share/gnome/help/evolution/zh_CN/mail-error-folder-mismatch.page
 share/gnome/help/evolution/zh_CN/mail-error-no-provider-available.page
 share/gnome/help/evolution/zh_CN/mail-filters-actions.page
 share/gnome/help/evolution/zh_CN/mail-filters-conditions.page
@@ -4784,7 +4740,6 @@ share/gnome/help/evolution/zh_CN/mail-usenet-subscriptions.page
 share/gnome/help/evolution/zh_CN/mail-vertical-view.page
 share/gnome/help/evolution/zh_CN/mail-word-wrap.page
 share/gnome/help/evolution/zh_CN/mail-working-offline.page
-share/gnome/help/evolution/zh_CN/mail-wrong-fonts-in-3-0.page
 share/gnome/help/evolution/zh_CN/memos-searching.page
 share/gnome/help/evolution/zh_CN/memos-usage-add-memo.page
 share/gnome/help/evolution/zh_CN/memos-usage-delete-memo.page
@@ -4920,8 +4875,322 @@ share/locale/zh_CN/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/zh_HK/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/mime-info/evolution.mime
+share/gnome/help/evolution/C/change-keyboard-shortcuts.page
+share/gnome/help/evolution/C/contacts-libreoffice.page
+share/gnome/help/evolution/C/intro-application.page
+share/gnome/help/evolution/C/mail-receiving-options-exchange-ews.page
+share/gnome/help/evolution/C/offline.page
+share/gnome/help/evolution/cs/change-keyboard-shortcuts.page
+share/gnome/help/evolution/cs/contacts-libreoffice.page
+share/gnome/help/evolution/cs/intro-application.page
+share/gnome/help/evolution/cs/mail-receiving-options-exchange-ews.page
+share/gnome/help/evolution/cs/offline.page
+share/gnome/help/evolution/de/change-keyboard-shortcuts.page
+share/gnome/help/evolution/de/contacts-libreoffice.page
+share/gnome/help/evolution/de/intro-application.page
+share/gnome/help/evolution/de/mail-receiving-options-exchange-ews.page
+share/gnome/help/evolution/de/offline.page
+share/gnome/help/evolution/el/change-keyboard-shortcuts.page
+share/gnome/help/evolution/el/contacts-libreoffice.page
+share/gnome/help/evolution/el/intro-application.page
+share/gnome/help/evolution/el/mail-receiving-options-exchange-ews.page
+share/gnome/help/evolution/el/offline.page
+share/gnome/help/evolution/en_GB/change-keyboard-shortcuts.page
+share/gnome/help/evolution/en_GB/contacts-libreoffice.page
+share/gnome/help/evolution/en_GB/intro-application.page
+share/gnome/help/evolution/en_GB/mail-receiving-options-exchange-ews.page
+share/gnome/help/evolution/en_GB/offline.page
+share/gnome/help/evolution/es/change-keyboard-shortcuts.page
+share/gnome/help/evolution/es/contacts-libreoffice.page
+share/gnome/help/evolution/es/intro-application.page
+share/gnome/help/evolution/es/mail-receiving-options-exchange-ews.page
+share/gnome/help/evolution/es/offline.page
+share/gnome/help/evolution/eu/change-keyboard-shortcuts.page
+share/gnome/help/evolution/eu/contacts-libreoffice.page
+share/gnome/help/evolution/eu/intro-application.page
+share/gnome/help/evolution/eu/mail-receiving-options-exchange-ews.page
+share/gnome/help/evolution/eu/offline.page
+share/gnome/help/evolution/fr/change-keyboard-shortcuts.page
+share/gnome/help/evolution/fr/contacts-libreoffice.page
+share/gnome/help/evolution/fr/intro-application.page
+share/gnome/help/evolution/fr/mail-receiving-options-exchange-ews.page
+share/gnome/help/evolution/fr/offline.page
+share/gnome/help/evolution/gl/change-keyboard-shortcuts.page
+share/gnome/help/evolution/gl/contacts-libreoffice.page
+share/gnome/help/evolution/gl/intro-application.page
+share/gnome/help/evolution/gl/mail-receiving-options-exchange-ews.page
+share/gnome/help/evolution/gl/offline.page
+share/gnome/help/evolution/hu/change-keyboard-shortcuts.page
+share/gnome/help/evolution/hu/contacts-libreoffice.page
+share/gnome/help/evolution/hu/intro-application.page
+share/gnome/help/evolution/hu/mail-receiving-options-exchange-ews.page
+share/gnome/help/evolution/hu/offline.page
+share/gnome/help/evolution/mk/change-keyboard-shortcuts.page
+share/gnome/help/evolution/mk/contacts-libreoffice.page
+share/gnome/help/evolution/mk/intro-application.page
+share/gnome/help/evolution/mk/mail-receiving-options-exchange-ews.page
+share/gnome/help/evolution/mk/offline.page
+share/gnome/help/evolution/oc/change-keyboard-shortcuts.page
+share/gnome/help/evolution/oc/contacts-libreoffice.page
+share/gnome/help/evolution/oc/intro-application.page
+share/gnome/help/evolution/oc/mail-receiving-options-exchange-ews.page
+share/gnome/help/evolution/oc/offline.page
+share/gnome/help/evolution/ru/change-keyboard-shortcuts.page
+share/gnome/help/evolution/ru/contacts-libreoffice.page
+share/gnome/help/evolution/ru/intro-application.page
+share/gnome/help/evolution/ru/mail-receiving-options-exchange-ews.page
+share/gnome/help/evolution/ru/offline.page
+share/gnome/help/evolution/sl/change-keyboard-shortcuts.page
+share/gnome/help/evolution/sl/contacts-libreoffice.page
+share/gnome/help/evolution/sl/intro-application.page
+share/gnome/help/evolution/sl/mail-receiving-options-exchange-ews.page
+share/gnome/help/evolution/sl/offline.page
+share/gnome/help/evolution/sv/change-keyboard-shortcuts.page
+share/gnome/help/evolution/sv/contacts-libreoffice.page
+share/gnome/help/evolution/sv/intro-application.page
+share/gnome/help/evolution/sv/mail-receiving-options-exchange-ews.page
+share/gnome/help/evolution/sv/offline.page
+share/gnome/help/evolution/te/backup-restore.page
+share/gnome/help/evolution/te/calendar-alarms-and-reminders.page
+share/gnome/help/evolution/te/calendar-caldav.page
+share/gnome/help/evolution/te/calendar-classifications.page
+share/gnome/help/evolution/te/calendar-free-busy.page
+share/gnome/help/evolution/te/calendar-google.page
+share/gnome/help/evolution/te/calendar-layout-appointment-display.page
+share/gnome/help/evolution/te/calendar-layout-general-formatting.page
+share/gnome/help/evolution/te/calendar-layout.page
+share/gnome/help/evolution/te/calendar-layout-views.page
+share/gnome/help/evolution/te/calendar-local.page
+share/gnome/help/evolution/te/calendar-marcus-bains-line.page
+share/gnome/help/evolution/te/calendar-meetings-delegating.page
+share/gnome/help/evolution/te/calendar-meetings.page
+share/gnome/help/evolution/te/calendar-meetings-replying-to-invitation.page
+share/gnome/help/evolution/te/calendar-meetings-sending-invitation.page
+share/gnome/help/evolution/te/calendar-organizing.page
+share/gnome/help/evolution/te/calendar-publishing.page
+share/gnome/help/evolution/te/calendar-recurrence.page
+share/gnome/help/evolution/te/calendar-searching.page
+share/gnome/help/evolution/te/calendar-sharing-information.page
+share/gnome/help/evolution/te/calendar-timezones.page
+share/gnome/help/evolution/te/calendar-usage-add-appointment.page
+share/gnome/help/evolution/te/calendar-usage-delete-appointment.page
+share/gnome/help/evolution/te/calendar-usage-edit-appointment.page
+share/gnome/help/evolution/te/figures/color-204a87.png
+share/gnome/help/evolution/te/figures/color-2e3436.png
+share/gnome/help/evolution/te/figures/color-4e9a06.png
+share/gnome/help/evolution/te/figures/color-5c3566.png
+share/gnome/help/evolution/te/figures/color-8f5902.png
+share/gnome/help/evolution/te/figures/color-a40000.png
+share/gnome/help/evolution/te/figures/color-c4a000.png
+share/gnome/help/evolution/te/figures/color-ce5c00.png
+share/gnome/help/evolution/te/figures/evolutionlogo.png
+share/gnome/help/evolution/te/figures/minus-icon.png
+share/gnome/help/evolution/te/figures/new-mail-notification.png
+share/gnome/help/evolution/te/figures/new-mail-switcher.png
+share/gnome/help/evolution/te/figures/plus-icon.png
+share/gnome/help/evolution/te/figures/search-icon.png
+share/gnome/help/evolution/te/figures/window-overview-layers.png
+share/gnome/help/evolution/te/calendar-usage.page
+share/gnome/help/evolution/te/calendar-using-several-calendars.page
+share/gnome/help/evolution/te/calendar-weather.page
+share/gnome/help/evolution/te/calendar-webdav.page
+share/gnome/help/evolution/te/change-keyboard-shortcuts.page
+share/gnome/help/evolution/te/change-switcher-appearance.page
+share/gnome/help/evolution/te/contacts-add-automatically.page
+share/gnome/help/evolution/te/contacts-autocompletion.page
+share/gnome/help/evolution/te/contacts-google.page
+share/gnome/help/evolution/te/contacts-ldap.page
+share/gnome/help/evolution/te/contacts-libreoffice.page
+share/gnome/help/evolution/te/contacts-local.page
+share/gnome/help/evolution/te/contacts-organizing.page
+share/gnome/help/evolution/te/contacts-searching.page
+share/gnome/help/evolution/te/index.page
+share/gnome/help/evolution/te/contacts-usage-add-contact.page
+share/gnome/help/evolution/te/contacts-usage-delete-contact.page
+share/gnome/help/evolution/te/contacts-usage-edit-contact.page
+share/gnome/help/evolution/te/contacts-usage.page
+share/gnome/help/evolution/te/contacts-using-contact-lists.page
+share/gnome/help/evolution/te/contacts-using-several-addressbooks.page
+share/gnome/help/evolution/te/credits.page
+share/gnome/help/evolution/te/data-storage.page
+share/gnome/help/evolution/te/default-browser.page
+share/gnome/help/evolution/te/deleting-appointments.page
+share/gnome/help/evolution/te/deleting-emails.page
+share/gnome/help/evolution/te/deleting-to-free-disk-space.page
+share/gnome/help/evolution/te/exchange-connectors-overview.page
+share/gnome/help/evolution/te/exchange-placeholder.page
+share/gnome/help/evolution/te/exporting-data-calendar.page
+share/gnome/help/evolution/te/exporting-data-contacts.page
+share/gnome/help/evolution/te/exporting-data-mail.page
+share/gnome/help/evolution/te/exporting-data.page
+share/gnome/help/evolution/te/express-mode.page
+share/gnome/help/evolution/te/google-services.page
+share/gnome/help/evolution/te/groupwise-placeholder.page
+share/gnome/help/evolution/te/import-apps-mozilla.page
+share/gnome/help/evolution/te/import-apps-outlook.page
+share/gnome/help/evolution/te/import-data.page
+share/gnome/help/evolution/te/import-single-files.page
+share/gnome/help/evolution/te/import-supported-file-formats.page
+share/gnome/help/evolution/te/intro-application.page
+share/gnome/help/evolution/te/mail-spam.page
+share/gnome/help/evolution/te/intro-first-run.page
+share/gnome/help/evolution/te/intro-main-window.page
+share/gnome/help/evolution/te/mail-access-gmail-imap-account.page
+share/gnome/help/evolution/te/mail-access-gmail-pop-account.page
+share/gnome/help/evolution/te/mail-account-manage-imap.page
+share/gnome/help/evolution/te/mail-account-manage-imap-plus.page
+share/gnome/help/evolution/te/mail-account-manage-local-delivery.page
+share/gnome/help/evolution/te/mail-account-manage-maildir-format-directories.page
+share/gnome/help/evolution/te/mail-account-management.page
+share/gnome/help/evolution/te/mail-account-manage-mh-format-directories.page
+share/gnome/help/evolution/te/mail-account-manage-microsoft-exchange-evo-ews.page
+share/gnome/help/evolution/te/mail-account-manage-microsoft-exchange-evo-exchange.page
+share/gnome/help/evolution/te/mail-account-manage-microsoft-exchange-evo-mapi.page
+share/gnome/help/evolution/te/mail-account-manage-microsoft-exchange.page
+share/gnome/help/evolution/te/mail-account-manage-novell-groupwise.page
+share/gnome/help/evolution/te/mail-account-manage-pop.page
+share/gnome/help/evolution/te/mail-account-manage-unix-mbox-spool-directory.page
+share/gnome/help/evolution/te/mail-account-manage-unix-mbox-spool-file.page
+share/gnome/help/evolution/te/mail-account-manage-usenet-news.page
+share/gnome/help/evolution/te/mail-attachments.page
+share/gnome/help/evolution/te/mail-attachments-received.page
+share/gnome/help/evolution/te/mail-attachments-sending.page
+share/gnome/help/evolution/te/mail-calendar-sending-invitations.page
+share/gnome/help/evolution/te/mail-cannot-see.page
+share/gnome/help/evolution/te/mail-change-columns-in-message-list.page
+share/gnome/help/evolution/te/mail-change-time-format.page
+share/gnome/help/evolution/te/mail-composer-change-quotation-string.page
+share/gnome/help/evolution/te/mail-composer-custom-header-lines.page
+share/gnome/help/evolution/te/mail-composer-forward-as-attachment.page
+share/gnome/help/evolution/te/mail-composer-forward.page
+share/gnome/help/evolution/te/mail-composer-html-image.page
+share/gnome/help/evolution/te/mail-composer-html-link.page
+share/gnome/help/evolution/te/mail-composer-html.page
+share/gnome/help/evolution/te/mail-composer-html-rule.page
+share/gnome/help/evolution/te/mail-composer-html-table.page
+share/gnome/help/evolution/te/mail-composer-html-text.page
+share/gnome/help/evolution/te/mail-composer-mail-signatures-manage.page
+share/gnome/help/evolution/te/mail-composer-mail-signatures.page
+share/gnome/help/evolution/te/mail-composer-mail-signatures-per-account.page
+share/gnome/help/evolution/te/mail-composer-message-templates.page
+share/gnome/help/evolution/te/mail-composer-priority.page
+share/gnome/help/evolution/te/mail-composer-reply.page
+share/gnome/help/evolution/te/mail-composer-search.page
+share/gnome/help/evolution/te/mail-composer-several-recipients.page
+share/gnome/help/evolution/te/mail-displaying-no-css.page
+share/gnome/help/evolution/te/mail-composer-spellcheck.page
+share/gnome/help/evolution/te/mail-composer-write-new-message.page
+share/gnome/help/evolution/te/mail-default-CC-and-BCC.page
+share/gnome/help/evolution/te/mail-default-folder-locations.page
+share/gnome/help/evolution/te/mail-delete-and-undelete.page
+share/gnome/help/evolution/te/mail-displaying-character-encodings.page
+share/gnome/help/evolution/te/mail-displaying-collapsible-headers.page
+share/gnome/help/evolution/te/mail-displaying-images-in-html.page
+share/gnome/help/evolution/te/mail-displaying-message.page
+share/gnome/help/evolution/te/mail-displaying-sender-photograph.page
+share/gnome/help/evolution/te/mail-duplicates.page
+share/gnome/help/evolution/te/mail-encryption.page
+share/gnome/help/evolution/te/mail-encryption-gpg-create-key.page
+share/gnome/help/evolution/te/mail-encryption-gpg-decrypting.page
+share/gnome/help/evolution/te/mail-encryption-gpg-getting-keys.page
+share/gnome/help/evolution/te/mail-encryption-gpg-set-up.page
+share/gnome/help/evolution/te/mail-encryption-gpg-signing-encrypting.page
+share/gnome/help/evolution/te/mail-encryption-s-mime-manage.page
+share/gnome/help/evolution/te/mail-encryption-s-mime-signing-encrypting.page
+share/gnome/help/evolution/te/mail-error-failed-to-append-to-sent-folder.page
+share/gnome/help/evolution/te/mail-error-no-provider-available.page
+share/gnome/help/evolution/te/mail-filters-actions.page
+share/gnome/help/evolution/te/mail-filters-conditions.page
+share/gnome/help/evolution/te/mail-filters-not-working.page
+share/gnome/help/evolution/te/mail-filters.page
+share/gnome/help/evolution/te/mail-folders.page
+share/gnome/help/evolution/te/mail-follow-up-flag.page
+share/gnome/help/evolution/te/mail-imap-headers.page
+share/gnome/help/evolution/te/mail-imap-subscriptions.page
+share/gnome/help/evolution/te/mail-labels.page
+share/gnome/help/evolution/te/mail-layout-changing.page
+share/gnome/help/evolution/te/mail-moving-emails.page
+share/gnome/help/evolution/te/mail-not-sent.page
+share/gnome/help/evolution/te/mail-organizing.page
+share/gnome/help/evolution/te/mail-reading-keyboard-shortcuts.page
+share/gnome/help/evolution/te/mail-read-receipts.page
+share/gnome/help/evolution/te/mail-received-notification.page
+share/gnome/help/evolution/te/mail-spam-marking.page
+share/gnome/help/evolution/te/mail-receiving-options-evolution-exchange.page
+share/gnome/help/evolution/te/mail-receiving-options-exchange-ews.page
+share/gnome/help/evolution/te/mail-receiving-options-exchange-mapi.page
+share/gnome/help/evolution/te/mail-receiving-options-imap.page
+share/gnome/help/evolution/te/mail-receiving-options-imap-plus.page
+share/gnome/help/evolution/te/mail-receiving-options-local-delivery.page
+share/gnome/help/evolution/te/mail-receiving-options-maildir-format-directories.page
+share/gnome/help/evolution/te/mail-receiving-options-mh-format-directories.page
+share/gnome/help/evolution/te/mail-receiving-options-novell-groupwise.page
+share/gnome/help/evolution/te/mail-searching.page
+share/gnome/help/evolution/te/mail-receiving-options.page
+share/gnome/help/evolution/te/mail-receiving-options-pop.page
+share/gnome/help/evolution/te/mail-receiving-options-unix-mbox-spool-directory.page
+share/gnome/help/evolution/te/mail-receiving-options-unix-mbox-spool-file.page
+share/gnome/help/evolution/te/mail-receiving-options-usenet-news.page
+share/gnome/help/evolution/te/mail-recognized-thread-related-headers.page
+share/gnome/help/evolution/te/mail-refresh-folders.page
+share/gnome/help/evolution/te/mail-search-folders-add.page
+share/gnome/help/evolution/te/mail-search-folders-conditions.page
+share/gnome/help/evolution/te/mail-search-folders.page
+share/gnome/help/evolution/te/mail-search-folders-refresh.page
+share/gnome/help/evolution/te/mail-searching-attachment-type.page
+share/gnome/help/evolution/te/mail-send-and-receive-automatically.page
+share/gnome/help/evolution/te/mail-send-and-receive-manual.page
+share/gnome/help/evolution/te/mail-send-and-receive.page
+share/gnome/help/evolution/te/mail-sending-options-smtp.page
+share/gnome/help/evolution/te/mail-several-pop-accounts.page
+share/gnome/help/evolution/te/mail-sorting-message-list.page
+share/gnome/help/evolution/te/mail-spam-groupwise-add-to-list.page
+share/gnome/help/evolution/te/mail-spam-groupwise-manage-list.page
+share/gnome/help/evolution/te/mail-spam-groupwise-mark-message.page
+share/gnome/help/evolution/te/mail-spam-groupwise-remove-from-list.page
+share/gnome/help/evolution/te/mail-spam-groupwise-unmark-message.page
+share/gnome/help/evolution/te/mail-spam-settings.page
+share/gnome/help/evolution/te/mail-two-trash-folders.page
+share/gnome/help/evolution/te/mail-usenet-subscriptions.page
+share/gnome/help/evolution/te/mail-vertical-view.page
+share/gnome/help/evolution/te/mail-word-wrap.page
+share/gnome/help/evolution/te/mail-working-offline.page
+share/gnome/help/evolution/te/memos-searching.page
+share/gnome/help/evolution/te/memos-usage-add-memo.page
+share/gnome/help/evolution/te/memos-usage-delete-memo.page
+share/gnome/help/evolution/te/memos-usage-edit-memo.page
+share/gnome/help/evolution/te/memos-usage.page
+share/gnome/help/evolution/te/minimize-to-system-tray.page
+share/gnome/help/evolution/te/offline.page
+share/gnome/help/evolution/te/organizing.page
+share/gnome/help/evolution/te/problems-debug-how-to.page
+share/gnome/help/evolution/te/problems-getting-help.page
+share/gnome/help/evolution/te/problems-reporting-bugs.page
+share/gnome/help/evolution/te/searching-items.page
+share/gnome/help/evolution/te/sync-with-other-devices.page
+share/gnome/help/evolution/te/tasks-caldav.page
+share/gnome/help/evolution/te/tasks-display-settings.page
+share/gnome/help/evolution/te/tasks-local.page
+share/gnome/help/evolution/te/tasks-organizing.page
+share/gnome/help/evolution/te/tasks-searching.page
+share/gnome/help/evolution/te/tasks-usage-add-task.page
+share/gnome/help/evolution/te/tasks-usage-delete-task.page
+share/gnome/help/evolution/te/tasks-usage-edit-task.page
+share/gnome/help/evolution/te/tasks-usage.page
+share/gnome/help/evolution/te/tasks-webdav.page
+share/gnome/help/evolution/te/tasks-using-several-tasklists.page
+share/gnome/help/evolution/te/using-categories.page
+share/gnome/help/evolution/zh_CN/change-keyboard-shortcuts.page
+share/gnome/help/evolution/zh_CN/contacts-libreoffice.page
+share/gnome/help/evolution/zh_CN/intro-application.page
+share/gnome/help/evolution/zh_CN/mail-receiving-options-exchange-ews.page
+share/gnome/help/evolution/zh_CN/offline.page
+%%DATADIR%%/%%VERSION%%/errors/evolution-mdn.error
+share/GConf/gsettings/evolution.convert
 @dirrm share/gnome/help/evolution/zh_CN/figures
 @dirrm share/gnome/help/evolution/zh_CN
+@dirrm share/gnome/help/evolution/te/figures
+@dirrm share/gnome/help/evolution/te
 @dirrm share/gnome/help/evolution/sv/figures
 @dirrm share/gnome/help/evolution/sv
 @dirrm share/gnome/help/evolution/sl/figures
@@ -4953,6 +5222,44 @@ share/mime-info/evolution.mime
 @dirrm share/gnome/help/evolution/C/figures
 @dirrm share/gnome/help/evolution/C
 @dirrm share/gnome/help/evolution
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
 @dirrm %%DATADIR%%/%%VERSION%%/views/tasks
 @dirrm %%DATADIR%%/%%VERSION%%/views/memos
 @dirrm %%DATADIR%%/%%VERSION%%/views/mail
@@ -5093,6 +5400,9 @@ share/mime-info/evolution.mime
 @dirrm include/evolution-%%VERSION%%/menus
 @dirrm include/evolution-%%VERSION%%/mail
 @dirrm include/evolution-%%VERSION%%/libgnomecanvas
+@dirrm include/evolution-%%VERSION%%/libevolution-utils
+@dirrm include/evolution-%%VERSION%%/libemail-utils
+@dirrm include/evolution-%%VERSION%%/libemail-engine
 @dirrm include/evolution-%%VERSION%%/filter
 @dirrm include/evolution-%%VERSION%%/em-format
 @dirrm include/evolution-%%VERSION%%/e-util
@@ -5104,41 +5414,3 @@ share/mime-info/evolution.mime
 @dirrm include/evolution-%%VERSION%%/addressbook/gui
 @dirrm include/evolution-%%VERSION%%/addressbook
 @dirrm include/evolution-%%VERSION%%
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ps/LC_MESSAGES
-@dirrmtry share/locale/ps
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/nds/LC_MESSAGES
-@dirrmtry share/locale/nds
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as