Merge lp:~bzoltan/ubuntu-seeds/target-qmake-extras into lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.vivid

Proposed by Zoltan Balogh on 2015-01-28
Status: Merged
Merged at revision: 277
Proposed branch: lp:~bzoltan/ubuntu-seeds/target-qmake-extras
Merge into: lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.vivid
Diff against target: 25 lines (+3/-1)
2 files modified
sdk-libs-dev (+3/-0)
sdk-libs-tools (+0/-1)
To merge this branch: bzr merge lp:~bzoltan/ubuntu-seeds/target-qmake-extras
Reviewer Review Type Date Requested Status
Oliver Grawert 2015-01-28 Approve on 2015-01-28
Review via email: mp+247852@code.launchpad.net

Commit Message

The click chroots need the target ubuntu-sdk-qmake-extras not the native

Description of the Change

The click chroots need the target ubuntu-sdk-qmake-extras not the native

To post a comment you must log in.
278. By Zoltan Balogh on 2015-01-28

The click chroots need the target ubuntu-sdk-qmake-extras not the native

Oliver Grawert (ogra) wrote :

looks fine with the move to sdk-libs-dev

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sdk-libs-dev'
2--- sdk-libs-dev 2014-12-03 08:11:07 +0000
3+++ sdk-libs-dev 2015-01-28 15:19:38 +0000
4@@ -25,6 +25,9 @@
5 # forces Qt5 as the default; conflicts with Qt4 -- XXX should be a Recommends?
6 * qt5-default
7
8+ # deliveres the ubuntu-click
9+ * ubuntu-sdk-qmake-extras
10+
11 = Scope facing APIs =
12
13 * google-mock
14
15=== modified file 'sdk-libs-tools'
16--- sdk-libs-tools 2015-01-21 14:19:04 +0000
17+++ sdk-libs-tools 2015-01-28 15:19:38 +0000
18@@ -12,7 +12,6 @@
19 * cmake
20 * cmake-extras
21 * qt5-qmake-arm-linux-gnueabihf
22- * ubuntu-sdk-qmake-extras
23 * ubuntu-ui-toolkit-doc
24 * (ubuntu-html5-theme-examples)
25 * intltool

Subscribers

People subscribed via source and target branches