* Merge with Debian. Remaining changes: - debian/control: - Build-Depend on python-dev (for the python module) and libpst-dev (for the pst-import plugin). - Don't build depend on libchamplain (it's in universe) and disable the contact maps plugin - Don't build-depend on clutter since mx isn't in main yet - Depend on gnome-icon-theme-full instead of gnome-icon-theme - Have evolution-dev depend on libevolution instead of evolution - Update Vcs-* fields. - debian/rules: - use --enable-pst-import, --enable-python, --disable-contacts-map, and --with-clutter=no - debian/patches: - 01_ubuntu_signature.patch: don't set the ubuntu signature as default for new accounts. - 04_delay_alarm_notifier.patch: delay alarm-notifier by 30 seconds. - 09_add_ubuntuone_email.patch: add patch to add Ubuntu One introduction. - 10_desktop_shortcuts.patch: fix the calendar shortcut to appear in the Launcher. - 11_remove_upstream_submit_bugreport.patch: Remove 'Submit Bug Report' option from Help menu. - 20_skip_broken_gconf_conversions.patch: Don't install the window size gconf conversions. Besides not being very useful, they are broken and cause gnome-settings-daemon to fail to start - 62_no_upstream_email_notification_by_default.patch: don't enable the notification icon by default since the message indicator is running. - 89_remove_component_id_registration.patch: ignore -c component gconf registration on launching just "evolution". - 91_add_u1_email_translations.patch: Add translations for Ubuntu One welcome mail https://wiki.ubuntu.com/Translations/Wanted/UbuntuOneEmail - onlyshowin-add-unity.patch: add Unity to the OnlyShowIn field in desktop files. - alarm-notify-nodisplay.patch: don't show the alarm notifier in gnome-session-properties (add NoDisplay=true to the .desktop file). - debian/evolution-common.gsettings-override: - Disable systray for alarms, as Unity doesn't have a systray. Use popup windows instead. - Correct the path to spamd as /usr/sbin/spamd. - debian/evolution-common.install: install signature.py to generate the "Sent from Ubuntu" signature. * Dropped Ubuntu patches: - 02_fix_missing_include_for_composer.patch: doesn't seem needed - 89_remove_quit_button.patch: This didn't seem to do anything & we don't use express mode for anything now anyway - 61_translate_menu_entry.patch: No longer needed - 62_no_upstream_email_notification_by_default.patch: Obsolete - 93_no_tray_icon_by_default.patch: Use gsettings override instead - spamd_sbin_path.patch: Use gsettings override instead - nss-paths.patch: Included by Debian as 02_nss_paths.patch - git_edit_as_new_from_addr_3dc8b0b.patch: Already applied - gmodule-linking.patch: Already applied - libpst-pst_open-args.patch: Already applied - git_crash_in_mail_sidebar_936a488.patch: Already applied - 99git_remove_g_thread_init_09c88ab.patch: Already applied