Merge lp:~rodrigo-moya/ubuntu/natty/evolution-data-server/2_32_1_release into lp:~ubuntu-desktop/evolution-data-server/ubuntu

[Rodrigo Moya]

[lp:~rodrigo-moya/ubuntu/natty/evolution-data-server/2_32_1_release]

68. By Rodrigo Moya on 2010-11-25

Add missing patch from git for the sources migration

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-23 18:36:26 +0000
+++ debian/changelog	2010-11-25 16:59:29 +0000
@@ -1,3 +1,61 @@
+evolution-data-server (2.32.1-0ubuntu1) natty; urgency=low
+
+  * Upstream release 2.32.1
+    - Bug #634658 - Unread counts for vfolders never update
+    - Bug #632692 - Thread by In-Reply-To, then first found reference
+    - Bug #538716 - Do not set expiration on POP3 message cache
+    - Bug #631804 - Aborts with pthread error in imapx_server_dispose()
+    - Bug #634084 - ECal reports loaded state too early
+    - Bug #632532 - Double free in imapx_job_done, imapx_command_step_fetch_done
+    - Bug #631842 - Improve error reporting in some ECal/EBook functions
+    - Bug #632030 - Crashed while Groupwise server is not responding
+    - Bug #631953 - A possible double-free in google backend
+    - Bug #632771 - Recurring calendar events set to recur forever do not
+      display past first week
+    - Bug #597567 - Crash in comp_subject()
+    - Bug #631290 - Crash in vee_folder_synchronize_sync
+    - Bug #631073 - Task update operation has some delay
+    - Bug #558478 - Autocompletion inserts comma
+    - Bug 632376 - Rewind in camel-disco-diary to fix a crash
+    - Bug #534369 - New mail notifications for local Inbox don't work
+    - Bug #608557 - CamelOfflineJournal can call fclose with NULL
+    - Bug #347520 - Names containing a dot in address parsed incorrectly
+    - Bug #630361 - Categories editing fixes
+    - Bug #631122 - Change %-H to %k in Italian translation
+    - Bug #616598 - AM/PM in Date header confuses parser
+    - Bug #616596 - Disable debug prints from e-categories.c
+    - Bug #615828 - Incorrectly set off-line state on CamelOfflineStore
+    - Bug #616172 - Return NULL from imapx_find_commad_tag when not found
+    - Bug #629507 - e_book_backend_cache_set_time doesn't rewrite old value
+    - Bug #630321 - Disabling IMAPX account produces runtime warnings
+    - Bug #628655 - imapx parser thread gerror memory leak
+    - Bug #629752 - ldap doesn't work in offline
+    - Bug #629908 - assertion failed: (E_IS_BOOK (book))
+    - Bug #615274 - Encode proxy user/password in proxy URL
+    - Bug #599741 - Cannot accept meeting request
+    - Bug #630265 - Refetches unchanged 'On The Web' calendar
+    - Fix memory leak recently introduced in imapx QRESYNC
+    - Fix QRESYNC protocol violation (RH #648082)
+    - Fix a build failure due to used CPPFLAGS
+    - Fix linking against out-of-tree e-d-s
+    - [IMAPX] Crash on QRESYNC line formatting on 32bit platform
+    - Opening default/system addressbook doesn't always work
+    - Limit libgdata support to 0.6.
+    - Avoid passing NULL to g_strstrip in e_contact_get calls (part ][)
+    - Don't link libebook to GTK+
+    - Updated translations: ca, cs, ca@valencia, nl, ast, et
+  * debian/patches/01_various_linking_issues.patch:
+    - Add upstream patch to fix linking issues on Natty
+  * debian/patches/02_fix_sources_migration.patch:
+    - Add upstream patch to fix sources migration from previous versions
+  * debian/patches/25_mute-debug-messages.patch:
+  * debian/patches/80_git_show_recurrent_event.patch:
+  * debian/patches/90-building-on-natty.patch:
+  * debian/patches/107-git-consider-local-inbox-as-inbox.patch:
+    - Remove upstreamed patches
+
+ -- Rodrigo Moya <[e-mail]>  Thu, 25 Nov 2010 16:51:06 +0100
+
 evolution-data-server (2.32.0-0ubuntu2) natty; urgency=low
 
   * debian/patches/108-git-build-against-gtk-2.91.patch: fixes building now

=== added file 'debian/patches/01_various_linking_issues.patch'
--- debian/patches/01_various_linking_issues.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01_various_linking_issues.patch	2010-11-25 16:59:29 +0000
@@ -0,0 +1,78 @@
+commit 15c7d8948cd0f628097976b7c054c79a6627841c
+Author: Diego Escalante Urrelo <[e-mail]>
+Date:   Mon Nov 22 20:02:16 2010 -0500
+
+    Bug 635572 - Various linking failures
+    
+    On Debian sid, using binutils-gold, a couple missing links are discovered.
+
+diff --git a/addressbook/libedata-book/Makefile.am b/addressbook/libedata-book/Makefile.am
+index 12db8f8..997c727 100644
+--- a/addressbook/libedata-book/Makefile.am
++++ b/addressbook/libedata-book/Makefile.am
+@@ -82,6 +82,7 @@ e_addressbook_factory_SOURCES = \
+ 
+ e_addressbook_factory_LDADD =					\
+ 	libedata-book-1.2.la					\
++	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
+ 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
+ 	$(top_builddir)/libebackend/libebackend-1.2.la
+ 
+diff --git a/calendar/libedata-cal/Makefile.am b/calendar/libedata-cal/Makefile.am
+index 82dd911..cb9ad96 100644
+--- a/calendar/libedata-cal/Makefile.am
++++ b/calendar/libedata-cal/Makefile.am
+@@ -111,6 +111,7 @@ e_calendar_factory_CPPFLAGS = \
+ 	$(EVOLUTION_CALENDAR_CFLAGS)
+ 
+ e_calendar_factory_LDADD =						\
++	$(top_builddir)/calendar/libecal/libecal-1.2.la			\
+ 	$(top_builddir)/calendar/libegdbus/libegdbus-cal.la		\
+ 	libedata-cal-1.2.la						\
+ 	$(top_builddir)/libedataserver/libedataserver-1.2.la 		\
+@@ -128,9 +129,10 @@ test_e_sexp_CPPFLAGS = \
+ 	-DTESTER=1
+ 
+ test_e_sexp_LDADD = \
+-	libedata-cal-1.2.la 							\
+-	$(top_builddir)/calendar/libecal/libecal-1.2.la 			\
+-	$(top_builddir)/libedataserver/libedataserver-1.2.la			\
++	libedata-cal-1.2.la					\
++	$(top_builddir)/calendar/libecal/libecal-1.2.la 	\
++	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
++	$(EVOLUTION_CALENDAR_LIBS)				\
+ 	$(E_DATA_SERVER_LIBS)
+ 
+ test_intervaltree_SOURCES = test-intervaltree.c e-cal-backend-intervaltree.c
+diff --git a/camel/providers/imapx/Makefile.am b/camel/providers/imapx/Makefile.am
+index 1e7a0a3..a8ae7be 100644
+--- a/camel/providers/imapx/Makefile.am
++++ b/camel/providers/imapx/Makefile.am
+@@ -54,6 +54,7 @@ test_imapx_CPPFLAGS = \
+ 	-DG_LOG_DOMAIN=\"camel-imapx\"
+ test_imapx_SOURCES = test-imapx.c
+ test_imapx_LDADD =							\
++	$(CAMEL_LIBS)							\
+ 	$(top_builddir)/camel/libcamel-1.2.la				\
+ 	$(top_builddir)/camel/libcamel-provider-1.2.la
+ 
+diff --git a/libedataserverui/Makefile.am b/libedataserverui/Makefile.am
+index 0337fae..f746165 100644
+--- a/libedataserverui/Makefile.am
++++ b/libedataserverui/Makefile.am
+@@ -98,11 +98,15 @@ TEST_EDATASERVERUI_CPPFLAGS= \
+ if ENABLE_GTK3
+ TEST_EDATASERVERUI_LDFLAGS = \
+ 	libedataserverui-3.0.la 				\
++	$(top_builddir)/camel/libcamel-1.2.la			\
++	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
+ 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
+ 	$(E_DATA_SERVER_UI_LIBS)
+ else
+ TEST_EDATASERVERUI_LDFLAGS = \
+ 	libedataserverui-1.2.la 				\
++	$(top_builddir)/camel/libcamel-1.2.la			\
++	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
+ 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
+ 	$(E_DATA_SERVER_UI_LIBS)
+ endif

=== added file 'debian/patches/02_fix_sources_migration.patch'
--- debian/patches/02_fix_sources_migration.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02_fix_sources_migration.patch	2010-11-25 16:59:29 +0000
@@ -0,0 +1,79 @@
+commit 132709ba897951b7cf080d68cf98262de4c81e5d
+Author: Milan Crha <[e-mail]>
+Date:   Wed Nov 24 13:38:09 2010 +0100
+
+    Bug #632962 - Duplicate "On this computer" sources after update
+
+diff --git a/libedataserver/e-source-group.c b/libedataserver/e-source-group.c
+index 1f70d5e..a0cfe3e 100644
+--- a/libedataserver/e-source-group.c
++++ b/libedataserver/e-source-group.c
+@@ -246,8 +246,10 @@ e_source_group_new (const gchar *name,
+ 	return new;
+ }
+ 
+-ESourceGroup *
+-e_source_group_new_from_xml (const gchar *xml)
++static ESourceGroup *source_group_new_from_xmldoc (xmlDocPtr doc, gboolean can_migrate);
++
++static ESourceGroup *
++source_group_new_from_xml (const gchar *xml, gboolean can_migrate)
+ {
+ 	xmlDocPtr doc;
+ 	ESourceGroup *group;
+@@ -256,14 +258,20 @@ e_source_group_new_from_xml (const gchar *xml)
+ 	if (doc == NULL)
+ 		return NULL;
+ 
+-	group = e_source_group_new_from_xmldoc (doc);
++	group = source_group_new_from_xmldoc (doc, can_migrate);
+ 	xmlFreeDoc (doc);
+ 
+ 	return group;
+ }
+ 
+ ESourceGroup *
+-e_source_group_new_from_xmldoc (xmlDocPtr doc)
++e_source_group_new_from_xml (const gchar *xml)
++{
++	return source_group_new_from_xml (xml, TRUE);
++}
++
++static ESourceGroup *
++source_group_new_from_xmldoc (xmlDocPtr doc, gboolean can_migrate)
+ {
+ 	xmlNodePtr root, p;
+ 	xmlChar *uid;
+@@ -300,7 +308,7 @@ e_source_group_new_from_xmldoc (xmlDocPtr doc)
+ 	 *     directory, but that caused all kinds of portability
+ 	 *     issues so now we just use "local:" and leave the
+ 	 *     absolute file system path implicit. */
+-	if (g_str_has_prefix (GC base_uri, "file:"))
++	if (can_migrate && g_str_has_prefix (GC base_uri, "file:"))
+ 		e_source_group_set_base_uri (new, "local:");
+ 	else
+ 		e_source_group_set_base_uri (new, GC base_uri);
+@@ -339,6 +347,12 @@ e_source_group_new_from_xmldoc (xmlDocPtr doc)
+ 	return new;
+ }
+ 
++ESourceGroup *
++e_source_group_new_from_xmldoc (xmlDocPtr doc)
++{
++	return source_group_new_from_xmldoc (doc, TRUE);
++}
++
+ gboolean
+ e_source_group_update_from_xml (ESourceGroup *group,
+ 				const gchar *xml,
+@@ -896,8 +910,8 @@ e_source_group_xmlstr_equal (const gchar *a, const gchar *b)
+ 	ESourceGroup *grpa, *grpb;
+ 	gboolean retval;
+ 
+-	grpa = e_source_group_new_from_xml (a);
+-	grpb = e_source_group_new_from_xml (b);
++	grpa = source_group_new_from_xml (a, FALSE);
++	grpb = source_group_new_from_xml (b, FALSE);
+ 
+ 	retval = e_source_group_equal (grpa, grpb);
+ 

=== removed file 'debian/patches/107-git-consider-local-inbox-as-inbox.patch'
--- debian/patches/107-git-consider-local-inbox-as-inbox.patch	2010-10-18 14:04:21 +0000
+++ debian/patches/107-git-consider-local-inbox-as-inbox.patch	1970-01-01 00:00:00 +0000
@@ -1,264 +0,0 @@
-From e40d8940d41ca0e2dba197ac015fc7f21d43016b Mon Sep 17 00:00:00 2001
-From: Milan Crha <[e-mail]>
-Date: Thu, 14 Oct 2010 11:05:57 +0000
-Subject: Bug #534369 - New mail notifications for local Inbox don't work
-
----
-diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c
-index fa07e5d..3b7443c 100644
---- a/camel/providers/local/camel-local-folder.c
-+++ b/camel/providers/local/camel-local-folder.c
-@@ -299,7 +299,6 @@ CamelLocalFolder *
- camel_local_folder_construct(CamelLocalFolder *lf, guint32 flags, GError **error)
- {
- 	CamelFolder *folder;
--	CamelFolderInfo *fi;
- 	const gchar *root_dir_path;
- 	gchar *tmp, *statepath;
- #ifndef G_OS_WIN32
-@@ -307,7 +306,6 @@ camel_local_folder_construct(CamelLocalFolder *lf, guint32 flags, GError **error
- 	struct stat st;
- #endif
- 	gint forceindex, len;
--	CamelURL *url;
- 	CamelLocalStore *ls;
- 	CamelStore *parent_store;
- 	const gchar *full_name;
-@@ -409,17 +407,10 @@ camel_local_folder_construct(CamelLocalFolder *lf, guint32 flags, GError **error
- 
- 	/* TODO: This probably shouldn't be here? */
- 	if ((flags & CAMEL_STORE_FOLDER_CREATE) != 0) {
--		url = camel_url_copy (((CamelService *) parent_store)->url);
--		camel_url_set_fragment (url, full_name);
--
--		fi = camel_folder_info_new ();
--		fi->full_name = g_strdup (full_name);
--		fi->name = g_strdup (name);
--		fi->uri = camel_url_to_string (url, 0);
--		fi->unread = camel_folder_get_unread_message_count(folder);
--		fi->flags = CAMEL_FOLDER_NOCHILDREN;
-+		CamelFolderInfo *fi;
- 
--		camel_url_free (url);
-+		fi = camel_store_get_folder_info (parent_store, full_name, 0, NULL);
-+		g_return_val_if_fail (fi != NULL, lf);
- 
- 		camel_store_folder_created (parent_store, fi);
- 		camel_folder_info_free(fi);
-diff --git a/camel/providers/local/camel-local-store.c b/camel/providers/local/camel-local-store.c
-index ddfdb52..6fa3434 100644
---- a/camel/providers/local/camel-local-store.c
-+++ b/camel/providers/local/camel-local-store.c
-@@ -32,6 +32,8 @@
- #include <glib/gi18n-lib.h>
- #include <glib/gstdio.h>
- 
-+#include <libedataserver/e-data-server-util.h>
-+
- #include "camel-local-folder.h"
- #include "camel-local-store.h"
- 
-@@ -110,6 +112,7 @@ construct (CamelService *service,
- 	CamelLocalStore *local_store = CAMEL_LOCAL_STORE (service);
- 	CamelServiceClass *service_class;
- 	gint len;
-+	gchar *local_store_path, *local_store_uri;
- 
- 	/* Chain up to parent's construct() method. */
- 	service_class = CAMEL_SERVICE_CLASS (camel_local_store_parent_class);
-@@ -122,6 +125,24 @@ construct (CamelService *service,
- 	else
- 		local_store->toplevel_dir = g_strdup (service->url->path);
- 
-+	local_store->is_main_store = FALSE;
-+
-+	local_store_path = g_build_filename (e_get_user_data_dir (), "mail", "local", NULL);
-+	local_store_uri = g_filename_to_uri (local_store_path, NULL, NULL);
-+	if (local_store_uri) {
-+		CamelProvider *provider = service->provider;
-+		CamelURL *local_store_url = camel_url_new (local_store_uri, NULL);
-+
-+		camel_url_set_protocol (local_store_url, service->url->protocol);
-+		camel_url_set_host (local_store_url, service->url->host);
-+
-+		local_store->is_main_store = (provider && provider->url_equal) ? provider->url_equal (service->url, local_store_url) : camel_url_equal (service->url, local_store_url);
-+		camel_url_free (local_store_url);
-+	}
-+
-+	g_free (local_store_uri);
-+	g_free (local_store_path);
-+
- 	return TRUE;
- }
- 
-@@ -527,3 +548,31 @@ local_can_refresh_folder (CamelStore *store, CamelFolderInfo *info, GError **err
- 	/* any local folder can be refreshed */
- 	return TRUE;
- }
-+
-+/* Returns whether is this store used as 'On This Computer' main store */
-+gboolean
-+camel_local_store_is_main_store (CamelLocalStore *store)
-+{
-+	g_return_val_if_fail (store != NULL, FALSE);
-+
-+	return store->is_main_store;
-+}
-+
-+guint32
-+camel_local_store_get_folder_type_by_full_name (CamelLocalStore *store, const gchar *full_name)
-+{
-+	g_return_val_if_fail (store != NULL, 0);
-+	g_return_val_if_fail (full_name != NULL, 0);
-+
-+	if (!camel_local_store_is_main_store (store))
-+		return CAMEL_FOLDER_TYPE_NORMAL;
-+
-+	if (g_ascii_strcasecmp (full_name, "Inbox") == 0)
-+		return CAMEL_FOLDER_TYPE_INBOX;
-+	else if (g_ascii_strcasecmp (full_name, "Outbox") == 0)
-+		return CAMEL_FOLDER_TYPE_OUTBOX;
-+	else if (g_ascii_strcasecmp (full_name, "Sent") == 0)
-+		return CAMEL_FOLDER_TYPE_SENT;
-+
-+	return CAMEL_FOLDER_TYPE_NORMAL;
-+}
-diff --git a/camel/providers/local/camel-local-store.h b/camel/providers/local/camel-local-store.h
-index 93f66c0..7198fb9 100644
---- a/camel/providers/local/camel-local-store.h
-+++ b/camel/providers/local/camel-local-store.h
-@@ -53,6 +53,7 @@ struct _CamelLocalStore {
- 	CamelStore parent;
- 
- 	gchar *toplevel_dir;
-+	gboolean is_main_store;
- };
- 
- struct _CamelLocalStoreClass {
-@@ -66,6 +67,9 @@ GType camel_local_store_get_type (void);
- 
- const gchar *camel_local_store_get_toplevel_dir (CamelLocalStore *store);
- 
-+gboolean camel_local_store_is_main_store (CamelLocalStore *store);
-+guint32 camel_local_store_get_folder_type_by_full_name (CamelLocalStore *store, const gchar *full_name);
-+
- #define camel_local_store_get_full_path(ls, name) \
- 	(CAMEL_LOCAL_STORE_GET_CLASS (ls)->get_full_path \
- 	(CAMEL_LOCAL_STORE (ls), (name)))
-diff --git a/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c
-index 3b60c22..7fbf1f3 100644
---- a/camel/providers/local/camel-maildir-store.c
-+++ b/camel/providers/local/camel-maildir-store.c
-@@ -328,7 +328,7 @@ fill_fi (CamelStore *store,
- {
- 	CamelFolder *folder;
- 
--	folder = camel_object_bag_get(store->folders, fi->full_name);
-+	folder = camel_object_bag_peek (store->folders, fi->full_name);
- 
- 	if (folder == NULL
- 	    && (flags & CAMEL_STORE_FOLDER_INFO_FAST) == 0)
-@@ -358,6 +358,11 @@ fill_fi (CamelStore *store,
- 		g_free(folderpath);
- 		g_free(path);
- 	}
-+
-+	if (camel_local_store_is_main_store (CAMEL_LOCAL_STORE (store)) && fi->full_name
-+	    && (fi->flags & CAMEL_FOLDER_TYPE_MASK) == CAMEL_FOLDER_TYPE_NORMAL)
-+		fi->flags = (fi->flags & ~CAMEL_FOLDER_TYPE_MASK)
-+			    | camel_local_store_get_folder_type_by_full_name (CAMEL_LOCAL_STORE (store), fi->full_name);
- }
- 
- struct _scan_node {
-diff --git a/camel/providers/local/camel-mbox-store.c b/camel/providers/local/camel-mbox-store.c
-index c6d9a55..a3d66be 100644
---- a/camel/providers/local/camel-mbox-store.c
-+++ b/camel/providers/local/camel-mbox-store.c
-@@ -650,7 +650,7 @@ fill_fi(CamelStore *store, CamelFolderInfo *fi, guint32 flags)
- 
- 	fi->unread = -1;
- 	fi->total = -1;
--	folder = camel_object_bag_get(store->folders, fi->full_name);
-+	folder = camel_object_bag_peek (store->folders, fi->full_name);
- 	if (folder) {
- 		if ((flags & CAMEL_STORE_FOLDER_INFO_FAST) == 0)
- 			camel_folder_refresh_info(folder, NULL);
-@@ -676,6 +676,11 @@ fill_fi(CamelStore *store, CamelFolderInfo *fi, guint32 flags)
- 		g_free(folderpath);
- 		g_free(path);
- 	}
-+
-+	if (camel_local_store_is_main_store (CAMEL_LOCAL_STORE (store)) && fi->full_name
-+	    && (fi->flags & CAMEL_FOLDER_TYPE_MASK) == CAMEL_FOLDER_TYPE_NORMAL)
-+		fi->flags = (fi->flags & ~CAMEL_FOLDER_TYPE_MASK)
-+			    | camel_local_store_get_folder_type_by_full_name (CAMEL_LOCAL_STORE (store), fi->full_name);
- }
- 
- static CamelFolderInfo *
-@@ -859,14 +864,13 @@ get_folder_info(CamelStore *store, const gchar *top, guint32 flags, GError **err
- 	fi->unread = -1;
- 	fi->total = -1;
- 
-+	fill_fi (store, fi, flags);
-+
- 	subdir = g_strdup_printf("%s.sbd", path);
- 	if (g_stat(subdir, &st) == 0) {
- 		if  (S_ISDIR(st.st_mode))
- 			fi->child = scan_dir (store, url, visited, fi, subdir, top, flags, error);
--		else
--			fill_fi(store, fi, flags);
--	} else
--		fill_fi(store, fi, flags);
-+	}
- 
- 	camel_url_free (url);
- 
-diff --git a/camel/providers/local/camel-mh-store.c b/camel/providers/local/camel-mh-store.c
-index 7ff99bb..2da64d6 100644
---- a/camel/providers/local/camel-mh-store.c
-+++ b/camel/providers/local/camel-mh-store.c
-@@ -328,7 +328,7 @@ fill_fi (CamelStore *store,
- {
- 	CamelFolder *folder;
- 
--	folder = camel_object_bag_get(store->folders, fi->full_name);
-+	folder = camel_object_bag_peek (store->folders, fi->full_name);
- 
- 	if (folder == NULL
- 	    && (flags & CAMEL_STORE_FOLDER_INFO_FAST) == 0)
-@@ -363,6 +363,11 @@ fill_fi (CamelStore *store,
- 		g_free(folderpath);
- 		g_free(path);
- 	}
-+
-+	if (camel_local_store_is_main_store (CAMEL_LOCAL_STORE (store)) && fi->full_name
-+	    && (fi->flags & CAMEL_FOLDER_TYPE_MASK) == CAMEL_FOLDER_TYPE_NORMAL)
-+		fi->flags = (fi->flags & ~CAMEL_FOLDER_TYPE_MASK)
-+			    | camel_local_store_get_folder_type_by_full_name (CAMEL_LOCAL_STORE (store), fi->full_name);
- }
- 
- static CamelFolderInfo *
-diff --git a/camel/providers/local/camel-spool-store.c b/camel/providers/local/camel-spool-store.c
-index a83ce0b..b917f0d 100644
---- a/camel/providers/local/camel-spool-store.c
-+++ b/camel/providers/local/camel-spool-store.c
-@@ -275,7 +275,7 @@ spool_fill_fi (CamelStore *store,
- 
- 	fi->unread = -1;
- 	fi->total = -1;
--	folder = camel_object_bag_get(store->folders, fi->full_name);
-+	folder = camel_object_bag_peek (store->folders, fi->full_name);
- 	if (folder) {
- 		if ((flags & CAMEL_STORE_FOLDER_INFO_FAST) == 0)
- 			camel_folder_refresh_info(folder, NULL);
-@@ -404,7 +404,7 @@ scan_dir (CamelStore *store,
- 				gint isfolder = FALSE;
- 
- 				/* first, see if we already have it open */
--				folder = camel_object_bag_get(store->folders, fname);
-+				folder = camel_object_bag_peek (store->folders, fname);
- 				if (folder == NULL) {
- 					fp = fopen(tmp, "r");
- 					if (fp != NULL) {
---
-cgit v0.8.3.1

=== removed file 'debian/patches/25_mute-debug-messages.patch'
--- debian/patches/25_mute-debug-messages.patch	2010-08-31 09:26:04 +0000
+++ debian/patches/25_mute-debug-messages.patch	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-diff --git a/libedataserver/e-categories.c b/libedataserver/e-categories.c
-index c581efd..277ca50 100644
---- a/libedataserver/e-categories.c
-+++ b/libedataserver/e-categories.c
-@@ -26,6 +26,8 @@
- 
- #include "libedataserver-private.h"
- 
-+#define d(x)
-+
- typedef struct {
- 	gchar *display_name;  /* localized category name */
- 	gchar *clocale_name;  /* only for default categories */
-@@ -204,7 +206,7 @@ idle_saver_cb (gpointer user_data)
- 
- 	filename = build_categories_filename ();
- 
--	g_debug ("Saving categories to \"%s\"", filename);
-+	d (g_debug ("Saving categories to \"%s\"", filename));
- 
- 	/* Build the file contents. */
- 	buffer = g_string_new ("<categories>\n");
-@@ -348,7 +350,7 @@ load_categories (void)
- 	if (!g_file_test (filename, G_FILE_TEST_EXISTS))
- 		goto exit;
- 
--	g_debug ("Loading categories from \"%s\"", filename);
-+	d (g_debug ("Loading categories from \"%s\"", filename));
- 
- 	if (!g_file_get_contents (filename, &contents, &length, &error)) {
- 		g_warning ("Unable to load categories: %s", error->message);
-@@ -404,7 +406,7 @@ migrate_old_categories (void)
- 	if (string == NULL || *string == '\0')
- 		goto exit;
- 
--	g_debug ("Loading categories from GConf key \"%s\"", key);
-+	d (g_debug ("Loading categories from GConf key \"%s\"", key));
- 
- 	n_added = parse_categories (string, strlen (string));
- 	if (n_added == 0)
-@@ -489,20 +491,20 @@ initialize_categories (void)
- 
- 	n_added = load_categories ();
- 	if (n_added > 0) {
--		g_debug ("Loaded %d categories", n_added);
-+		d (g_debug ("Loaded %d categories", n_added));
- 		save_is_pending = FALSE;
- 		return;
- 	}
- 
- 	n_added = migrate_old_categories ();
- 	if (n_added > 0) {
--		g_debug ("Loaded %d categories", n_added);
-+		d (g_debug ("Loaded %d categories", n_added));
- 		save_categories ();
- 		return;
- 	}
- 
- 	load_default_categories ();
--	g_debug ("Loaded default categories");
-+	d (g_debug ("Loaded default categories"));
- 	save_categories ();
- }
- 

=== removed file 'debian/patches/80_git_show_recurrent_event.patch'
--- debian/patches/80_git_show_recurrent_event.patch	2010-11-09 14:04:51 +0000
+++ debian/patches/80_git_show_recurrent_event.patch	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-From f555497c88476812d610c1fbb08f68bf0c9bd5d5 Mon Sep 17 00:00:00 2001
-From: Chenthill Palanisamy <[e-mail]>
-Date: Fri, 22 Oct 2010 08:19:58 +0000
-Subject: Bug 632771 - Recurring calendar events set to recur forever do not display past first week
-
----
-diff --git a/calendar/libecal/e-cal-util.c b/calendar/libecal/e-cal-util.c
-index 0e96504..6ba8f8b 100644
---- a/calendar/libecal/e-cal-util.c
-+++ b/calendar/libecal/e-cal-util.c
-@@ -1273,7 +1273,7 @@ e_cal_util_get_component_occur_times (ECalComponent *comp,
- 				rule_end = e_cal_recur_obtain_enddate (&ir, prop, utc_zone, TRUE);
- 
- 				if (rule_end == -1) /* repeats forever */
--					*end = -1;
-+					*end = _TIME_MAX;
- 				else if (rule_end > *end) /* new maximum */
- 					*end = rule_end;
- 			}
---
-cgit v0.8.3.1

=== removed file 'debian/patches/90-building-on-natty.patch'
--- debian/patches/90-building-on-natty.patch	2010-11-02 00:30:32 +0000
+++ debian/patches/90-building-on-natty.patch	1970-01-01 00:00:00 +0000
@@ -1,109 +0,0 @@
-From: Mathieu Trudel-Lapierre <[e-mail]>
-Subject: Fix build failures on Ubuntu Natty Narwhal.
-Last-Update: 2010-11-01
-
-Index: evolution-data-server-2.32.0/camel/providers/imapx/Makefile.am
-===================================================================
---- evolution-data-server-2.32.0.orig/camel/providers/imapx/Makefile.am	2010-09-13 08:16:52.000000000 -0400
-+++ evolution-data-server-2.32.0/camel/providers/imapx/Makefile.am	2010-11-01 19:16:18.883464001 -0400
-@@ -55,7 +55,8 @@
- test_imapx_SOURCES = test-imapx.c
- test_imapx_LDADD =							\
- 	$(top_builddir)/camel/libcamel-1.2.la				\
--	$(top_builddir)/camel/libcamel-provider-1.2.la
-+	$(top_builddir)/camel/libcamel-provider-1.2.la			\
-+	$(E_OTHER_LIBS)
- 
- BUILT_SOURCES = camel-imapx-tokenise.h
- CLEANFILES = $(BUILT_SOURCES)
-Index: evolution-data-server-2.32.0/configure.ac
-===================================================================
---- evolution-data-server-2.32.0.orig/configure.ac	2010-09-27 06:25:46.000000000 -0400
-+++ evolution-data-server-2.32.0/configure.ac	2010-11-01 19:16:18.883464001 -0400
-@@ -1186,6 +1186,15 @@
- ])
- 
- dnl ******************************
-+dnl extra flags (gcc-4.5)
-+dnl ******************************
-+E_OTHER_DEPS="gobject-2.0 gio-2.0"
-+
-+EVO_SET_COMPILE_FLAGS(E_OTHER, $E_OTHER_DEPS)
-+AC_SUBST(E_OTHER_CFLAGS)
-+AC_SUBST(E_OTHER_LIBS)
-+
-+dnl ******************************
- dnl libedataserver flags
- dnl ******************************
- E_DATA_SERVER_DEPS="gio-2.0 libxml-2.0 libsoup-2.4 gconf-2.0 $mozilla_nspr"
-Index: evolution-data-server-2.32.0/Makefile.in
-===================================================================
---- evolution-data-server-2.32.0.orig/Makefile.in	2010-09-27 07:22:09.000000000 -0400
-+++ evolution-data-server-2.32.0/Makefile.in	2010-11-01 19:16:18.883464001 -0400
-@@ -199,6 +199,8 @@
- E_DATA_SERVER_LIBS = @E_DATA_SERVER_LIBS@
- E_DATA_SERVER_UI_CFLAGS = @E_DATA_SERVER_UI_CFLAGS@
- E_DATA_SERVER_UI_LIBS = @E_DATA_SERVER_UI_LIBS@
-+E_OTHER_CFLAGS = @E_OTHER_CFLAGS@
-+E_OTHER_LIBS = @E_OTHER_LIBS@
- FGREP = @FGREP@
- GCONFTOOL = @GCONFTOOL@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-Index: evolution-data-server-2.32.0/addressbook/libedata-book/Makefile.am
-===================================================================
---- evolution-data-server-2.32.0.orig/addressbook/libedata-book/Makefile.am	2010-09-13 08:16:52.000000000 -0400
-+++ evolution-data-server-2.32.0/addressbook/libedata-book/Makefile.am	2010-11-01 19:16:18.883464001 -0400
-@@ -83,7 +83,8 @@
- e_addressbook_factory_LDADD =					\
- 	libedata-book-1.2.la					\
- 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
--	$(top_builddir)/libebackend/libebackend-1.2.la
-+	$(top_builddir)/libebackend/libebackend-1.2.la		\
-+	$(E_OTHER_LIBS)
- 
- %-$(API_VERSION).pc: %.pc
- 	 cp $< $@
-Index: evolution-data-server-2.32.0/calendar/libedata-cal/Makefile.am
-===================================================================
---- evolution-data-server-2.32.0.orig/calendar/libedata-cal/Makefile.am	2010-09-13 08:16:52.000000000 -0400
-+++ evolution-data-server-2.32.0/calendar/libedata-cal/Makefile.am	2010-11-01 19:16:18.883464001 -0400
-@@ -112,6 +112,7 @@
- 
- e_calendar_factory_LDADD =						\
- 	$(top_builddir)/calendar/libegdbus/libegdbus-cal.la		\
-+	$(top_builddir)/calendar/libecal/libecal-1.2.la		\
- 	libedata-cal-1.2.la						\
- 	$(top_builddir)/libedataserver/libedataserver-1.2.la 		\
- 	$(top_builddir)/libebackend/libebackend-1.2.la
-@@ -130,7 +131,8 @@
- 	libedata-cal-1.2.la 							\
- 	$(top_builddir)/calendar/libecal/libecal-1.2.la 			\
- 	$(top_builddir)/libedataserver/libedataserver-1.2.la			\
--	$(E_DATA_SERVER_LIBS)
-+	$(E_DATA_SERVER_LIBS)							\
-+	$(EVOLUTION_CALENDAR_LIBS)
- 
- test_intervaltree_SOURCES = test-intervaltree.c e-cal-backend-intervaltree.c
- 
-Index: evolution-data-server-2.32.0/libedataserverui/Makefile.am
-===================================================================
---- evolution-data-server-2.32.0.orig/libedataserverui/Makefile.am	2010-09-13 08:16:52.000000000 -0400
-+++ evolution-data-server-2.32.0/libedataserverui/Makefile.am	2010-11-01 19:17:56.423464019 -0400
-@@ -122,11 +122,15 @@
- 
- test_contact_store_CPPFLAGS = $(TEST_EDATASERVERUI_CPPFLAGS)
- test_contact_store_SOURCES = test-contact-store.c
--test_contact_store_LDADD = $(TEST_EDATASERVERUI_LDFLAGS)
-+test_contact_store_LDADD =						\
-+	$(TEST_EDATASERVERUI_LDFLAGS)					\
-+	$(top_builddir)/addressbook/libebook/libebook-1.2.la
- 
- test_name_selector_CPPFLAGS = $(TEST_EDATASERVERUI_CPPFLAGS)
- test_name_selector_SOURCES = test-name-selector.c
--test_name_selector_LDADD = $(TEST_EDATASERVERUI_LDFLAGS)
-+test_name_selector_LDADD =			\
-+	$(TEST_EDATASERVERUI_LDFLAGS)		\
-+	$(top_builddir)/camel/libcamel-1.2.la
- 
- %-$(LIBEDATASERVERUI_API_VERSION).pc: %.pc
- 	 cp $< $@

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-11-23 18:19:44 +0000
+++ debian/patches/series	2010-11-25 16:59:29 +0000
@@ -1,5 +1,3 @@
-25_mute-debug-messages.patch
-80_git_show_recurrent_event.patch
-90-building-on-natty.patch
-107-git-consider-local-inbox-as-inbox.patch
+01_various_linking_issues.patch
+02_fix_sources_migration.patch
 108-git-build-against-gtk-2.91.patch