diff -Nru evolution-3.2.3/debian/changelog evolution-3.2.3/debian/changelog --- evolution-3.2.3/debian/changelog 2012-01-12 12:09:07.000000000 +0000 +++ evolution-3.2.3/debian/changelog 2012-02-27 15:00:47.000000000 +0000 @@ -1,3 +1,18 @@ +evolution (3.2.3-0ubuntu3) precise; urgency=low + + * Rebuild with new pkgbinarymangler. (LP: #913085) + * debian/control: + - drop the Build-Depends on evolution from evolution-dev. + - replace gnome-icon-theme with gnome-icon-theme-full in Depends for + evolution. (LP: #922329) + * debian/patches/git_edit_as_new_from_addr_3dc8b0b.patch: correct the From: + address used for "Edit as New Message" to match with the e-mail address + for the account the original message was received on. (LP: #924356) + * debian/patches/gmodule-linking.patch: fix up linking against gmodule-2.0, + it now needs to be explicitly added. + + -- Mathieu Trudel-Lapierre Mon, 27 Feb 2012 10:00:32 -0500 + evolution (3.2.3-0ubuntu2) precise; urgency=low * debian/control, debian/rules: disable clutter and remove the Build-Depends diff -Nru evolution-3.2.3/debian/control evolution-3.2.3/debian/control --- evolution-3.2.3/debian/control 2012-01-12 12:09:07.000000000 +0000 +++ evolution-3.2.3/debian/control 2012-02-27 15:00:47.000000000 +0000 @@ -78,7 +78,7 @@ evolution-common (= ${source:Version}), evolution-data-server (>= 3.2), evolution-data-server (<< 3.3), - gnome-icon-theme (>= 2.30.2.1), + gnome-icon-theme-full, dbus, psmisc Pre-Depends: debconf (>= 1.4.69) | debconf-2.0 @@ -146,8 +146,7 @@ Package: evolution-dev Section: devel Architecture: any -Depends: evolution (= ${binary:Version}), - ${misc:Depends}, +Depends: ${misc:Depends}, ${shlibs:Depends}, # evolution-plugin libxml2-dev, diff -Nru evolution-3.2.3/debian/patches/git_edit_as_new_from_addr_3dc8b0b.patch evolution-3.2.3/debian/patches/git_edit_as_new_from_addr_3dc8b0b.patch --- evolution-3.2.3/debian/patches/git_edit_as_new_from_addr_3dc8b0b.patch 1970-01-01 00:00:00.000000000 +0000 +++ evolution-3.2.3/debian/patches/git_edit_as_new_from_addr_3dc8b0b.patch 2012-02-27 15:00:47.000000000 +0000 @@ -0,0 +1,43 @@ +From 3dc8b0b52200b236e6f44450ca7913c52b83f85a Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Mon, 30 Jan 2012 13:33:50 +0000 +Subject: Bug #651221 - "Edit as New Message" always uses default From: address + +--- +diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c +index fdd3322..3dd93c1 100644 +--- a/mail/em-composer-utils.c ++++ b/mail/em-composer-utils.c +@@ -1299,6 +1299,30 @@ em_utils_edit_message (EShell *shell, + } + + composer = e_msg_composer_new_with_message (shell, message, NULL); ++ if (folder && !folder_is_templates) { ++ EComposerHeaderTable *table; ++ EAccount *account; ++ CamelStore *store; ++ const gchar *uid; ++ gchar *folder_uri; ++ GList *list; ++ ++ table = e_msg_composer_get_header_table (composer); ++ ++ store = camel_folder_get_parent_store (folder); ++ uid = camel_service_get_uid (CAMEL_SERVICE (store)); ++ account = e_get_account_by_uid (uid); ++ ++ folder_uri = e_mail_folder_uri_from_folder (folder); ++ ++ list = g_list_prepend (NULL, folder_uri); ++ e_composer_header_table_set_post_to_list (table, list); ++ g_list_free (list); ++ ++ g_free (folder_uri); ++ ++ e_composer_header_table_set_account (table, account); ++ } + + e_msg_composer_remove_header ( + composer, "X-Evolution-Replace-Outbox-UID"); +-- +cgit v0.9.0.2 diff -Nru evolution-3.2.3/debian/patches/gmodule-linking.patch evolution-3.2.3/debian/patches/gmodule-linking.patch --- evolution-3.2.3/debian/patches/gmodule-linking.patch 1970-01-01 00:00:00.000000000 +0000 +++ evolution-3.2.3/debian/patches/gmodule-linking.patch 2012-02-27 15:00:47.000000000 +0000 @@ -0,0 +1,38 @@ +From d459b0885f427588ff5d45c84065a1534034d966 Mon Sep 17 00:00:00 2001 +From: Christophe Fergeau +Date: Tue, 13 Dec 2011 14:09:05 +0000 +Subject: Bug 665782 - configure.ac: Add gmodule-2.0 to GNOME_PLATFORM + +--- +Index: evolution-3.2.3/configure.ac +=================================================================== +--- evolution-3.2.3.orig/configure.ac 2012-02-27 09:59:25.825688527 -0500 ++++ evolution-3.2.3/configure.ac 2012-02-27 09:59:25.877688526 -0500 +@@ -238,6 +238,7 @@ + dnl ********************************** + PKG_CHECK_MODULES([GNOME_PLATFORM], + [gio-2.0 >= glib_minimum_version ++ gmodule-2.0 >= glib_minimum_version + cairo-gobject + launchpad-integration-3.0 + gtk+-3.0 >= gtk_minimum_version +Index: evolution-3.2.3/modules/plugin-lib/Makefile.am +=================================================================== +--- evolution-3.2.3.orig/modules/plugin-lib/Makefile.am 2011-09-27 18:03:29.000000000 -0400 ++++ evolution-3.2.3/modules/plugin-lib/Makefile.am 2012-02-27 10:00:18.405686184 -0500 +@@ -5,6 +5,7 @@ + -DG_LOG_DOMAIN=\"evolution-plugin-lib\" \ + -I$(top_srcdir) \ + -DEVOLUTION_PREFIX=\""$(prefix)"\" \ ++ $(GNOME_PLATFORM_CFLAGS) \ + $(E_UTIL_CFLAGS) + + libevolution_module_plugin_lib_la_SOURCES = \ +@@ -14,6 +15,7 @@ + + libevolution_module_plugin_lib_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ ++ $(GNOME_PLATFORM_LIBS) \ + $(E_UTIL_LIBS) + + libevolution_module_plugin_lib_la_LDFLAGS = \ diff -Nru evolution-3.2.3/debian/patches/series evolution-3.2.3/debian/patches/series --- evolution-3.2.3/debian/patches/series 2012-01-12 12:09:07.000000000 +0000 +++ evolution-3.2.3/debian/patches/series 2012-02-27 15:00:47.000000000 +0000 @@ -17,3 +17,5 @@ spamd_sbin_path.patch 99git_remove_g_thread_init_09c88ab.patch nss-paths.patch +git_edit_as_new_from_addr_3dc8b0b.patch +gmodule-linking.patch