Last commit made on 2015-04-16
Get this branch:
git clone -b applied/ubuntu/vivid https://git.launchpad.net/ubuntu/+source/empathy
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

61810b0... by Iain Lane on 2015-04-16

Import patches-applied version 3.12.9-1ubuntu1 to applied/ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 923233e4b61bcb1f224a6530466ffeecd1940171
Unapplied parent: ca193fc549a8410e8f3d199b3384060da0c09623

New changelog entries:
  * Merge with Debian, 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: Patches kept, see patch headers for
    - debian/patches/ubuntu_launch_uoa_panel.patch:
      + Only launch UOA panel when running a Unity session.
    - debian/patches/Revert-geoclue-2.0.patch: Use geoclue 1.0
    - debian/patches/git_no_nautilus_sendto.patch: Remove nautilus-sendto
      plugin, nautilus-sendto doesn't support plugins any more
    - 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
    - debian/indicators/empathy: Install indicator integration point.
    - debian/control:
      + Replace/Conflict/Provide empathy-call
      + Recommend gnome-contacts
    - debian/shlibs.local: Bump version to 3.12.8
    - Switch gnome-icon-theme to adwaita-icon-theme, which is its

ca193fc... by Iain Lane on 2015-04-16

Revert 4 upstream git commits so we can use old geoclue

Gbp-Pq: Revert-geoclue-2.0.patch.

2545d32... by Iain Lane on 2015-04-16

[PATCH] Check desktop session to determine which accounts panel to

Gbp-Pq: ubuntu_launch_uoa_panel.patch.

0cf2cc4... by Iain Lane on 2015-04-16

Add some Unity Quicklists

Gbp-Pq: 43_quicklists.patch.

99df95d... by Iain Lane on 2015-04-16

Move to the window / move the window to the user depending on Shell or not

Gbp-Pq: 42_shell_running.patch.

12ae22a... by Iain Lane on 2015-04-16

Add Unity support to show file transfer progress in the launcher

Gbp-Pq: 41_unity_launcher_progress.patch.

088ffff... by Iain Lane on 2015-04-16

Connect to Freenode IRC by default for Ubuntu channels

Gbp-Pq: 39_default_to_freenode_for_irc.patch.

9cc6d9d... by Iain Lane on 2015-04-16


No DEP3 Subject or Description header found

Gbp-Pq: 38_default_to_facebook_for_im.patch.

40f22a4... by Iain Lane on 2015-04-16

Start raised (window not hidden) when started explicitly; respect last state when autostarted.

Gbp-Pq: 34_start_raised_execpt_in_session.patch.

faa2cf1... by Iain Lane on 2015-04-16

Use ido to provide messages for calls and file transfers

Gbp-Pq: 23_idomessagedialog_for_voip_and_ft.patch.