lp://staging/~cyphermox/ubuntu/raring/evolution/3.6.4

Created by Mathieu Trudel-Lapierre and last modified
Get this branch:
bzr branch lp://staging/~cyphermox/ubuntu/raring/evolution/3.6.4
Only Mathieu Trudel-Lapierre can upload to this branch. If you are Mathieu Trudel-Lapierre please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Mathieu Trudel-Lapierre
Status:
Development

Recent revisions

229. By Mathieu Trudel-Lapierre

debian/patches/10_desktop_shortcuts.patch: refreshed.

228. By Mathieu Trudel-Lapierre

* New upstream bugfix release. (LP: #1158367)
  - text/css always formatted as attachment (LP: #1107974)
  - Crash in flush Outbox after Forward filter (LP: #1094655)
  - text/css always formatted as attachment (LP: #1107974)
  - Expanding appointment crashes Evolution (LP: #790304)
  - Malformed content-type header causes infinite recursion (LP: #1158018)
* debian/control.in:
  - Drop obsolete mx dependency (not needed since 3.5.90)
* Switch gstreamer0.10 BDs for gstreamer1.0 - upstream supports both and we
  are transitioning to 1.0.
* New upstream release
* debian/patches/drop_force-message-limit.patch:
  - Applied upstream
* debian/patches/disable-webkit-plugins.patch: disable all webkit plugins
  when initializing the EWebView (the object that handles displaying messages
  in a message window and in preview), to avoid security issues because of
  these plugins. (LP: #1037669)
* debian/control: flip the alternative Recommends for spamassassin and
  bogofilter to prefer spamassassin, since bogofilter got demoted.
* debian/control: Bump Build-Depends on libgtkhtml-4.0-dev to (>= 4.6.0).
* New upstream stable release
* debian/control:
  - Update evolution dependencies to 3.6
* New upstream RC release.
* don't recommend evolution-webcal anymore: doesn't support latest e-d-s API
  version and unmaintained.
* debian/patches/drop_force-message-limit.patch: drop the gsettings conversion
  entry for force-message-limit; it fails and crashes gsettings (LP: #1043862)
* New upstream release
* New upstream release.
* debian/control:
  - Bump build-depends on e-d-s dependencies
  - Build-depend on GTK 3.4
  - Build-depend on yelp-tools instead of gnome-doc-utils
  - Drop build-depends on libjavascriptcoregtk-3.0-dev
* debian/evolution-common.install: Update for new help install location
* 04_gettext_intltool.patch: Dropped, applied in new version
* debian/control:
  - Bump build-depends on e-d-s dependencies
* New upstream release
* debian/patches/gweather_3.6.patch:
  - Applied upstream

227. By Robert Ancell

* debian/control:
  - Build build-depends on libgweather-3-dev
* debian/patches/gweather_3.6.patch:
  - Use libgweather 3.6

226. By Jeremy Bícha

* debian/control:
  - Don't build-depend on python-dev
  - Have evolution-dev depend on libwebkitgtk-3.0-dev and drop gconf
    dependency

225. By Mathieu Trudel-Lapierre

* New upstream release 3.5.3.1.
* debian/control:
  - Add libwebkitgtk-3.0-dev, libjavascriptcoregtk-3.0-dev >= 1.8.0 to build
    dependencies.
  - Adjust Build-Depends for the new minimum versions required for EDS 3.5.
  - Also update evolution's Depends to require evolution-data-server >= 3.5,
    and << 3.6.
* debian/rules:
  - Update ELIBDIR to point to /usr/lib/evolution/3.6 now, as per the base
    version defined in configure.
  - Build all plugins rather than enabling experimental specifically; we can
    sort them to other packages after.
  - Drop the binary-install/evolution-common target.
* debian/patches/01_ubuntu_signature.patch: dropped; upstream code has changed
  sufficiently that it would pretty much need a rewrite; and Evolution is no
  longer the default shipped mail client on Desktop.
* debian/patches/04_delay_alarm_notifier.patch: refreshed.
* debian/patches/89_remove_component_id_registration.patch: dropped: we don't
  have UNE anymore and component ID registration has been moved to GSettings.
* debian/patches/10_revert_libevolution_avoid-version.patch: refreshed.
* debian/patches/91_add_u1_email_translations.patch: refreshed.
* debian/evolution-common.install:
  - Drop debian/signature.py.
  - Don't install /usr/share/mime-info; it's not built anymore.
* debian/signature.py: dropped; since we dropped the Ubuntu signature patch.
* debian/evolution.install: don't try to install files in /etc/gconf; evo
  has migrated to GSettings so there are no such files anymore.
* debian/evolution.install,
  debian/evolution-plugins.install,
  debian/evolution-plugins-experimental.install: remove the plugins that were
  converted to modules. Modules are already installed by libevolution.

224. By Jeremy Bícha

* 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.

223. By Adam Conrad

Rebuild for the libgnome-desktop SOVER bump.

222. By Jeremy Bícha

* Pull fixes from Debian svn:
  - Stop using braces in .install files, and unfold the compact lists
    into huge individual file lists. Using braces isn't supported by
    debhelper, and masked dh_install errors (if an expanded file didn't
    exist, dh_install would not barf). In the future, we might want to
    consider using a debhelper executable to generate the file list.
  - Add missing dependencies on libedataserver1.2-dev and libebackend1.2-dev,
    as per pkgconfig files (BGO #677045).
* debian/control: Drop evolution-dev depends on libevolution,
  not needed with the above change
* debian/evolution-plugins.install:
  - Don't install image-inline plugin; this requires gtkimageview which is in
    universe.
* Build with clutter now that mx is in main.

221. By Jeremy Bícha

* 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

220. By Robert Ancell

* debian/control:
  - Use standards version 3.9.3
  - Drop dependency on liblaunchpad-integration-3.0-dev
* debian/patches/03_lpi.patch:
  - Dropped, we no longer do Launchpad integration

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp://staging/ubuntu/raring/evolution
This branch contains Public information 
Everyone can see this information.