Merge lp:~timo-jyrinki/ubuntu-seeds/ubuntu-touch.yakkety_remove_sdk into lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.yakkety

Proposed by Timo Jyrinki
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 355
Merged at revision: 355
Proposed branch: lp:~timo-jyrinki/ubuntu-seeds/ubuntu-touch.yakkety_remove_sdk
Merge into: lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.yakkety
Diff against target: 147 lines (+2/-110)
5 files modified
STRUCTURE (+0/-3)
sdk (+0/-40)
sdk-libs (+2/-2)
sdk-libs-dev (+0/-46)
sdk-libs-tools (+0/-19)
To merge this branch: bzr merge lp:~timo-jyrinki/ubuntu-seeds/ubuntu-touch.yakkety_remove_sdk
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
Review via email: mp+300582@code.launchpad.net

Commit message

Remove sdk, sdk-libs-dev, sdk-libs-tools. The Ubuntu SDK will be distributed separately from now on. (LP: #1604744)

To post a comment you must log in.
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Ok, so far these changes look ok from my POV. It's of course hard to say that definitely before we have this merged and run ./update on the meta-package, but I don't see anything obviously wrong here. The SDK packages should not have been provided by the touch seeds from the very beginning, as it's not essential to a working touch environment.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'STRUCTURE'
2--- STRUCTURE 2016-06-13 13:55:33 +0000
3+++ STRUCTURE 2016-07-20 10:22:44 +0000
4@@ -1,9 +1,6 @@
5 include platform.yakkety
6 feature no-follow-recommends
7 sdk-libs: required
8-sdk-libs-dev: sdk-libs build-essential
9-sdk-libs-tools: sdk-libs-dev
10-sdk: sdk-libs-dev
11 touch-android: minimal
12 touch-core: minimal sdk-libs
13 touch: touch-android touch-core
14
15=== removed file 'sdk'
16--- sdk 2015-06-02 11:13:13 +0000
17+++ sdk 1970-01-01 00:00:00 +0000
18@@ -1,40 +0,0 @@
19-Task-Per-Derivative: 1
20-Task-Section: user
21-Task-Description: Ubuntu SDK
22-Task-Extended-Description: This task provides the Ubuntu SDK.
23-Task-Key: ubuntu-touch
24-Task-Name: ubuntu-sdk
25-Task-Metapackage: ubuntu-sdk
26-
27-= Documentation =
28-
29- * qtbase5-doc
30- * qtcreator-doc
31- * qtdeclarative5-doc
32- * qtfeedback5-doc
33- * qtgraphicaleffects5-doc
34- * qtlocation5-doc
35- * qtmultimedia5-doc
36- * qtpim5-doc
37- * qtsensors5-doc
38- * qtsvg5-doc
39- * qttools5-doc
40- * qtwebsockets5-doc
41- * qtxmlpatterns5-doc
42- * libcontent-hub-doc
43-
44-= Ubuntu UI Toolkit =
45-
46- * ubuntu-ui-toolkit-doc
47- * ubuntu-ui-toolkit-examples
48- * ubuntu-ui-toolkit-autopilot
49-
50-= Tools =
51-
52- * qmlscene
53- * qtcreator
54- * qtcreator-plugin-ubuntu
55- * phablet-tools
56- * ubuntu-device-flash
57- * autopilot-desktop
58- * intltool
59
60=== modified file 'sdk-libs'
61--- sdk-libs 2016-06-16 07:55:00 +0000
62+++ sdk-libs 2016-07-20 10:22:44 +0000
63@@ -1,7 +1,7 @@
64 Task-Per-Derivative: 1
65 Task-Section: user
66-Task-Description: Ubuntu SDK Libraries
67-Task-Extended-Description: This task provides the Ubuntu SDK runtime libraries.
68+Task-Description: Ubuntu SDK Runtime API Libraries
69+Task-Extended-Description: This task provides the Ubuntu SDK runtime API libraries.
70 Task-Key: ubuntu-touch
71 Task-Name: ubuntu-sdk-libs
72 Task-Metapackage: ubuntu-sdk-libs
73
74=== removed file 'sdk-libs-dev'
75--- sdk-libs-dev 2016-05-04 15:34:08 +0000
76+++ sdk-libs-dev 1970-01-01 00:00:00 +0000
77@@ -1,46 +0,0 @@
78-Task-Per-Derivative: 1
79-Task-Section: user
80-Task-Description: Ubuntu SDK Development Headers
81-Task-Extended-Description: This task provides the Ubuntu SDK development headers.
82-Task-Key: ubuntu-touch
83-Task-Name: ubuntu-sdk-libs-dev
84-Task-Metapackage: ubuntu-sdk-libs-dev
85-
86-= Qt 5 APIs =
87-
88- * libqt5sensors5-dev
89- * libqt5svg5-dev
90- * libqt5websockets5-dev
91- * libqt5xmlpatterns5-dev
92- * qt3d5-dev
93- * qtbase5-dev
94- * qtdeclarative5-dev
95- * qtdeclarative5-dev-tools
96- * qtlocation5-dev
97- * qtmultimedia5-dev
98- * libcontent-hub-dev
99- * qttools5-dev
100- * libssl-dev
101- * qtpim5-dev
102- * qtconnectivity5-dev
103-
104- # forces Qt5 as the default; conflicts with Qt4 -- XXX should be a Recommends?
105- * qt5-default
106-
107- # delivers the ubuntu-click
108- * ubuntu-sdk-qmake-extras
109-
110-= Scope facing APIs =
111-
112- * google-mock
113- * libjsoncpp-dev
114- * libnet-cpp-dev
115- * libprocess-cpp-dev
116- * libproperties-cpp-dev
117- * libunity-scopes-dev
118-
119-= Documentation and example code =
120-
121- * ubuntu-ui-toolkit-doc
122- * (ubuntu-html5-theme-examples)
123-
124
125=== removed file 'sdk-libs-tools'
126--- sdk-libs-tools 2015-01-28 15:10:49 +0000
127+++ sdk-libs-tools 1970-01-01 00:00:00 +0000
128@@ -1,19 +0,0 @@
129-Task-Per-Derivative: 1
130-Task-Section: user
131-Task-Description: Ubuntu SDK Development Tools
132-Task-Extended-Description: This task provides the Ubuntu SDK development tools
133-Task-Key: ubuntu-touch
134-Task-Name: ubuntu-sdk-libs-tools
135-Task-Metapackage: ubuntu-sdk-libs-tools
136-
137-= Native arch tools =
138-
139- * qttools5-dev-tools
140- * cmake
141- * cmake-extras
142- * qt5-qmake-arm-linux-gnueabihf
143- * ubuntu-ui-toolkit-doc
144- * (ubuntu-html5-theme-examples)
145- * intltool
146- # for autopilot
147- * python3

Subscribers

People subscribed via source and target branches