~ubuntu-branches/ubuntu/saucy/empathy/saucy

Viewing all changes in revision 225.

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-09-09 21:21:54 UTC
  • mfrom: (1.1.112) (6.6.57 experimental)
  • Revision ID: package-import@ubuntu.com-20130909212154-ogao0gvrwludeebx
Tags: 3.8.4-1ubuntu1
* Merge with Debian (LP: #1068242), remaining changes:
  - debian/patches/00_linker-fixes.patch
  - debian/patches/10_use_notify_osd_icons.patch
  - debian/patches/23_idomessagedialog_for_voip_and_ft.patch
  - debian/patches/34_start_raised_execpt_in_session.patch
  - debian/patches/38_default_to_facebook_for_im.patch
  - debian/patches/39_default_to_freenode_for_irc.patch
  - debian/patches/41_unity_launcher_progress.patch
  - debian/patches/42_shell_running.patch
  - debian/patches/43_quicklists.patch
  - debian/patches/47_git_activate_with_platform_data.patch: Patches kept,
    see newly completed patch headers for descriptions.
  - debian/patches/include-empathy-keyring.h: fix implicit declaration of
    empathy_keyring_set_account_password_finish and co by including the right
    header.
  - debian/patches/ubuntu_launch_uoa_panel.patch:
    + Only launch UOA panel when running a Unity session.
  - debian/*: Turn on UOA and split out account plugins into
    account-plugins-* and mcp-account-manager-goa/uoa packages.
  - Remove Universe Build-Deps for geocode and champlain and disable these
    features.
  - debian/indicators/empathy: Install indicator integration point.
  - debian/control:
    + Replace/Conflict/Provide empathy-call
    + Recommend gnome-contacts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: