lp:ubuntu/saucy-proposed/empathy

Created by Ubuntu Package Importer and last modified
Get this branch:
bzr branch lp:ubuntu/saucy-proposed/empathy
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Ubuntu branches
Review team:
Ubuntu Development Team
Status:
Mature

Recent revisions

226. By Sebastien Bacher

debian/patches/git_facebook_login.patch:
backport git patch to fix facebook login (lp: #1246265)

225. By Jeremy Bícha

* 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

224. By Tim Lunn

[ Jeremy Bicha ]
* debian/control:
  - Drop gnome-doc-utils and rarian from build-dependencies

[ Tim Lunn ]
* debian/patches/ubuntu_launch_uoa_panel.patch:
  - Only launch UOA panel when running a Unity session. (LP: #1203955)

223. By Colin Watson

Disable Ubuntu Online Accounts on powerpc, as a casualty of Qt5 being
unbuildable there at the moment.

222. By Jeremy Bícha

Set mcp-account-manager-goa as an alternate recommends for
mcp-account-manager-uoa

221. By Iain Lane

* 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
  - debian/patches/47_git_activate_with_platform_data.patch: Patches kept,
    see newly completed patch headers for descriptions.
  - debian/*: Turn on UOA and split out account plugins into
    account-plugins-* packages.
  - Remove Universe Build-Deps for geocode and cheese and disable these
    features.
  - debian/indicators/empathy: Install indicator integration point.
* New upstream release 3.8.3
* debian/patches/include-empathy-keyring.h: Add, fix implicit declaration of
  empathy_keyring_set_account_password_finish and co by including the right
  header.

220. By Sebastien Bacher

debian/patches/git_vcard_doesnt_segfault.patch: don't segfault when
receiving a vcard with a field that shouldn't be included (lp: #1177285)

219. By Ken VanDine

* debian/patches/48_lp_1147639.patch
  - UOA: Do not segfault when "Done" or "Cancel" button clicked but widget
    is not ready yet (LP: #1147639)

218. By Marco Trevisan (Treviño)

* debian/patches/47_git_activate_with_platform_data.patch:
  - Use g_application_activate to pass platform-data to the GtkApplication
    when running it. (LP: #627195)

217. By Sebastien Bacher

debian/control: let account plugins depend on unity-asset-pool rather
than on the transitional account-plugin-icons binary

Branch metadata

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

Subscribers