diff -Nru evolution-data-server-3.5.5/debian/changelog evolution-data-server-3.5.5/debian/changelog --- evolution-data-server-3.5.5/debian/changelog 2012-08-06 17:45:54.000000000 +0100 +++ evolution-data-server-3.5.5/debian/changelog 2012-08-17 17:02:37.000000000 +0100 @@ -1,3 +1,15 @@ +evolution-data-server (3.5.5-0ubuntu2) quantal; urgency=low + + * libedataserver-1.2-17 depends on evolution-data-server-common, as + it uses the gsettings schema + - update debian/control + * Lack of evolution-data-server shouldn't be fatal + - add debian/patches/dont_depend_on_eds.patch + - update debian/patches/series + * Fixes LP: #1038047 + + -- Chris Coulson Fri, 17 Aug 2012 15:59:08 +0100 + evolution-data-server (3.5.5-0ubuntu1) quantal; urgency=low * New upstream release. diff -Nru evolution-data-server-3.5.5/debian/control evolution-data-server-3.5.5/debian/control --- evolution-data-server-3.5.5/debian/control 2012-08-06 16:51:48.000000000 +0100 +++ evolution-data-server-3.5.5/debian/control 2012-08-17 17:11:19.000000000 +0100 @@ -138,7 +138,8 @@ Package: libedataserver-1.2-17 Section: libs Architecture: any -Depends: ${shlibs:Depends}, +Depends: evolution-data-server-common (= ${source:Version}), + ${shlibs:Depends}, ${misc:Depends} Description: Utility library for evolution data servers The data server, called "Evolution Data Server" is responsible for managing diff -Nru evolution-data-server-3.5.5/debian/patches/dont_depend_on_eds.patch evolution-data-server-3.5.5/debian/patches/dont_depend_on_eds.patch --- evolution-data-server-3.5.5/debian/patches/dont_depend_on_eds.patch 1970-01-01 01:00:00.000000000 +0100 +++ evolution-data-server-3.5.5/debian/patches/dont_depend_on_eds.patch 2012-08-17 17:09:17.000000000 +0100 @@ -0,0 +1,123 @@ +Index: evolution-data-server-3.5.5/libedataserver/e-source-registry.c +=================================================================== +--- evolution-data-server-3.5.5.orig/libedataserver/e-source-registry.c 2012-08-05 21:46:39.000000000 +0100 ++++ evolution-data-server-3.5.5/libedataserver/e-source-registry.c 2012-08-17 17:09:15.541024692 +0100 +@@ -727,39 +727,50 @@ + DBUS_OBJECT_PATH, + NULL, &error); + +- /* If this fails there's really no point in continuing +- * since we rely on the object manager to populate the +- * registry. Abort the process with a fatal error. */ + if (error != NULL) { +- g_error ("%s", error->message); +- g_assert_not_reached (); ++ g_warning ("%s", error->message); ++ g_error_free (error); + } + +- /* Give the registry a handle to the object manager. */ +- closure->registry->priv->dbus_object_manager = +- g_object_ref (object_manager); ++ if (object_manager != NULL) { ++ /* Give the registry a handle to the object manager. */ ++ closure->registry->priv->dbus_object_manager = ++ g_object_ref (object_manager); + +- /* Now populate the registry with an initial set of ESources. */ ++ /* Now populate the registry with an initial set of ESources. */ + +- list = g_dbus_object_manager_get_objects (object_manager); ++ list = g_dbus_object_manager_get_objects (object_manager); + +- for (link = list; link != NULL; link = g_list_next (link)) { +- GDBusObject *dbus_object; +- ESource *source; ++ for (link = list; link != NULL; link = g_list_next (link)) { ++ GDBusObject *dbus_object; ++ ESource *source; + +- dbus_object = G_DBUS_OBJECT (link->data); ++ dbus_object = G_DBUS_OBJECT (link->data); + +- source = source_registry_new_source ( +- closure->registry, dbus_object); ++ source = source_registry_new_source ( ++ closure->registry, dbus_object); + +- if (source != NULL) { +- source_registry_add_source ( +- closure->registry, source); +- g_object_unref (source); ++ if (source != NULL) { ++ source_registry_add_source ( ++ closure->registry, source); ++ g_object_unref (source); ++ } + } +- } + +- g_list_free_full (list, (GDestroyNotify) g_object_unref); ++ g_list_free_full (list, (GDestroyNotify) g_object_unref); ++ ++ /* Listen for D-Bus object additions and removals. */ ++ ++ object_added_id = g_signal_connect ( ++ object_manager, "object-added", ++ G_CALLBACK (source_registry_object_added_cb), ++ closure->registry); ++ ++ object_removed_id = g_signal_connect ( ++ object_manager, "object-removed", ++ G_CALLBACK (source_registry_object_removed_cb), ++ closure->registry); ++ } + + /* Schedule a one-time idle callback to broadcast through a + * condition variable that our main loop is up and running. */ +@@ -772,28 +783,18 @@ + g_source_attach (idle_source, closure->main_context); + g_source_unref (idle_source); + +- /* Listen for D-Bus object additions and removals. */ +- +- object_added_id = g_signal_connect ( +- object_manager, "object-added", +- G_CALLBACK (source_registry_object_added_cb), +- closure->registry); +- +- object_removed_id = g_signal_connect ( +- object_manager, "object-removed", +- G_CALLBACK (source_registry_object_removed_cb), +- closure->registry); +- + /* Now we mostly idle here for the rest of the session. */ + + g_main_loop_run (closure->main_loop); + + /* Clean up and exit. */ + +- g_signal_handler_disconnect (object_manager, object_added_id); +- g_signal_handler_disconnect (object_manager, object_removed_id); ++ if (object_manager != NULL) { ++ g_signal_handler_disconnect (object_manager, object_added_id); ++ g_signal_handler_disconnect (object_manager, object_removed_id); + +- g_object_unref (object_manager); ++ g_object_unref (object_manager); ++ } + + g_main_context_pop_thread_default (closure->main_context); + +@@ -1000,9 +1001,8 @@ + g_mutex_unlock (closure->main_loop_mutex); + + /* We should now have a GDBusObjectManagerClient available. */ +- g_return_val_if_fail ( +- G_IS_DBUS_OBJECT_MANAGER_CLIENT ( +- registry->priv->dbus_object_manager), FALSE); ++ if (registry->priv->dbus_object_manager == NULL) ++ return FALSE; + + /* The registry should now be populated with sources. */ + g_warn_if_fail (g_hash_table_size (registry->priv->sources) > 0); diff -Nru evolution-data-server-3.5.5/debian/patches/series evolution-data-server-3.5.5/debian/patches/series --- evolution-data-server-3.5.5/debian/patches/series 2012-08-06 16:34:08.000000000 +0100 +++ evolution-data-server-3.5.5/debian/patches/series 2012-08-17 15:59:22.000000000 +0100 @@ -1,2 +1,3 @@ 20_gettext_intltool.patch google_tests_fpic.patch +dont_depend_on_eds.patch