Merge lp:~unity-team/unity-api/packaging into lp:unity-api

Proposed by Michał Sawicz
Status: Merged
Approved by: Michael Terry
Approved revision: no longer in the source branch.
Merged at revision: 209
Proposed branch: lp:~unity-team/unity-api/packaging
Merge into: lp:unity-api
Diff against target: 24 lines (+5/-1)
2 files modified
debian/changelog (+4/-0)
include/unity/shell/application/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~unity-team/unity-api/packaging
Reviewer Review Type Date Requested Status
Michael Terry Approve
PS Jenkins bot (community) continuous-integration Approve
Unity8 CI Bot continuous-integration Needs Fixing
Review via email: mp+284815@code.launchpad.net

Commit message

Bump version for dependants

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:207
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-1-ci/12/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-1-ci/12/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:208
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-1-ci/16/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-1-ci/16/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Michael Terry (mterry) wrote :

LGTM

review: Approve
lp:~unity-team/unity-api/packaging updated
207. By Daniel d'Andrada

Added ApplicationInfoInterface.initialSurfaceSize Fixes: #1532974
Approved by: Nick Dedekind, PS Jenkins bot, Gerry Boland

208. By Daniel d'Andrada

MirSurfaceInterface: added size hints
Approved by: Unity8 CI Bot, Michał Sawicz

209. By Michał Sawicz

Bump version for dependants
Approved by: Michael Terry, PS Jenkins bot

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-01-04 15:09:55 +0000
3+++ debian/changelog 2016-02-11 23:39:12 +0000
4@@ -1,3 +1,7 @@
5+unity-api (7.106) UNRELEASED; urgency=medium
6+
7+ -- Michal Sawicz <michal.sawicz@canonical.com> Tue, 02 Feb 2016 17:50:55 +0100
8+
9 unity-api (7.105+16.04.20160104-0ubuntu1) xenial; urgency=medium
10
11 [ Michael Zanetti ]
12
13=== modified file 'include/unity/shell/application/CMakeLists.txt'
14--- include/unity/shell/application/CMakeLists.txt 2015-12-03 19:32:37 +0000
15+++ include/unity/shell/application/CMakeLists.txt 2016-02-11 23:39:12 +0000
16@@ -7,7 +7,7 @@
17
18 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
19
20-set(VERSION 12)
21+set(VERSION 13)
22 set(PKGCONFIG_NAME "unity-shell-application")
23 set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
24 set(PKGCONFIG_REQUIRES "Qt5Core")

Subscribers

People subscribed via source and target branches

to all changes: