diff -Nru evolution-exchange-3.2.1/debian/changelog evolution-exchange-3.2.1/debian/changelog
--- evolution-exchange-3.2.1/debian/changelog	2012-04-12 17:21:56.000000000 +0000
+++ evolution-exchange-3.2.1/debian/changelog	2012-04-13 06:32:44.000000000 +0000
@@ -1,3 +1,12 @@
+evolution-exchange (3.2.1-2ubuntu3) precise; urgency=low
+
+  * Drop gettext_support_menu_items.patch again.
+    e_action_group_add_actions_localized() is defined nowhere, so this can't
+    possibly work. This was apparently uploaded without any testing. Fixes
+    FTBFS.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 13 Apr 2012 08:31:54 +0200
+
 evolution-exchange (3.2.1-2ubuntu2) precise; urgency=low
 
   * debian/patches/gettext_support_menu_items.patch
diff -Nru evolution-exchange-3.2.1/debian/patches/gettext_support_menu_items.patch evolution-exchange-3.2.1/debian/patches/gettext_support_menu_items.patch
--- evolution-exchange-3.2.1/debian/patches/gettext_support_menu_items.patch	2012-04-12 17:22:09.000000000 +0000
+++ evolution-exchange-3.2.1/debian/patches/gettext_support_menu_items.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,411 +0,0 @@
-Author: Milan Crha <mcrha@redhat.com>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/911269
-Origin: http://git.gnome.org/browse/evolution-exchange/commit/?id=a78cf5169ed46f5d53412290dbb3fe862f201500
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=667185
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/911269
-Forwarded: no
-Reviewed-By: Milan Crha <mcrha@redhat.com>
-Last-Update: 2012-03-28
-
---- evolution-exchange-3.2.1.orig/eplugin/exchange-delegates.c
-+++ evolution-exchange-3.2.1/eplugin/exchange-delegates.c
-@@ -28,6 +28,8 @@
- #include <config.h>
- #endif
- 
-+#include <glib/gi18n-lib.h>
-+
- #include <string.h>
- 
- #include "exchange-delegates.h"
---- evolution-exchange-3.2.1.orig/eplugin/exchange-contacts.c
-+++ evolution-exchange-3.2.1/eplugin/exchange-contacts.c
-@@ -20,6 +20,12 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#include <glib/gi18n-lib.h>
-+
- #include <string.h>
- #include <gtk/gtk.h>
- #include <e-util/e-config.h>
---- evolution-exchange-3.2.1.orig/eplugin/exchange-account-setup.c
-+++ evolution-exchange-3.2.1/eplugin/exchange-account-setup.c
-@@ -21,7 +21,7 @@
-  */
- 
- #ifdef HAVE_CONFIG_H
--#include "config.h"
-+#include <config.h>
- #endif
- 
- #include "libedataserver/e-account.h"
-@@ -31,7 +31,7 @@
- #include <unistd.h>
- #include <sys/stat.h>
- #include <gtk/gtk.h>
--#include <glib/gi18n.h>
-+#include <glib/gi18n-lib.h>
- #include <gconf/gconf-client.h>
- #include <e-util/e-dialog-utils.h>
- #include <e2k-validate.h>
---- evolution-exchange-3.2.1.orig/eplugin/exchange-user-dialog.c
-+++ evolution-exchange-3.2.1/eplugin/exchange-user-dialog.c
-@@ -19,6 +19,8 @@
- #include <config.h>
- #endif
- 
-+#include <glib/gi18n-lib.h>
-+
- #include "exchange-user-dialog.h"
- #include "e2k-types.h"
- 
---- evolution-exchange-3.2.1.orig/eplugin/exchange-operations.c
-+++ evolution-exchange-3.2.1/eplugin/exchange-operations.c
-@@ -20,8 +20,12 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <string.h>
--#include <glib/gi18n.h>
-+#include <glib/gi18n-lib.h>
- 
- #include "exchange-operations.h"
- #include <e-folder-exchange.h>
---- evolution-exchange-3.2.1.orig/eplugin/exchange-folder.c
-+++ evolution-exchange-3.2.1/eplugin/exchange-folder.c
-@@ -21,10 +21,10 @@
-  */
- 
- #ifdef HAVE_CONFIG_H
--#include "config.h"
-+#include <config.h>
- #endif
- 
--#include <glib/gi18n.h>
-+#include <glib/gi18n-lib.h>
- #include <gtk/gtk.h>
- #include <gconf/gconf-client.h>
- #include <e-folder-exchange.h>
---- evolution-exchange-3.2.1.orig/eplugin/exchange-mail-send-options.c
-+++ evolution-exchange-3.2.1/eplugin/exchange-mail-send-options.c
-@@ -20,13 +20,18 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <string.h>
- #include <stdio.h>
- 
- #include <glib.h>
--#include <glib/gi18n.h>
-+#include <glib/gi18n-lib.h>
- 
- #include "mail/em-event.h"
-+#include <e-util/e-util.h>
- 
- #include "composer/e-msg-composer.h"
- #include "composer/e-composer-from-header.h"
-@@ -236,8 +241,8 @@ eex_ui_composer_actions (GtkUIManager *m
- 	editor = GTKHTML_EDITOR (composer);
- 
- 	/* Add actions to the "composer" action group. */
--	gtk_action_group_add_actions (
--		gtkhtml_editor_get_action_group (editor, "composer"),
-+	e_action_group_add_actions_localized (
-+		gtkhtml_editor_get_action_group (editor, "composer"), GETTEXT_PACKAGE,
- 		entries, G_N_ELEMENTS (entries), composer);
- 
- 	headers = e_msg_composer_get_header_table (composer);
---- evolution-exchange-3.2.1.orig/eplugin/exchange-config-listener.c
-+++ evolution-exchange-3.2.1/eplugin/exchange-config-listener.c
-@@ -23,6 +23,8 @@
- #include <config.h>
- #endif
- 
-+#include <glib/gi18n-lib.h>
-+
- #include <gtk/gtk.h>
- #include <gdk/gdkkeysyms.h>
- 
---- evolution-exchange-3.2.1.orig/eplugin/exchange-folder-permission.c
-+++ evolution-exchange-3.2.1/eplugin/exchange-folder-permission.c
-@@ -22,10 +22,10 @@
-  */
- 
- #ifdef HAVE_CONFIG_H
--#include "config.h"
-+#include <config.h>
- #endif
- 
--#include <glib/gi18n.h>
-+#include <glib/gi18n-lib.h>
- #include <gtk/gtk.h>
- #include <gconf/gconf-client.h>
- 
-@@ -35,6 +35,7 @@
- #include <exchange-account.h>
- 
- #include <e-util/e-dialog-utils.h>
-+#include <e-util/e-util.h>
- #include <calendar/gui/e-cal-model.h>
- 
- #include <shell/e-shell-view.h>
-@@ -309,8 +310,8 @@ eex_ui_mail_init (GtkUIManager *ui_manag
- 
- 	shell_window = e_shell_view_get_shell_window (shell_view);
- 
--	gtk_action_group_add_actions (
--		e_shell_window_get_action_group (shell_window, "mail"),
-+	e_action_group_add_actions_localized (
-+		e_shell_window_get_action_group (shell_window, "mail"), GETTEXT_PACKAGE,
- 		mail_entries, G_N_ELEMENTS (mail_entries), shell_view);
- 
- 	g_signal_connect (shell_view, "update-actions", G_CALLBACK (update_mail_entries_cb), NULL);
-@@ -472,8 +473,8 @@ setup_source_actions (EShellView *shell_
- 
- 	shell_window = e_shell_view_get_shell_window (shell_view);
- 
--	gtk_action_group_add_actions (
--		e_shell_window_get_action_group (shell_window, group),
-+	e_action_group_add_actions_localized (
-+		e_shell_window_get_action_group (shell_window, group), GETTEXT_PACKAGE,
- 		entries, NUM_ENTRIES, shell_view);
- 
- 	g_signal_connect (shell_view, "update-actions", G_CALLBACK (update_source_entries_cb), entries);
---- evolution-exchange-3.2.1.orig/eplugin/exchange-delegates-user.c
-+++ evolution-exchange-3.2.1/eplugin/exchange-delegates-user.c
-@@ -25,6 +25,8 @@
- #include <config.h>
- #endif
- 
-+#include <glib/gi18n-lib.h>
-+
- #include "exchange-delegates.h"
- #include "exchange-delegates-user.h"
- 
---- evolution-exchange-3.2.1.orig/eplugin/exchange-folder-size-display.c
-+++ evolution-exchange-3.2.1/eplugin/exchange-folder-size-display.c
-@@ -27,7 +27,7 @@
- 
- #include <string.h>
- 
--#include <glib/gi18n.h>
-+#include <glib/gi18n-lib.h>
- #include <e-util/e-dialog-utils.h>
- #include "exchange-folder-size-display.h"
- 
---- evolution-exchange-3.2.1.orig/eplugin/exchange-change-password.c
-+++ evolution-exchange-3.2.1/eplugin/exchange-change-password.c
-@@ -24,6 +24,8 @@
- #include <config.h>
- #endif
- 
-+#include <glib/gi18n-lib.h>
-+
- #include "exchange-change-password.h"
- 
- #include <exchange-account.h>
---- evolution-exchange-3.2.1.orig/eplugin/exchange-permissions-dialog.c
-+++ evolution-exchange-3.2.1/eplugin/exchange-permissions-dialog.c
-@@ -23,6 +23,8 @@
- #include <config.h>
- #endif
- 
-+#include <glib/gi18n-lib.h>
-+
- #include "exchange-permissions-dialog.h"
- #include "exchange-hierarchy.h"
- #include "exchange-user-dialog.h"
---- evolution-exchange-3.2.1.orig/eplugin/exchange-folder-subscription.c
-+++ evolution-exchange-3.2.1/eplugin/exchange-folder-subscription.c
-@@ -25,6 +25,8 @@
- #include "config.h"
- #endif
- 
-+#include <glib/gi18n-lib.h>
-+
- #include <gtk/gtk.h>
- #include <e-util/e-alert-dialog.h>
- #include <e-folder.h>
---- evolution-exchange-3.2.1.orig/eplugin/exchange-send-options.c
-+++ evolution-exchange-3.2.1/eplugin/exchange-send-options.c
-@@ -24,6 +24,8 @@
- #include <config.h>
- #endif
- 
-+#include <glib/gi18n-lib.h>
-+
- #include <string.h>
- #include <libedataserverui/e-name-selector.h>
- #include <libedataserverui/e-contact-store.h>
---- evolution-exchange-3.2.1.orig/eplugin/exchange-calendar.c
-+++ evolution-exchange-3.2.1/eplugin/exchange-calendar.c
-@@ -20,6 +20,12 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#include <glib/gi18n-lib.h>
-+
- #include <string.h>
- #include <gtk/gtk.h>
- #include <e-util/e-config.h>
---- evolution-exchange-3.2.1.orig/server/storage/exchange-account.c
-+++ evolution-exchange-3.2.1/server/storage/exchange-account.c
-@@ -25,6 +25,8 @@
- #include <config.h>
- #endif
- 
-+#include <glib/gi18n-lib.h>
-+
- #include "camel-exchange-settings.h"
- #include "exchange-account.h"
- #include "exchange-hierarchy-webdav.h"
---- evolution-exchange-3.2.1.orig/server/storage/exchange-hierarchy-foreign.c
-+++ evolution-exchange-3.2.1/server/storage/exchange-hierarchy-foreign.c
-@@ -31,6 +31,7 @@
- 
- #include <glib.h>
- #include <glib/gstdio.h>
-+#include <glib/gi18n-lib.h>
- 
- #include "libedataserver/e-source-list.h"
- #include "libedataserver/e-xml-hash-utils.h"
---- evolution-exchange-3.2.1.orig/server/lib/e2k-types.h
-+++ evolution-exchange-3.2.1/server/lib/e2k-types.h
-@@ -5,7 +5,6 @@
- #define __E2K_TYPES_H__
- 
- #include <glib.h>
--#include <glib/gi18n.h>
- 
- typedef struct _E2kAction                     E2kAction;
- typedef struct _E2kAddrEntry                  E2kAddrEntry;
---- evolution-exchange-3.2.1.orig/server/lib/e2k-sid.c
-+++ evolution-exchange-3.2.1/server/lib/e2k-sid.c
-@@ -21,6 +21,8 @@
- #include "config.h"
- #endif
- 
-+#include <glib/gi18n-lib.h>
-+
- #include "e2k-sid.h"
- 
- #include <stdlib.h>
---- evolution-exchange-3.2.1.orig/server/lib/e2k-security-descriptor.c
-+++ evolution-exchange-3.2.1/server/lib/e2k-security-descriptor.c
-@@ -21,6 +21,8 @@
- #include "config.h"
- #endif
- 
-+#include <glib/gi18n-lib.h>
-+
- #include "e2k-security-descriptor.h"
- #include "e2k-sid.h"
- 
---- evolution-exchange-3.2.1.orig/server/lib/e2k-autoconfig.c
-+++ evolution-exchange-3.2.1/server/lib/e2k-autoconfig.c
-@@ -39,6 +39,7 @@
- #include <unistd.h>
- #include <glib.h>
- #include <glib/gstdio.h>
-+#include <glib/gi18n-lib.h>
- 
- #ifndef G_OS_WIN32
- #include <netinet/in.h>
---- evolution-exchange-3.2.1.orig/tools/ximian-connector-setup.c
-+++ evolution-exchange-3.2.1/tools/ximian-connector-setup.c
-@@ -21,6 +21,8 @@
- #include <config.h>
- #endif
- 
-+#include <glib/gi18n.h>
-+
- #include <gtk/gtk.h>
- #include <libedataserverui/e-passwords.h>
- 
---- evolution-exchange-3.2.1.orig/tools/exchange-autoconfig-wizard.c
-+++ evolution-exchange-3.2.1/tools/exchange-autoconfig-wizard.c
-@@ -23,6 +23,8 @@
- #include <config.h>
- #endif
- 
-+#include <glib/gi18n.h>
-+
- #include <string.h>
- 
- #include "e2k-autoconfig.h"
---- evolution-exchange-3.2.1.orig/addressbook/e-book-backend-exchange.c
-+++ evolution-exchange-3.2.1/addressbook/e-book-backend-exchange.c
-@@ -21,6 +21,8 @@
- #include <config.h>
- #endif
- 
-+#include <glib/gi18n-lib.h>
-+
- #include <fcntl.h>
- #include <time.h>
- #include <ctype.h>
---- evolution-exchange-3.2.1.orig/addressbook/e-book-backend-gal.c
-+++ evolution-exchange-3.2.1/addressbook/e-book-backend-gal.c
-@@ -25,6 +25,8 @@
- #include <config.h>
- #endif
- 
-+#include <glib/gi18n-lib.h>
-+
- #include <stdlib.h>
- #include <fcntl.h>
- #include <string.h>
---- evolution-exchange-3.2.1.orig/camel/camel-exchange-utils.c
-+++ evolution-exchange-3.2.1/camel/camel-exchange-utils.c
-@@ -17,6 +17,12 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#include <glib/gi18n-lib.h>
-+
- #include <ctype.h>
- #include <stdlib.h>
- #include <string.h>
---- evolution-exchange-3.2.1.orig/calendar/e-cal-backend-exchange-tasks.c
-+++ evolution-exchange-3.2.1/calendar/e-cal-backend-exchange-tasks.c
-@@ -21,6 +21,8 @@
- #include <config.h>
- #endif
- 
-+#include <glib/gi18n-lib.h>
-+
- #include <time.h>
- #include "e-cal-backend-exchange-tasks.h"
- #include <e2k-properties.h>
---- evolution-exchange-3.2.1.orig/calendar/e-cal-backend-exchange-calendar.c
-+++ evolution-exchange-3.2.1/calendar/e-cal-backend-exchange-calendar.c
-@@ -21,6 +21,8 @@
- #include <config.h>
- #endif
- 
-+#include <glib/gi18n-lib.h>
-+
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/fcntl.h>
diff -Nru evolution-exchange-3.2.1/debian/patches/series evolution-exchange-3.2.1/debian/patches/series
--- evolution-exchange-3.2.1/debian/patches/series	2012-04-12 17:22:05.000000000 +0000
+++ evolution-exchange-3.2.1/debian/patches/series	2012-04-13 06:33:01.000000000 +0000
@@ -1,4 +1,3 @@
 01_deprecated.patch
 03_link_libical.patch
 remove_g_thread_init.patch
-gettext_support_menu_items.patch