Empathy

Merge lp://staging/~darkxst/empathy/3.12 into lp://staging/~ubuntu-desktop/empathy/ubuntu

  1. 3.12
  2. Merge into ubuntu
Proposed by Tim Lunn
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 378
Merged at revision: 369
Proposed branch: lp://staging/~darkxst/empathy/3.12
Merge into: lp://staging/~ubuntu-desktop/empathy/ubuntu
Diff against target: 2269 lines (+1582/-243)
23 files modified
debian/autoreconf (+2/-0)
debian/changelog (+50/-0)
debian/compat (+1/-1)
debian/control (+6/-6)
debian/empathy.install (+2/-0)
debian/patches/0001-Use-new-api-versioned-name-for-geocode-glib.patch (+0/-28)
debian/patches/0002-Update-to-new-GeocodeLocation-API-in-geocode-glib-0..patch (+0/-48)
debian/patches/0003-Add-missing-include.patch (+0/-24)
debian/patches/00_linker-fixes.patch (+20/-4)
debian/patches/10_use_notify_osd_icons.patch (+9/-9)
debian/patches/23_idomessagedialog_for_voip_and_ft.patch (+7/-11)
debian/patches/34_start_raised_execpt_in_session.patch (+6/-4)
debian/patches/38_default_to_facebook_for_im.patch (+4/-4)
debian/patches/39_default_to_freenode_for_irc.patch (+6/-6)
debian/patches/41_unity_launcher_progress.patch (+26/-26)
debian/patches/42_shell_running.patch (+10/-10)
debian/patches/Revert-geoclue-2.0.patch (+1422/-0)
debian/patches/include-empathy-keyring.h (+0/-14)
debian/patches/series (+1/-8)
debian/patches/ubuntu_launch_uoa_panel.patch (+6/-8)
debian/patches/ucc_panel_name.patch (+0/-22)
debian/rules (+2/-8)
debian/shlibs.local (+2/-2)
To merge this branch: bzr merge lp://staging/~darkxst/empathy/3.12
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+236092@code.staging.launchpad.net

Description of the change

Also requires path to gnome-themes-standard to fix themeing in Adwaita (see debdiff in bug #1339352)

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks for the work! That looks mostly good to me, some small comments/questions though

* the geoclue build-depends should be reverted to "geoclue" since the package keeps using the old version

* the debian/rules changes with ubuntu-online-account/powerpc doesn't seem explained in the changelog, could you give some details on it. Was the option implicit/depending of the build environment before and just being consistently enforced now? Why is powerpc as special case there?

* do you think you could turn the bug into a ffe request?

review: Needs Fixing
lp://staging/~darkxst/empathy/3.12 updated
378. By Tim Lunn

* debian/control:
  - Revert geoclue-2.0 dep to geoclue for the above revert patch

Revision history for this message
Tim Lunn (darkxst) wrote :

seb128, above issues are fixed, I will try and get to ffe paperwork tomorrow

Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks, looks good to me, approving the change and let's see how the ffe goes

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches