~ubuntu-branches/ubuntu/wily/evolution/wily

Viewing all changes in revision 224.

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2012-06-19 21:11:17 UTC
  • mfrom: (1.1.91) (1.2.29 sid)
  • Revision ID: package-import@ubuntu.com-20120619211117-o0d5gkh82io6j9rm
Tags: 3.4.3-1ubuntu1
* Re-synchronize with Debian. Remaining changes:
  - debian/control:
    - Don't build depend on libchamplain (it's in universe) and disable the
      contact maps plugin
    - Depend on gnome-icon-theme-full instead of gnome-icon-theme
    - Update Vcs-* fields.
  - debian/rules:
    - use --disable-contacts-map
  - 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
    - 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.
  - debian/evolution-common.install: install signature.py to generate the
    "Sent from Ubuntu" signature.
* Dropped Ubuntu patches:
  - onlyshowin-add-unity.patch: Applied in new upstream release.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: