* Update to 1.5.2

* Fix the SpamAssassin quoting code [1]

Submitted by:	Khairil Yusof <kaeru@pd.jaring.my> [1]


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

7 files changed, 122 insertions, 148 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index b0b38bcc1..66d9bd0b0 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	1.5.1
-PORTREVISION=	1
+PORTVERSION=	1.5.2
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.5
@@ -16,7 +15,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An integrated mail, calendar and address book distributed suite
 
-LIB_DEPENDS=	edataserver.1:${PORTSDIR}/databases/evolution-data-server \
+LIB_DEPENDS=	edataserver.2:${PORTSDIR}/databases/evolution-data-server \
 		nss3.1:${PORTSDIR}/security/nss
 
 RUN_DEPENDS=	${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnomespell
@@ -63,7 +62,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 PLIST_SUB+=	VERSION=${EVO_VERSION}
-PKGINSTALL=	${WRKDIR}/pkg-install
 
 pre-everything::
 	@${ECHO_MSG} ""
@@ -73,8 +71,4 @@ pre-everything::
 	@${ECHO_MSG} "	WITHOUT_SPAMASSASSIN	Do not add a runtime dependency on SpamAssassin (Evo uses SpamAssassin for spam filtering)"
 	@${ECHO_MSG} ""
 
-post-install:
-	@${FIND} ${PREFIX}/share/gnome/evolution/${EVO_VERSION}/default_user \
-		-type f | ${XARGS} ${CHMOD} u+w
-
 .include <bsd.port.mk>
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 0bb35e7b5..c6a42fe1f 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1 +1 @@
-MD5 (gnome2/evolution-1.5.1.tar.bz2) = 7b852abda6b8324cd1b4ce80eaee1c0e
+MD5 (gnome2/evolution-1.5.2.tar.bz2) = 63286660ea5673cb0f1f828c3b627685
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index 17e6be9d1..3f19ab6a4 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,13 +1,5 @@
 --- configure.orig	Tue Dec 30 00:39:05 2003
 +++ configure	Tue Dec 30 00:42:14 2003
-@@ -20830,6 +20830,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <sys/types.h>
- #include <sys/socket.h>
- socklen_t x;
- 
 @@ -23977,10 +23978,10 @@
  Example: --with-nspr-libs=/usr/lib" >&2;}
     { (exit 1); exit 1; }; }
diff --git a/mail/evolution/files/patch-camel_camel-utf8.c b/mail/evolution/files/patch-camel_camel-utf8.c
deleted file mode 100644
index eb89a92cf..000000000
--- a/mail/evolution/files/patch-camel_camel-utf8.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- camel/camel-utf8.c.orig	Tue Dec  9 15:21:35 2003
-+++ camel/camel-utf8.c	Tue Dec  9 15:21:43 2003
-@@ -25,6 +25,7 @@
- #include <config.h>
- #endif
- 
-+#include <sys/types.h>
- #include <string.h>
- 
- #include <glib.h>
diff --git a/mail/evolution/files/patch-mail_em-junk-filter.c b/mail/evolution/files/patch-mail_em-junk-filter.c
index cb2936a8a..0650bb485 100644
--- a/mail/evolution/files/patch-mail_em-junk-filter.c
+++ b/mail/evolution/files/patch-mail_em-junk-filter.c
@@ -1,81 +1,86 @@
---- mail/em-junk-filter.c.orig	Thu Nov 13 19:33:26 2003
-+++ mail/em-junk-filter.c	Fri Jan  9 15:49:44 2004
-@@ -189,7 +189,7 @@
- 	static gchar *args [3] = {
+--- mail/em-junk-filter.c.orig	Mon Jan 12 16:21:24 2004
++++ mail/em-junk-filter.c	Tue Jan 13 14:00:48 2004
+@@ -176,7 +176,7 @@
+ 	int retval;
+ 
+ 	d(fprintf (stderr, "test if spamd is running (port %d)\n", port);)
+-	sac_args [2] = port > 0  ? g_strdup_printf ("spamc -x -p %d", port) : g_strdup_printf ("spamc -x");
++	sac_args [2] = port > 0  ? g_strdup_printf ("'spamc -x -p %d'", port) : g_strdup_printf ("'spamc -x'");
+ 
+ 	retval = pipe_to_sa (NULL, "From test@127.0.0.1", 3, sac_args) == 0;
+ 	g_free (sac_args [2]);
+@@ -191,7 +191,7 @@
+ 	static gchar *args [4] = {
  		"/bin/sh",
  		"-c",
--		"spamassassin --version"
-+		"'spamassassin --version'" /* quoted command string */
+-		"spamassassin --version",
++		"'spamassassin --version'",
+ 		NULL
  	};
  
- 	if (pipe_to_sa (NULL, NULL, 3, args))
-@@ -225,7 +225,7 @@
+@@ -229,7 +229,7 @@
  				for (i = 0; i < NPORTS; i ++) {
  					d(fprintf (stderr, "trying to run spamd at port %d\n", port));
  
--					sad_args [2] = g_strdup_printf ("spamd --port %d --local --daemonize", port);
-+					sad_args [2] = g_strdup_printf ("'spamd --port %d --local --daemonize'", port); /* quote command string */
+-					sad_args [2] = g_strdup_printf ("spamd --port %d %s--daemonize", port, mail_session_get_sa_local_only () ? "--local " : "");
++					sad_args [2] = g_strdup_printf ("'spamd --port %d %s--daemonize'", port, mail_session_get_sa_local_only () ? "--local " : "");
  					if (!pipe_to_sa (NULL, NULL, 3, sad_args)) {
  						g_free (sad_args [2]);
  						em_junk_sa_use_spamc = TRUE;
-@@ -274,15 +274,17 @@
+@@ -277,14 +277,14 @@
+ 
+ 	args [2] = (em_junk_sa_use_spamc && mail_session_get_sa_use_daemon ())
  		? (em_junk_sa_spamd_port == -1
- 		   ? g_strdup ("spamc -c")         /* Exit with a non-zero exit code if the
+-		   ? g_strdup ("spamc -c")         /* Exit with a non-zero exit code if the
++		   ? g_strdup ("'spamc -c'")         /* Exit with a non-zero exit code if the
  						      tested message was junk */
 -		   : g_strdup_printf ("spamc"
-+		   : g_strdup_printf ("'"
-+                      "spamc"
++		   : g_strdup_printf ("'spamc"
  				      " -c"        /* Exit with a non-zero exit code if the
  						      tested message was junk */
- 				      " -p %d", em_junk_sa_spamd_port))
- 		: g_strdup ("spamassassin"
- 			    " --exit-code"         /* Exit with a non-zero exit code if the
- 						      tested message was junk */
--			    " --local");           /* Local tests only (no online tests) */
--
-+			    " --local"  /* Local tests only (no online tests) */
-+                "'" 
-+                );           
- 	retval = pipe_to_sa (msg, NULL, 3, args);
- 
- 	g_free (args [2]);
-@@ -296,11 +298,13 @@
- 	static gchar *args [3] = {
- 		"/bin/sh",
- 		"-c",
-+        "'"                    /* begin quote */
- 		"sa-learn"
- 		" --no-rebuild"        /* do not rebuild db */
- 		" --spam"              /* report junk */
- 		" --single"            /* single message */
- 		" --local"             /* local only */
-+        "'"                    /* end quote */
- 	};
+-				      " -p %d", em_junk_sa_spamd_port))
+-		: g_strdup_printf ("spamassassin"
+-				   " --exit-code%s",                  /* Exit with a non-zero exit code if the
++				      " -p %d'", em_junk_sa_spamd_port))
++		: g_strdup_printf ("'spamassassin"
++				   " --exit-code%s'",                  /* Exit with a non-zero exit code if the
+ 									 tested message was junk */
+ 				   mail_session_get_sa_local_only ()
+ 				   ? " --local" : "");                /* Local tests only (no online tests) */
+@@ -310,10 +310,10 @@
  
- 	d(fprintf (stderr, "em_junk_sa_report_junk\n"));
-@@ -315,11 +319,13 @@
- 	static gchar *args [3] = {
- 		"/bin/sh",
- 		"-c",
-+        "'"                    /* begin quote */
- 		"sa-learn"
- 		" --no-rebuild"        /* do not rebuild db */
- 		" --ham"               /* report notjunk */
- 		" --single"            /* single message */
- 		" --local"             /* local only */
-+        "'"                    /* end quote */
- 	};
+ 	if (em_junk_sa_is_available ()) {
+ 		args [2] = g_strdup_printf 
+-			("sa-learn"
++			("'sa-learn"
+ 			 " --no-rebuild"        /* do not rebuild db */
+ 			 " --spam"              /* report junk */
+-			 " --single%s",         /* single message */
++			 " --single%s'",         /* single message */
+ 			 mail_session_get_sa_local_only ()
+ 			 ? " --local" : "");    /* local only */
+ 		pipe_to_sa (msg, NULL, 3, args);
+@@ -335,10 +335,10 @@
  
- 	d(fprintf (stderr, "em_junk_sa_report_notjunk\n"));
-@@ -334,9 +340,11 @@
- 	static gchar *args [3] = {
- 		"/bin/sh",
- 		"-c",
-+        "'"                    /* begin quote */
- 		"sa-learn"
- 		" --rebuild"           /* do not rebuild db */
- 		" --local"             /* local only */
-+        "'"                    /* end quote */
- 	};
+ 	if (em_junk_sa_is_available ()) {
+ 		args [2] = g_strdup_printf
+-			("sa-learn"
++			("'sa-learn"
+ 			 " --no-rebuild"        /* do not rebuild db */
+ 			 " --ham"               /* report notjunk */
+-			 " --single%s",         /* single message */
++			 " --single%s'",         /* single message */
+ 			 mail_session_get_sa_local_only ()
+ 			 ? " --local" : "");    /* local only */
+ 		pipe_to_sa (msg, NULL, 3, args);
+@@ -360,8 +360,8 @@
  
- 	d(fprintf (stderr, "em_junk_sa_commit_reports\n");)
+ 	if (em_junk_sa_is_available ()) {
+ 		args [2] = g_strdup_printf
+-			("sa-learn"
+-			 " --rebuild%s",           /* do not rebuild db */
++			("'sa-learn"
++			 " --rebuild%s'",           /* do not rebuild db */
+ 			 mail_session_get_sa_local_only ()
+ 			 ? " --local" : "");       /* local only */
+ 		pipe_to_sa (NULL, NULL, 3, args);
diff --git a/mail/evolution/files/patch-tools_Makefile.in b/mail/evolution/files/patch-tools_Makefile.in
deleted file mode 100644
index 7dd9f4450..000000000
--- a/mail/evolution/files/patch-tools_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- tools/Makefile.in.orig	Tue Dec 30 01:50:58 2003
-+++ tools/Makefile.in	Tue Dec 30 01:51:51 2003
-@@ -240,7 +240,8 @@
- killev_SOURCES =  	killev.c
- 
- 
--killev_LDADD =  	$(top_builddir)/e-util/libeutil.la
-+killev_LDADD =  	$(top_builddir)/e-util/libeutil.la \
-+			$(E_UTIL_LIBS)
- 
- 
- CLEANFILES = evolution-addressbook-clean $(BUILT_SOURCES)
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index f12935da4..3d262f8cd 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -9,6 +9,7 @@ etc/gconf/gconf.xml.defaults/apps/evolution/calendar/display/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/evolution/calendar/notify/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/evolution/calendar/other/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/evolution/calendar/prompts/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/evolution/calendar/publish/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/evolution/calendar/tasks/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/evolution/calendar/tasks/colors/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/evolution/mail/%gconf.xml
@@ -19,6 +20,7 @@ etc/gconf/gconf.xml.defaults/apps/evolution/mail/display/fonts/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/evolution/mail/filters/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/evolution/mail/format/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/evolution/mail/junk/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/evolution/mail/junk/sa/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/evolution/mail/notify/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/evolution/mail/prompts/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/evolution/mail/trash/%gconf.xml
@@ -38,6 +40,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/display/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/notify/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/other/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/prompts/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/publish/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/tasks/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/tasks/colors/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/%gconf.xml
@@ -48,6 +51,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/display/fonts/%gconf.xm
 etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/filters/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/format/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/junk/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/junk/sa/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/notify/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/prompts/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/trash/%gconf.xml
@@ -139,6 +143,12 @@ include/evolution-%%VERSION%%/camel/camel-movemail.h
 include/evolution-%%VERSION%%/camel/camel-multipart-encrypted.h
 include/evolution-%%VERSION%%/camel/camel-multipart-signed.h
 include/evolution-%%VERSION%%/camel/camel-multipart.h
+include/evolution-%%VERSION%%/camel/camel-nntp-folder.h
+include/evolution-%%VERSION%%/camel/camel-nntp-resp-codes.h
+include/evolution-%%VERSION%%/camel/camel-nntp-store-summary.h
+include/evolution-%%VERSION%%/camel/camel-nntp-store.h
+include/evolution-%%VERSION%%/camel/camel-nntp-stream.h
+include/evolution-%%VERSION%%/camel/camel-nntp-summary.h
 include/evolution-%%VERSION%%/camel/camel-object.h
 include/evolution-%%VERSION%%/camel/camel-operation.h
 include/evolution-%%VERSION%%/camel/camel-partition-table.h
@@ -252,6 +262,7 @@ include/evolution-%%VERSION%%/widgets/e-combo-cell-editable.h
 include/evolution-%%VERSION%%/widgets/e-config-page.h
 include/evolution-%%VERSION%%/widgets/e-dateedit.h
 include/evolution-%%VERSION%%/widgets/e-dropdown-button.h
+include/evolution-%%VERSION%%/widgets/e-expander.h
 include/evolution-%%VERSION%%/widgets/e-map.h
 include/evolution-%%VERSION%%/widgets/e-multi-config-dialog.h
 include/evolution-%%VERSION%%/widgets/e-search-bar.h
@@ -259,10 +270,14 @@ include/evolution-%%VERSION%%/widgets/e-source-option-menu.h
 include/evolution-%%VERSION%%/widgets/e-source-selector.h
 include/evolution-%%VERSION%%/widgets/e-title-bar.h
 include/evolution-%%VERSION%%/widgets/e-url-entry.h
+lib/evolution/%%VERSION%%/camel-providers/libcamelgroupwise.so
+lib/evolution/%%VERSION%%/camel-providers/libcamelgroupwise.urls
 lib/evolution/%%VERSION%%/camel-providers/libcamelimap.so
 lib/evolution/%%VERSION%%/camel-providers/libcamelimap.urls
 lib/evolution/%%VERSION%%/camel-providers/libcamellocal.so
 lib/evolution/%%VERSION%%/camel-providers/libcamellocal.urls
+lib/evolution/%%VERSION%%/camel-providers/libcamelnntp.so
+lib/evolution/%%VERSION%%/camel-providers/libcamelnntp.urls
 lib/evolution/%%VERSION%%/camel-providers/libcamelpop3.so
 lib/evolution/%%VERSION%%/camel-providers/libcamelpop3.urls
 lib/evolution/%%VERSION%%/camel-providers/libcamelsendmail.so
@@ -293,9 +308,6 @@ lib/evolution/%%VERSION%%/libevolution-importer.so
 lib/evolution/%%VERSION%%/libevolution-importer.so.0
 lib/evolution/%%VERSION%%/libevolution-widgets-a11y.so
 lib/evolution/%%VERSION%%/libevolution-widgets-a11y.so.0
-%%PILOT:%%lib/gnome-pilot/conduits/libeaddress_conduit.so
-%%PILOT:%%lib/gnome-pilot/conduits/libecalendar_conduit.so
-%%PILOT:%%lib/gnome-pilot/conduits/libetodo_conduit.so
 libdata/bonobo/servers/GNOME_Evolution_Addressbook_%%VERSION%%.server
 libdata/bonobo/servers/GNOME_Evolution_Addressbook_SelectNames_%%VERSION%%.server
 libdata/bonobo/servers/GNOME_Evolution_Calendar_%%VERSION%%.server
@@ -312,24 +324,6 @@ libexec/evolution/%%VERSION%%/evolution-alarm-notify
 libexec/evolution/%%VERSION%%/killev
 share/gnome/applications/evolution-%%VERSION%%.desktop
 share/gnome/evolution/%%VERSION%%/addresstypes.xml
-share/gnome/evolution/%%VERSION%%/default_user/addressbook-sources.xml
-share/gnome/evolution/%%VERSION%%/default_user/local/Calendar/calendar.ics
-share/gnome/evolution/%%VERSION%%/default_user/local/Calendar/folder-metadata.xml
-share/gnome/evolution/%%VERSION%%/default_user/local/Contacts/create-initial
-share/gnome/evolution/%%VERSION%%/default_user/local/Contacts/folder-metadata.xml
-share/gnome/evolution/%%VERSION%%/default_user/local/Drafts/folder-metadata.xml
-share/gnome/evolution/%%VERSION%%/default_user/local/Drafts/mbox
-share/gnome/evolution/%%VERSION%%/default_user/local/Inbox/folder-metadata.xml
-share/gnome/evolution/%%VERSION%%/default_user/local/Inbox/mbox
-share/gnome/evolution/%%VERSION%%/default_user/local/Outbox/folder-metadata.xml
-share/gnome/evolution/%%VERSION%%/default_user/local/Outbox/mbox
-share/gnome/evolution/%%VERSION%%/default_user/local/Sent/folder-metadata.xml
-share/gnome/evolution/%%VERSION%%/default_user/local/Sent/mbox
-share/gnome/evolution/%%VERSION%%/default_user/local/Tasks/folder-metadata.xml
-share/gnome/evolution/%%VERSION%%/default_user/local/Tasks/tasks.ics
-share/gnome/evolution/%%VERSION%%/default_user/local/Trash/folder-metadata.xml
-share/gnome/evolution/%%VERSION%%/default_user/searches.xml
-share/gnome/evolution/%%VERSION%%/default_user/vfolders.xml
 share/gnome/evolution/%%VERSION%%/ecps/medbook.ecps
 share/gnome/evolution/%%VERSION%%/ecps/phonelist.ecps
 share/gnome/evolution/%%VERSION%%/ecps/smallbook.ecps
@@ -347,6 +341,7 @@ share/gnome/evolution/%%VERSION%%/glade/alarm-notify.glade
 share/gnome/evolution/%%VERSION%%/glade/alarm-options.glade
 share/gnome/evolution/%%VERSION%%/glade/alarm-page.glade
 share/gnome/evolution/%%VERSION%%/glade/cal-prefs-dialog.glade
+share/gnome/evolution/%%VERSION%%/glade/calendar-setup.glade
 share/gnome/evolution/%%VERSION%%/glade/contact-editor.glade
 share/gnome/evolution/%%VERSION%%/glade/contact-list-editor.glade
 share/gnome/evolution/%%VERSION%%/glade/e-active-connection-dialog.glade
@@ -369,6 +364,7 @@ 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
@@ -383,8 +379,6 @@ share/gnome/evolution/%%VERSION%%/glade/mail-search.glade
 share/gnome/evolution/%%VERSION%%/glade/mail-security.glade
 share/gnome/evolution/%%VERSION%%/glade/meeting-page.glade
 share/gnome/evolution/%%VERSION%%/glade/message-tags.glade
-share/gnome/evolution/%%VERSION%%/glade/new-calendar.glade
-share/gnome/evolution/%%VERSION%%/glade/new-task-list.glade
 share/gnome/evolution/%%VERSION%%/glade/recurrence-page.glade
 share/gnome/evolution/%%VERSION%%/glade/schedule-page.glade
 share/gnome/evolution/%%VERSION%%/glade/select-names.glade
@@ -394,6 +388,7 @@ 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%%/images/16_copy.png
 share/gnome/evolution/%%VERSION%%/images/16_customize.png
 share/gnome/evolution/%%VERSION%%/images/16_cut.png
@@ -505,6 +500,30 @@ 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
@@ -599,6 +618,7 @@ 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
@@ -641,9 +661,6 @@ share/gnome/evolution/%%VERSION%%/views/mail/galview.xml
 share/gnome/evolution/%%VERSION%%/views/tasks/Tasks.galview
 share/gnome/evolution/%%VERSION%%/views/tasks/With_Category.galview
 share/gnome/evolution/%%VERSION%%/views/tasks/galview.xml
-%%PILOT:%%share/gnome/gnome-pilot/conduits/e-address.conduit
-%%PILOT:%%share/gnome/gnome-pilot/conduits/e-calendar.conduit
-%%PILOT:%%share/gnome/gnome-pilot/conduits/e-todo.conduit
 share/gnome/help/evolution-%%VERSION%%/C/apx-authors.xml
 share/gnome/help/evolution-%%VERSION%%/C/apx-bugs.xml
 share/gnome/help/evolution-%%VERSION%%/C/apx-fdl.xml
@@ -662,7 +679,6 @@ share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-identity.png
 share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-receive-options.png
 share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-receive.png
 share/gnome/help/evolution-%%VERSION%%/C/figures/filter-new-fig.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/folder-bar.png
 share/gnome/help/evolution-%%VERSION%%/C/figures/full-1.png
 share/gnome/help/evolution-%%VERSION%%/C/figures/full-2.png
 share/gnome/help/evolution-%%VERSION%%/C/figures/full-3.png
@@ -679,7 +695,6 @@ share/gnome/help/evolution-%%VERSION%%/C/figures/print-dest.png
 share/gnome/help/evolution-%%VERSION%%/C/figures/print-preview.png
 share/gnome/help/evolution-%%VERSION%%/C/figures/replymsg.png
 share/gnome/help/evolution-%%VERSION%%/C/figures/schedule.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/summary.png
 share/gnome/help/evolution-%%VERSION%%/C/figures/vfolder-createrule-fig.png
 share/gnome/help/evolution-%%VERSION%%/C/legal.xml
 share/gnome/help/evolution-%%VERSION%%/C/menuref.xml
@@ -687,7 +702,6 @@ share/gnome/help/evolution-%%VERSION%%/C/preface.xml
 share/gnome/help/evolution-%%VERSION%%/C/usage-calendar.xml
 share/gnome/help/evolution-%%VERSION%%/C/usage-contact.xml
 share/gnome/help/evolution-%%VERSION%%/C/usage-exchange.xml
-share/gnome/help/evolution-%%VERSION%%/C/usage-exec-summary.xml
 share/gnome/help/evolution-%%VERSION%%/C/usage-mail-org.xml
 share/gnome/help/evolution-%%VERSION%%/C/usage-mail.xml
 share/gnome/help/evolution-%%VERSION%%/C/usage-mainwindow.xml
@@ -708,7 +722,6 @@ share/gnome/idl/evolution-%%VERSION%%/evolution-calendar.idl
 share/gnome/mime-info/evolution-%%VERSION%%.keys
 share/gnome/mime-info/evolution-%%VERSION%%.mime
 share/gnome/omf/evolution/evolution-%%VERSION%%-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/evolution/evolution-%%VERSION%%-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/evolution-%%VERSION%%.png
 share/locale/am/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -724,10 +737,12 @@ share/locale/en_GB/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/es/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/et/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/eu/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/fa/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/fi/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/fr/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ga/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/gl/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/hr/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/hu/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/it/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ja/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -745,6 +760,7 @@ share/locale/ro/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ru/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/sk/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/sl/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/sq/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/sr/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/sr@Latn/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/sv/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -770,21 +786,6 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm share/gnome/evolution/%%VERSION%%/glade
 @dirrm share/gnome/evolution/%%VERSION%%/etspec
 @dirrm share/gnome/evolution/%%VERSION%%/ecps
-@dirrm share/gnome/evolution/%%VERSION%%/default_user/views/tasks
-@dirrm share/gnome/evolution/%%VERSION%%/default_user/views/mail
-@dirrm share/gnome/evolution/%%VERSION%%/default_user/views/calendar
-@dirrm share/gnome/evolution/%%VERSION%%/default_user/views/addressbook
-@dirrm share/gnome/evolution/%%VERSION%%/default_user/views
-@dirrm share/gnome/evolution/%%VERSION%%/default_user/local/Trash
-@dirrm share/gnome/evolution/%%VERSION%%/default_user/local/Tasks
-@dirrm share/gnome/evolution/%%VERSION%%/default_user/local/Sent
-@dirrm share/gnome/evolution/%%VERSION%%/default_user/local/Outbox
-@dirrm share/gnome/evolution/%%VERSION%%/default_user/local/Inbox
-@dirrm share/gnome/evolution/%%VERSION%%/default_user/local/Drafts
-@dirrm share/gnome/evolution/%%VERSION%%/default_user/local/Contacts
-@dirrm share/gnome/evolution/%%VERSION%%/default_user/local/Calendar
-@dirrm share/gnome/evolution/%%VERSION%%/default_user/local
-@dirrm share/gnome/evolution/%%VERSION%%/default_user
 @dirrm share/gnome/evolution/%%VERSION%%
 @dirrm share/gnome/evolution
 @dirrm libexec/evolution/%%VERSION%%/camel
@@ -794,6 +795,7 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm lib/evolution/%%VERSION%%/components
 @dirrm lib/evolution/%%VERSION%%/camel-providers
 @dirrm lib/evolution/%%VERSION%%
+@dirrm lib/evolution
 @dirrm include/evolution-%%VERSION%%/widgets
 @dirrm include/evolution-%%VERSION%%/shell
 @dirrm include/evolution-%%VERSION%%/importer
@@ -810,6 +812,7 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/trash
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/prompts
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/notify
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/junk/sa
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/junk
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/format
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/filters
@@ -820,6 +823,7 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/tasks/colors
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/tasks
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/publish
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/prompts
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/other
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/notify
@@ -839,6 +843,7 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/trash
 @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/prompts
 @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/notify
+@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/junk/sa
 @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/junk
 @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/format
 @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/filters
@@ -849,6 +854,7 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail
 @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/tasks/colors
 @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/tasks
+@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/publish
 @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/prompts
 @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/other
 @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/notify
@@ -859,4 +865,3 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/completion
 @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/addressbook
 @dirrm etc/gconf/gconf.xml.defaults/apps/evolution
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/evolution/evolution-%%VERSION%%-C.omf 2>/dev/null || /usr/bin/true