Update to 1.5.9.1.

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

5 files changed, 65 insertions, 253 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 68b9011a3..908418e3b 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	1.5.8
-PORTREVISION=	1
+PORTVERSION=	1.5.9.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.5
@@ -23,7 +22,8 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack evolutiondataserver
+USE_GNOME=	gnomeprefix gnomehack intlhack evolutiondataserver gal2 \
+		gtkhtml3
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-nss=yes \
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index ea3e6475f..67446fa7e 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/evolution-1.5.8.tar.bz2) = a09ca19c5d2bbe332c2bd493b1e9328b
-SIZE (gnome2/evolution-1.5.8.tar.bz2) = 12427105
+MD5 (gnome2/evolution-1.5.9.1.tar.bz2) = f075b47071c81950258d51aef50cc657
+SIZE (gnome2/evolution-1.5.9.1.tar.bz2) = 11775678
diff --git a/mail/evolution/files/patch-mail_message-list.c b/mail/evolution/files/patch-mail_message-list.c
new file mode 100644
index 000000000..a61c287c5
--- /dev/null
+++ b/mail/evolution/files/patch-mail_message-list.c
@@ -0,0 +1,36 @@
+--- mail/message-list.c.orig	Sat Jun  5 20:05:13 2004
++++ mail/message-list.c	Sat Jun  5 20:08:01 2004
+@@ -2129,6 +2129,7 @@
+ 	ETreeModel *etm = ml->model;
+ 	ETreePath *top;
+ 	char *saveuid = NULL;
++	GPtrArray *selected;
+ 
+ #ifdef TIMEIT
+ 	struct timeval start, end;
+@@ -2156,7 +2157,7 @@
+ #ifndef BROKEN_ETREE
+ 	if (top == NULL || changes == NULL) {
+ #else
+-		GPtrArray *selected = message_list_get_selected(ml);
++		selected = message_list_get_selected(ml);
+ #endif
+ 		e_tree_memory_freeze(E_TREE_MEMORY(etm));
+ 		clear_tree (ml);
+@@ -2455,6 +2456,7 @@
+ 	ETreePath node;
+ 	char *saveuid = NULL;
+ 	int i;
++	GPtrArray *selected;
+ 
+ #ifdef TIMEIT
+ 	struct timeval start, end;
+@@ -2472,7 +2474,7 @@
+ 		build_flat_diff(ml, changes);
+ 	} else {
+ #else
+-		GPtrArray *selected = message_list_get_selected(ml);
++		selected = message_list_get_selected(ml);
+ #endif
+ 		e_tree_memory_freeze(E_TREE_MEMORY(etm));
+ 		clear_tree (ml);
diff --git a/mail/evolution/files/patch-smime_gui_cert-trust-dialog.c b/mail/evolution/files/patch-smime_gui_cert-trust-dialog.c
new file mode 100644
index 000000000..08c755759
--- /dev/null
+++ b/mail/evolution/files/patch-smime_gui_cert-trust-dialog.c
@@ -0,0 +1,18 @@
+--- smime/gui/cert-trust-dialog.c.orig	Sat Jun  5 15:59:24 2004
++++ smime/gui/cert-trust-dialog.c	Sat Jun  5 16:00:01 2004
+@@ -79,11 +79,13 @@
+ 		CERT_ChangeCertTrust (CERT_GetDefaultCertDB(), icert, &trust);
+ 		break;
+ 	case GTK_RESPONSE_ACCEPT: {
++		GtkWidget *dialog;
++		CERTCertificate *icert;
+ 		g_signal_stop_emission_by_name(w, "response");
+ 
+ 		/* just *what on earth* was chris thinking here!?!?!  copied from certificate-manager.c */
+-		GtkWidget *dialog = ca_trust_dialog_show (data->cacert, FALSE);
+-		CERTCertificate *icert = e_cert_get_internal_cert (data->cacert);
++		dialog = ca_trust_dialog_show (data->cacert, FALSE);
++		icert = e_cert_get_internal_cert (data->cacert);
+ 
+ 		ca_trust_dialog_set_trust (dialog,
+ 					   e_cert_trust_has_trusted_ca (icert->trust, TRUE,  FALSE, FALSE),
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 138ee3360..af3f65795 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -1,4 +1,5 @@
 bin/evolution-%%VERSION%%
+bin/evolution-addressbook-export
 etc/gconf/gconf.xml.defaults/apps/evolution/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/completion/%gconf.xml
@@ -137,13 +138,13 @@ include/evolution-%%VERSION%%/camel/camel-mime-filter-linewrap.h
 include/evolution-%%VERSION%%/camel/camel-mime-filter-save.h
 include/evolution-%%VERSION%%/camel/camel-mime-filter-tohtml.h
 include/evolution-%%VERSION%%/camel/camel-mime-filter-windows.h
+include/evolution-%%VERSION%%/camel/camel-mime-filter-yenc.h
 include/evolution-%%VERSION%%/camel/camel-mime-filter.h
 include/evolution-%%VERSION%%/camel/camel-mime-message.h
 include/evolution-%%VERSION%%/camel/camel-mime-parser.h
 include/evolution-%%VERSION%%/camel/camel-mime-part-utils.h
 include/evolution-%%VERSION%%/camel/camel-mime-part.h
 include/evolution-%%VERSION%%/camel/camel-mime-utils.h
-include/evolution-%%VERSION%%/camel/camel-mime-filter-yenc.h
 include/evolution-%%VERSION%%/camel/camel-movemail.h
 include/evolution-%%VERSION%%/camel/camel-multipart-encrypted.h
 include/evolution-%%VERSION%%/camel/camel-multipart-signed.h
@@ -342,6 +343,8 @@ libdata/pkgconfig/camel-%%VERSION%%.pc
 libdata/pkgconfig/evolution-shell-%%VERSION%%.pc
 libexec/evolution/%%VERSION%%/camel/camel-index-control
 libexec/evolution/%%VERSION%%/camel/camel-lock-helper
+libexec/evolution/%%VERSION%%/csv2vcard
+libexec/evolution/%%VERSION%%/evolution-addressbook-clean
 libexec/evolution/%%VERSION%%/evolution-alarm-notify
 libexec/evolution/%%VERSION%%/killev
 share/gnome/applications/evolution-%%VERSION%%.desktop
@@ -350,6 +353,8 @@ share/gnome/evolution/%%VERSION%%/default/C/mail/local/Inbox
 share/gnome/evolution/%%VERSION%%/ecps/medbook.ecps
 share/gnome/evolution/%%VERSION%%/ecps/phonelist.ecps
 share/gnome/evolution/%%VERSION%%/ecps/smallbook.ecps
+share/gnome/evolution/%%VERSION%%/errors/addressbook-errors.xml
+share/gnome/evolution/%%VERSION%%/errors/calendar-errors.xml
 share/gnome/evolution/%%VERSION%%/errors/e-system-errors.xml
 share/gnome/evolution/%%VERSION%%/errors/filter-errors.xml
 share/gnome/evolution/%%VERSION%%/errors/mail-composer-errors.xml
@@ -386,22 +391,13 @@ share/gnome/evolution/%%VERSION%%/glade/eab-contact-commit-duplicate-detected.gl
 share/gnome/evolution/%%VERSION%%/glade/eab-contact-duplicate-detected.glade
 share/gnome/evolution/%%VERSION%%/glade/event-page.glade
 share/gnome/evolution/%%VERSION%%/glade/evolution-startup-wizard.glade
-share/gnome/evolution/%%VERSION%%/glade/evolution.png
 share/gnome/evolution/%%VERSION%%/glade/filter.glade
-share/gnome/evolution/%%VERSION%%/glade/flag-for-followup-done-48.png
-share/gnome/evolution/%%VERSION%%/glade/flag-for-followup-48.png
 share/gnome/evolution/%%VERSION%%/glade/fulladdr.glade
 share/gnome/evolution/%%VERSION%%/glade/fullname.glade
 share/gnome/evolution/%%VERSION%%/glade/goto-dialog.glade
 share/gnome/evolution/%%VERSION%%/glade/im.glade
 share/gnome/evolution/%%VERSION%%/glade/import.glade
-share/gnome/evolution/%%VERSION%%/glade/import.png
 share/gnome/evolution/%%VERSION%%/glade/ldap-config.glade
-share/gnome/evolution/%%VERSION%%/glade/mail-config-druid-account-name.png
-share/gnome/evolution/%%VERSION%%/glade/mail-config-druid-identity.png
-share/gnome/evolution/%%VERSION%%/glade/mail-config-druid-receive.png
-share/gnome/evolution/%%VERSION%%/glade/mail-config-druid-send.png
-share/gnome/evolution/%%VERSION%%/glade/mail-config-druid.png
 share/gnome/evolution/%%VERSION%%/glade/mail-config.glade
 share/gnome/evolution/%%VERSION%%/glade/mail-search.glade
 share/gnome/evolution/%%VERSION%%/glade/mail-security.glade
@@ -414,250 +410,14 @@ share/gnome/evolution/%%VERSION%%/glade/smime-ui.glade
 share/gnome/evolution/%%VERSION%%/glade/subscribe-dialog.glade
 share/gnome/evolution/%%VERSION%%/glade/task-details-page.glade
 share/gnome/evolution/%%VERSION%%/glade/task-page.glade
-share/gnome/evolution/%%VERSION%%/glade/thankyou.png
-share/gnome/evolution/%%VERSION%%/glade/timezone-48.png
 share/gnome/evolution/%%VERSION%%/glade/url-editor-dialog.glade
 share/gnome/evolution/%%VERSION%%/help/quickref/C/quickref.pdf
-share/gnome/evolution/%%VERSION%%/images/16_copy.png
-share/gnome/evolution/%%VERSION%%/images/16_customize.png
-share/gnome/evolution/%%VERSION%%/images/16_cut.png
-share/gnome/evolution/%%VERSION%%/images/16_paste.png
 share/gnome/evolution/%%VERSION%%/images/about-box.png
-share/gnome/evolution/%%VERSION%%/images/alarm.png
-share/gnome/evolution/%%VERSION%%/images/all_contacts.xpm
-share/gnome/evolution/%%VERSION%%/images/apply-filters-16.xpm
-share/gnome/evolution/%%VERSION%%/images/appointment-reminder-excl.png
-share/gnome/evolution/%%VERSION%%/images/appointment-reminder.png
-share/gnome/evolution/%%VERSION%%/images/autocompletion.png
 share/gnome/evolution/%%VERSION%%/images/bcg.png
-share/gnome/evolution/%%VERSION%%/images/briefcase.png
-share/gnome/evolution/%%VERSION%%/images/butterfly.png
-share/gnome/evolution/%%VERSION%%/images/buttons/add-attachment.png
-share/gnome/evolution/%%VERSION%%/images/buttons/add-service.png
-share/gnome/evolution/%%VERSION%%/images/buttons/arrow-left-24.png
-share/gnome/evolution/%%VERSION%%/images/buttons/arrow-right-24.png
-share/gnome/evolution/%%VERSION%%/images/buttons/compose-message.png
-share/gnome/evolution/%%VERSION%%/images/buttons/copy-message.png
-share/gnome/evolution/%%VERSION%%/images/buttons/copy.png
-share/gnome/evolution/%%VERSION%%/images/buttons/cut.png
-share/gnome/evolution/%%VERSION%%/images/buttons/dayview.xpm
-share/gnome/evolution/%%VERSION%%/images/buttons/delete-message.png
-share/gnome/evolution/%%VERSION%%/images/buttons/fetch-mail.png
-share/gnome/evolution/%%VERSION%%/images/buttons/forward.png
-share/gnome/evolution/%%VERSION%%/images/buttons/goto-24.png
-share/gnome/evolution/%%VERSION%%/images/im-nov.png
-share/gnome/evolution/%%VERSION%%/images/buttons/listview.xpm
-share/gnome/evolution/%%VERSION%%/images/buttons/monthview.xpm
-share/gnome/evolution/%%VERSION%%/images/buttons/move-message.png
-share/gnome/evolution/%%VERSION%%/images/buttons/new_appointment.png
-share/gnome/evolution/%%VERSION%%/images/buttons/new_task.png
-share/gnome/evolution/%%VERSION%%/images/buttons/next-message.png
-share/gnome/evolution/%%VERSION%%/images/buttons/paste.png
-share/gnome/evolution/%%VERSION%%/images/buttons/previous-message.png
-share/gnome/evolution/%%VERSION%%/images/buttons/print-preview-24.png
-share/gnome/evolution/%%VERSION%%/images/buttons/print.png
-share/gnome/evolution/%%VERSION%%/images/buttons/receive-24.png
-share/gnome/evolution/%%VERSION%%/images/buttons/reply-to-all.png
-share/gnome/evolution/%%VERSION%%/images/buttons/reply.png
-share/gnome/evolution/%%VERSION%%/images/buttons/save-24.png
-share/gnome/evolution/%%VERSION%%/images/buttons/send-24-receive.png
-share/gnome/evolution/%%VERSION%%/images/buttons/send-24.png
-share/gnome/evolution/%%VERSION%%/images/buttons/weekview.xpm
-share/gnome/evolution/%%VERSION%%/images/buttons/workweekview.xpm
-share/gnome/evolution/%%VERSION%%/images/buttons/yearview.xpm
-share/gnome/evolution/%%VERSION%%/images/calendar-and-tasks-settings.png
-share/gnome/evolution/%%VERSION%%/images/cellphone.png
-share/gnome/evolution/%%VERSION%%/images/compose-message.png
-share/gnome/evolution/%%VERSION%%/images/composer-settings.png
-share/gnome/evolution/%%VERSION%%/images/conduits/evo-16-address-conduit.png
-share/gnome/evolution/%%VERSION%%/images/conduits/evo-16-calendar-conduit.png
-share/gnome/evolution/%%VERSION%%/images/conduits/evo-16-todo-conduit.png
-share/gnome/evolution/%%VERSION%%/images/conduits/evo-48-address-conduit.png
-share/gnome/evolution/%%VERSION%%/images/conduits/evo-48-calendar-conduit.png
-share/gnome/evolution/%%VERSION%%/images/conduits/evo-48-todo-conduit.png
-share/gnome/evolution/%%VERSION%%/images/configure_16_addressbook.xpm
-share/gnome/evolution/%%VERSION%%/images/configure_16_calendar.xpm
-share/gnome/evolution/%%VERSION%%/images/configure_16_folder.xpm
-share/gnome/evolution/%%VERSION%%/images/configure_16_mail.xpm
-share/gnome/evolution/%%VERSION%%/images/connect_to_url-16.xpm
-share/gnome/evolution/%%VERSION%%/images/contact-is-a-list.png
-share/gnome/evolution/%%VERSION%%/images/contact-list-16.png
-share/gnome/evolution/%%VERSION%%/images/copy_16_message.xpm
-share/gnome/evolution/%%VERSION%%/images/edit.xpm
-share/gnome/evolution/%%VERSION%%/images/empty.gif
-share/gnome/evolution/%%VERSION%%/images/encrypt.xpm
-share/gnome/evolution/%%VERSION%%/images/envelope.png
-share/gnome/evolution/%%VERSION%%/images/es-appointments.png
-share/gnome/evolution/%%VERSION%%/images/es-weather.png
-share/gnome/evolution/%%VERSION%%/images/evolution-calendar-mini.png
-share/gnome/evolution/%%VERSION%%/images/evolution-calendar.png
 share/gnome/evolution/%%VERSION%%/images/evolution-contacts-mini.png
-share/gnome/evolution/%%VERSION%%/images/evolution-contacts-plain.png
-share/gnome/evolution/%%VERSION%%/images/evolution-contacts.png
-share/gnome/evolution/%%VERSION%%/images/evolution-inbox-mini.png
-share/gnome/evolution/%%VERSION%%/images/evolution-inbox.png
-share/gnome/evolution/%%VERSION%%/images/evolution-junk-mini.png
-share/gnome/evolution/%%VERSION%%/images/evolution-junk.png
-share/gnome/evolution/%%VERSION%%/images/evolution-notes-mini.png
-share/gnome/evolution/%%VERSION%%/images/evolution-notes.png
-share/gnome/evolution/%%VERSION%%/images/evolution-tasks-mini.png
-share/gnome/evolution/%%VERSION%%/images/evolution-tasks.png
-share/gnome/evolution/%%VERSION%%/images/evolution-today-mini.png
-share/gnome/evolution/%%VERSION%%/images/evolution-today.png
-share/gnome/evolution/%%VERSION%%/images/evolution-trash-mini.png
-share/gnome/evolution/%%VERSION%%/images/evolution-trash.png
-share/gnome/evolution/%%VERSION%%/images/executive-summary-bg.png
-share/gnome/evolution/%%VERSION%%/images/executive-summary-curve.png
-share/gnome/evolution/%%VERSION%%/images/faq-16.png
-share/gnome/evolution/%%VERSION%%/images/fetch-mail.png
-share/gnome/evolution/%%VERSION%%/images/find_contact.xpm
-share/gnome/evolution/%%VERSION%%/images/find_message.xpm
-share/gnome/evolution/%%VERSION%%/images/flag-for-followup-done-16.png
-share/gnome/evolution/%%VERSION%%/images/flag-for-followup-16.png
-share/gnome/evolution/%%VERSION%%/images/folder-copy-16.png
-share/gnome/evolution/%%VERSION%%/images/folder-mini.png
-share/gnome/evolution/%%VERSION%%/images/folder-move-16.png
-share/gnome/evolution/%%VERSION%%/images/folder-settings.png
-share/gnome/evolution/%%VERSION%%/images/folder.png
-share/gnome/evolution/%%VERSION%%/images/folder.xpm
-share/gnome/evolution/%%VERSION%%/images/font.png
-share/gnome/evolution/%%VERSION%%/images/forward.xpm
-share/gnome/evolution/%%VERSION%%/images/globe.png
-share/gnome/evolution/%%VERSION%%/images/goto-16.png
-share/gnome/evolution/%%VERSION%%/images/hide_deleted_messages.xpm
-share/gnome/evolution/%%VERSION%%/images/hide_read_messages.xpm
-share/gnome/evolution/%%VERSION%%/images/hide_selected_messages.xpm
-share/gnome/evolution/%%VERSION%%/images/house.png
-share/gnome/evolution/%%VERSION%%/images/ico-calendar.png
-share/gnome/evolution/%%VERSION%%/images/ico-mail.png
-share/gnome/evolution/%%VERSION%%/images/ico-rdf.png
-share/gnome/evolution/%%VERSION%%/images/ico-weather.png
-share/gnome/evolution/%%VERSION%%/images/im-activebuddy.png
-share/gnome/evolution/%%VERSION%%/images/im-admin.png
-share/gnome/evolution/%%VERSION%%/images/im-aim.png
-share/gnome/evolution/%%VERSION%%/images/im-aol.png
-share/gnome/evolution/%%VERSION%%/images/im-away.png
-share/gnome/evolution/%%VERSION%%/images/im-dnd.png
-share/gnome/evolution/%%VERSION%%/images/im-extendedaway.png
-share/gnome/evolution/%%VERSION%%/images/im-freeforchat.png
-share/gnome/evolution/%%VERSION%%/images/im-game.png
-share/gnome/evolution/%%VERSION%%/images/im-hiptop.png
-share/gnome/evolution/%%VERSION%%/images/im-icq.png
-share/gnome/evolution/%%VERSION%%/images/im-invisible.png
-share/gnome/evolution/%%VERSION%%/images/im-jabber.png
-share/gnome/evolution/%%VERSION%%/images/im-login.png
-share/gnome/evolution/%%VERSION%%/images/im-logout.png
-share/gnome/evolution/%%VERSION%%/images/im-msn.png
-share/gnome/evolution/%%VERSION%%/images/im-na.png
-share/gnome/evolution/%%VERSION%%/images/im-notauthorized.png
-share/gnome/evolution/%%VERSION%%/images/im-occupied.png
-share/gnome/evolution/%%VERSION%%/images/im-offline.png
-share/gnome/evolution/%%VERSION%%/images/im-secure.png
-share/gnome/evolution/%%VERSION%%/images/im-wireless.png
-share/gnome/evolution/%%VERSION%%/images/im-yahoo.png
-share/gnome/evolution/%%VERSION%%/images/im.png
-share/gnome/evolution/%%VERSION%%/images/import.png
-share/gnome/evolution/%%VERSION%%/images/import.xpm
-share/gnome/evolution/%%VERSION%%/images/inbox-mini.png
-share/gnome/evolution/%%VERSION%%/images/inbox.png
-share/gnome/evolution/%%VERSION%%/images/info-bulb.png
-share/gnome/evolution/%%VERSION%%/images/ldap-mini.png
-share/gnome/evolution/%%VERSION%%/images/ldap-settings.png
-share/gnome/evolution/%%VERSION%%/images/ldap.png
-share/gnome/evolution/%%VERSION%%/images/mail-accounts-settings.png
-share/gnome/evolution/%%VERSION%%/images/mail-config-druid-account-name.png
-share/gnome/evolution/%%VERSION%%/images/mail-config-druid-identity.png
-share/gnome/evolution/%%VERSION%%/images/mail-config-druid-receive.png
-share/gnome/evolution/%%VERSION%%/images/mail-config-druid-send.png
-share/gnome/evolution/%%VERSION%%/images/mail-config-druid.png
-share/gnome/evolution/%%VERSION%%/images/mail-new.xpm
-share/gnome/evolution/%%VERSION%%/images/mail-read.xpm
-share/gnome/evolution/%%VERSION%%/images/mail.png
-share/gnome/evolution/%%VERSION%%/images/malehead.png
-share/gnome/evolution/%%VERSION%%/images/mark-as-important-16.png
-share/gnome/evolution/%%VERSION%%/images/meeting-request-16.png
-share/gnome/evolution/%%VERSION%%/images/meeting-request.png
 share/gnome/evolution/%%VERSION%%/images/monkey-16.png
-share/gnome/evolution/%%VERSION%%/images/move_message.xpm
-share/gnome/evolution/%%VERSION%%/images/myevo-appointments.png
-share/gnome/evolution/%%VERSION%%/images/myevo-mail-summary.png
-share/gnome/evolution/%%VERSION%%/images/myevo-post-it.png
-share/gnome/evolution/%%VERSION%%/images/myweather-clouds.png
-share/gnome/evolution/%%VERSION%%/images/myweather-fog.png
-share/gnome/evolution/%%VERSION%%/images/myweather-rain.png
-share/gnome/evolution/%%VERSION%%/images/myweather-snow.png
-share/gnome/evolution/%%VERSION%%/images/myweather-storm.png
-share/gnome/evolution/%%VERSION%%/images/myweather-sun.png
-share/gnome/evolution/%%VERSION%%/images/myweather-suncloud.png
-share/gnome/evolution/%%VERSION%%/images/new-message.xpm
-share/gnome/evolution/%%VERSION%%/images/new_all_day_event.png
-share/gnome/evolution/%%VERSION%%/images/new_appointment.xpm
-share/gnome/evolution/%%VERSION%%/images/new_contact.xpm
-share/gnome/evolution/%%VERSION%%/images/new_task-16.png
 share/gnome/evolution/%%VERSION%%/images/offline.png
 share/gnome/evolution/%%VERSION%%/images/online.png
-share/gnome/evolution/%%VERSION%%/images/open-in-new-window-16.png
-share/gnome/evolution/%%VERSION%%/images/outbox-mini.png
-share/gnome/evolution/%%VERSION%%/images/outbox.png
-share/gnome/evolution/%%VERSION%%/images/pattern.png
-share/gnome/evolution/%%VERSION%%/images/pgp-signature-bad.png
-share/gnome/evolution/%%VERSION%%/images/pgp-signature-nokey.png
-share/gnome/evolution/%%VERSION%%/images/pgp-signature-ok.png
-share/gnome/evolution/%%VERSION%%/images/post-message-16.png
-share/gnome/evolution/%%VERSION%%/images/post-reply-24.png
-share/gnome/evolution/%%VERSION%%/images/print-preview.xpm
-share/gnome/evolution/%%VERSION%%/images/print.xpm
-share/gnome/evolution/%%VERSION%%/images/priority-high.xpm
-share/gnome/evolution/%%VERSION%%/images/public-folder-mini.png
-share/gnome/evolution/%%VERSION%%/images/public-folder.png
-share/gnome/evolution/%%VERSION%%/images/rdf.png
-share/gnome/evolution/%%VERSION%%/images/reply.xpm
-share/gnome/evolution/%%VERSION%%/images/reply_to_all.xpm
-share/gnome/evolution/%%VERSION%%/images/save-16.png
-share/gnome/evolution/%%VERSION%%/images/save-as-16.png
-share/gnome/evolution/%%VERSION%%/images/save.xpm
-share/gnome/evolution/%%VERSION%%/images/schedule-meeting-16.xpm
-share/gnome/evolution/%%VERSION%%/images/schedule-meeting-24.png
-share/gnome/evolution/%%VERSION%%/images/search-16.png
-share/gnome/evolution/%%VERSION%%/images/search-and-replace-16.png
-share/gnome/evolution/%%VERSION%%/images/send-16.png
-share/gnome/evolution/%%VERSION%%/images/send-later-16.png
-share/gnome/evolution/%%VERSION%%/images/send-receive.xpm
-share/gnome/evolution/%%VERSION%%/images/service-close.png
-share/gnome/evolution/%%VERSION%%/images/service-configure.png
-share/gnome/evolution/%%VERSION%%/images/service-down-disabled.png
-share/gnome/evolution/%%VERSION%%/images/service-down.png
-share/gnome/evolution/%%VERSION%%/images/service-left-disabled.png
-share/gnome/evolution/%%VERSION%%/images/service-left.png
-share/gnome/evolution/%%VERSION%%/images/service-right-disabled.png
-share/gnome/evolution/%%VERSION%%/images/service-right.png
-share/gnome/evolution/%%VERSION%%/images/service-up-disabled.png
-share/gnome/evolution/%%VERSION%%/images/service-up.png
-share/gnome/evolution/%%VERSION%%/images/settings-16.png
-share/gnome/evolution/%%VERSION%%/images/settings.png
-share/gnome/evolution/%%VERSION%%/images/show_all_messages.xpm
-share/gnome/evolution/%%VERSION%%/images/splash.png
-share/gnome/evolution/%%VERSION%%/images/stock-edit-16.png
-share/gnome/evolution/%%VERSION%%/images/stock-edit-24.png
-share/gnome/evolution/%%VERSION%%/images/stock-junk-16.png
-share/gnome/evolution/%%VERSION%%/images/stock-junk-24.png
-share/gnome/evolution/%%VERSION%%/images/stock-notjunk-16.png
-share/gnome/evolution/%%VERSION%%/images/stock-notjunk-24.png
-share/gnome/evolution/%%VERSION%%/images/summary-settings.png
-share/gnome/evolution/%%VERSION%%/images/summary_preferences-16.png
-share/gnome/evolution/%%VERSION%%/images/talking-heads.png
-share/gnome/evolution/%%VERSION%%/images/task.png
-share/gnome/evolution/%%VERSION%%/images/task.xpm
-share/gnome/evolution/%%VERSION%%/images/thankyou.png
-share/gnome/evolution/%%VERSION%%/images/timezone-16.xpm
-share/gnome/evolution/%%VERSION%%/images/timezone-48.png
-share/gnome/evolution/%%VERSION%%/images/undelete_message-16.png
-share/gnome/evolution/%%VERSION%%/images/videoconf.png
-share/gnome/evolution/%%VERSION%%/images/wax-seal-broken.png
-share/gnome/evolution/%%VERSION%%/images/wax-seal.png
-share/gnome/evolution/%%VERSION%%/images/work_offline.xpm
-share/gnome/evolution/%%VERSION%%/images/work_online-16.png
-share/gnome/evolution/%%VERSION%%/images/working-16.png
 share/gnome/evolution/%%VERSION%%/images/world_map-960.png
 share/gnome/evolution/%%VERSION%%/searchtypes.xml
 share/gnome/evolution/%%VERSION%%/ui/evolution-addressbook.xml
@@ -819,8 +579,6 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm share/gnome/evolution/%%VERSION%%/views/addressbook
 @dirrm share/gnome/evolution/%%VERSION%%/views
 @dirrm share/gnome/evolution/%%VERSION%%/ui
-@dirrm share/gnome/evolution/%%VERSION%%/images/conduits
-@dirrm share/gnome/evolution/%%VERSION%%/images/buttons
 @dirrm share/gnome/evolution/%%VERSION%%/images
 @dirrm share/gnome/evolution/%%VERSION%%/help/quickref/C
 @dirrm share/gnome/evolution/%%VERSION%%/help/quickref