Merge lp:~unity-api-team/ubuntu-seeds/scope-facing-apis into lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.utopic

Proposed by Pete Woods on 2014-09-05
Status: Merged
Merged at revision: 243
Proposed branch: lp:~unity-api-team/ubuntu-seeds/scope-facing-apis
Merge into: lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.utopic
Diff against target: 45 lines (+16/-1)
2 files modified
sdk-libs (+6/-0)
sdk-libs-dev (+10/-1)
To merge this branch: bzr merge lp:~unity-api-team/ubuntu-seeds/scope-facing-apis
Reviewer Review Type Date Requested Status
Didier Roche 2014-09-05 Approve on 2014-09-09
Review via email: mp+233535@code.launchpad.net

Commit message

Add scope-facing APIs to SDK

Description of the change

Add scope-facing APIs to SDK

To post a comment you must log in.
Didier Roche (didrocks) wrote :

Looking good, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sdk-libs'
2--- sdk-libs 2014-08-15 13:54:55 +0000
3+++ sdk-libs 2014-09-05 14:50:31 +0000
4@@ -42,6 +42,12 @@
5 * qtdeclarative5-ubuntu-syncmonitor0.1
6 * qtdeclarative5-ubuntu-telephony-phonenumber0.1
7
8+= Scope facing APIs =
9+
10+ * libjsoncpp0
11+ * libnet-cpp1
12+ * libprocess-cpp2
13+
14 = Multimedia =
15
16 Preferred set of codecs for oxide.
17
18=== modified file 'sdk-libs-dev'
19--- sdk-libs-dev 2014-06-03 10:40:07 +0000
20+++ sdk-libs-dev 2014-09-05 14:50:31 +0000
21@@ -12,7 +12,6 @@
22 * libqt5svg5-dev
23 * libqt5webkit5-dev
24 * libqt5xmlpatterns5-dev
25- * libunity-scopes-dev
26 * qt3d5-dev
27 * qtbase5-dev
28 * qtdeclarative5-dev
29@@ -28,6 +27,16 @@
30 # forces Qt5 as the default; conflicts with Qt4 -- XXX should be a Recommends?
31 * qt5-default
32
33+= Scope facing APIs =
34+
35+ * google-mock
36+ * libboost1.55-dev
37+ * libjsoncpp-dev
38+ * libnet-cpp-dev
39+ * libprocess-cpp-dev
40+ * libproperties-cpp-dev
41+ * libunity-scopes-dev
42+
43 = Documentation and example code =
44
45 * (ubuntu-html5-theme-examples)

Subscribers

People subscribed via source and target branches