Merge lp://staging/~gerboland/platform-api/devel-213 into lp://staging/platform-api

Proposed by Gerry Boland
Status: Merged
Merged at revision: 216
Proposed branch: lp://staging/~gerboland/platform-api/devel-213
Merge into: lp://staging/platform-api
Diff against target: 97 lines (+37/-1)
6 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+10/-0)
include/ubuntu/application/ui/window.h (+6/-0)
src/ubuntu/mirclient/ubuntu_application_api_mirclient.cpp (+10/-0)
src/ubuntu/mirclient/window_mirclient.cpp (+8/-0)
src/ubuntu/mirclient/window_mirclient_priv.h (+2/-0)
To merge this branch: bzr merge lp://staging/~gerboland/platform-api/devel-213
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
kevin gunn (community) Needs Fixing
Review via email: mp+219392@code.staging.launchpad.net

Commit message

Merge devel breanch at commit 213 - consists of commit "Add ua_ui_window_get_size()."

Description of the change

Merge devel breanch at commit 213 - consists of commit "Add ua_ui_window_get_size()."

To post a comment you must log in.
Revision history for this message
Gerry Boland (gerboland) wrote :

 * Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Y
 * Did you build your software in a clean sbuild/pbuilder chroot or ppa?
N
 * Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
Y
 * Has your component "TestPlan” been executed successfully on emulator, N4?
Y
 * Has a 5 minute exploratory testing run been executed on N4?
Y
 * If you changed the packaging (debian), did you subscribe a core-dev to this MP?
N/A
 * If you changed the UI, did you subscribe the design-reviewers to this MP?
N/A
 * What components might get impacted by your changes?
This breaks API & ABI compatibility, so dependent packages need to be rebuilt. Includes qtubuntu, unity-mir.
 * Have you requested review by the teams of these owning components?
Only adding an API, not changing existing ones.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
kevin gunn (kgunn72) wrote :

uh-oh, revision at trunk is currently
platform-api (0.21+14.10.20140507-0ubuntu1) utopic; urgency=medium

so modify the changelog to be like
platform-api (0.22-0ubuntu1) UNRELEASED; urgency=medium
jenkins will put in the time stamp.

And really, since the "versioning" in cmake is currently 1.0.0, and moving to 1.1.0
the convention is to put that as the prefix
platform-api (1.1.0-0ubuntu1) UNRELEASED; urgency=medium (ping ricmm)

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
216. By Gerry Boland

Merge devel breanch at commit 213 - consists of commit "Add ua_ui_window_get_size()."

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