diff -u evolution-data-server-1.12.1/debian/changelog evolution-data-server-1.12.1/debian/changelog
--- evolution-data-server-1.12.1/debian/changelog
+++ evolution-data-server-1.12.1/debian/changelog
@@ -1,3 +1,11 @@
+evolution-data-server (1.12.1-0ubuntu2) gutsy-proposed; urgency=low
+
+  * debian/patches/90_from_svn_fix_addressbook_crasher.patch:
+    - patch from SVN, fix addressbook crash when searching contacts
+      (LP: #135471)
+
+ -- Sebastien Bacher <seb128@canonical.com>  Tue, 08 Jan 2008 20:50:09 +0100
+
 evolution-data-server (1.12.1-0ubuntu1) gutsy-proposed; urgency=low
 
   * New upstream version:
only in patch2:
unchanged:
--- evolution-data-server-1.12.1.orig/debian/patches/90_from_svn_fix_addressbook_crasher.patch
+++ evolution-data-server-1.12.1/debian/patches/90_from_svn_fix_addressbook_crasher.patch
@@ -0,0 +1,41 @@
+--- branches/gnome-2-20/addressbook/backends/file/e-book-backend-file.c	2007/10/29 02:12:56	8157
++++ branches/gnome-2-20/addressbook/backends/file/e-book-backend-file.c	2007/10/29 07:07:55	8161
+@@ -580,7 +580,6 @@
+ 
+ 			if (db_error == 0) {
+ 				e_data_book_view_notify_update_prefiltered_vcard (book_view, id, vcard_dbt.data);
+-				g_free (vcard_dbt.data);
+ 			}
+ 			else {
+ 				g_warning (G_STRLOC ": db->get failed with %s", db_strerror (db_error));
+@@ -612,7 +611,6 @@
+ 						e_data_book_view_notify_update_prefiltered_vcard (book_view, id_dbt.data, vcard_dbt.data);
+ 					else
+ 						e_data_book_view_notify_update_vcard (book_view, vcard_dbt.data);
+-					g_free (vcard_dbt.data);
+ 				} else {
+ 					g_free (vcard_dbt.data);
+ 				}
+--- branches/gnome-2-20/addressbook/libedata-book/e-data-book-view.c	2007/10/29 02:12:56	8157
++++ branches/gnome-2-20/addressbook/libedata-book/e-data-book-view.c	2007/10/29 02:15:59	8158
+@@ -320,11 +320,9 @@
+ 	} else {
+ 		if (currently_in_view)
+ 			notify_remove (book_view, id);
+-		else
+-			/* else nothing; we're removing a card that wasn't there */
+-			free (vcard);
+ 	}
+ 	
++	g_free (vcard);
+ 	g_object_unref (contact);
+ 	g_mutex_unlock (book_view->priv->pending_mutex);
+ }
+@@ -364,6 +362,7 @@
+ 	else
+ 		notify_add (book_view, id, vcard);
+ 
++	g_free (vcard);
+ 	g_mutex_unlock (book_view->priv->pending_mutex);
+ }
+