Merge lp://qastaging/~om26er/ubuntu/maverick/telepathy-haze/telepathy-haze-fix-652944 into lp://qastaging/ubuntu/maverick/telepathy-haze

Proposed by Omer Akram
Status: Merged
Merged at revision: 15
Proposed branch: lp://qastaging/~om26er/ubuntu/maverick/telepathy-haze/telepathy-haze-fix-652944
Merge into: lp://qastaging/ubuntu/maverick/telepathy-haze
Diff against target: 59 lines (+34/-1)
3 files modified
debian/changelog (+7/-0)
debian/control (+2/-1)
debian/patches/do_not_show_webcam_for_haze.patch (+25/-0)
To merge this branch: bzr merge lp://qastaging/~om26er/ubuntu/maverick/telepathy-haze/telepathy-haze-fix-652944
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Artur Rona (community) Needs Fixing
Review via email: mp+41597@code.qastaging.launchpad.net

Description of the change

backported from upstream git http://git.collabora.co.uk/?p=telepathy-haze.git;a=commitdiff;h=924fa3d90eb1a4949e431b0bd6284071f0d5b38b so that people dont get tricked into believing yahoo, icq etc support a/v calls

To post a comment you must log in.
17. By Omer Akram

debian/patches/do_not_show_webcam_for_haze.patch:

Revision history for this message
Artur Rona (ari-tczew) wrote :

Could you complete your patch with DEP3 tags? Follow with https://wiki.ubuntu.com/UbuntuDevelopment/PatchTaggingGuidelines.

review: Needs Fixing
18. By Omer Akram

added DEP3 tags to the patch.

Revision history for this message
Omer Akram (om26er) wrote :

> Could you complete your patch with DEP3 tags? Follow with
> https://wiki.ubuntu.com/UbuntuDevelopment/PatchTaggingGuidelines.

yes sir done ;)

Revision history for this message
Artur Rona (ari-tczew) wrote :

Please use short URLs, so:
Bug: https://bugs.freedesktop.org/30594
Bug-Ubuntu: https://launchpad.net/bugs/652944

and full sentences, so:
Subject: Instantiate the media manager only if the protocol support calls.

review: Needs Fixing
19. By Omer Akram

more corrections

Revision history for this message
Omer Akram (om26er) wrote :

> Please use short URLs, so:
> Bug: https://bugs.freedesktop.org/30594
> Bug-Ubuntu: https://launchpad.net/bugs/652944
>
> and full sentences, so:
> Subject: Instantiate the media manager only if the protocol support calls.

sorry for the inconvenience i hope this time things are right.

20. By Omer Akram

put a '.' at the end of Subject just in case

Revision history for this message
Omer Akram (om26er) wrote :

now i think this branch is ready :)

Revision history for this message
Martin Pitt (pitti) wrote :

This looks good now, thanks Omer! I'll merge into the maverick-proposed branch and upload.

review: Approve
Revision history for this message
Martin Pitt (pitti) wrote :

OK, nevermind about the maverick-proposed branch; it doesn't exist, and apparently I can't create it either, so just using the maverick branch.

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

to all changes: