Merge lp:~kissiel/checkbox/ppa-packaging-touch2converged-trusty into lp:~checkbox-dev/checkbox/ppa-packaging-checkbox-converged-trusty
- ppa-packaging-touch2converged-trusty
- Merge into ppa-packaging-checkbox-con...
Proposed by
Maciej Kisielewski
Status: | Merged |
---|---|
Approved by: | Sylvain Pineau |
Approved revision: | 22 |
Merged at revision: | 22 |
Proposed branch: | lp:~kissiel/checkbox/ppa-packaging-touch2converged-trusty |
Merge into: | lp:~checkbox-dev/checkbox/ppa-packaging-checkbox-converged-trusty |
Diff against target: |
539 lines (+109/-109) 5 files modified
debian/checkbox-converged.desktop (+2/-2) debian/clean (+1/-1) debian/install (+5/-5) debian/patches/components_1.3_removal.diff (+100/-100) debian/rules (+1/-1) |
To merge this branch: | bzr merge lp:~kissiel/checkbox/ppa-packaging-touch2converged-trusty |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sylvain Pineau (community) | Approve | ||
Review via email: mp+307168@code.launchpad.net |
This proposal supersedes a proposal from 2016-09-29.
Commit message
Description of the change
This MR updates packaging with new Checkbox-Converged files layout (Trusty).
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === renamed file 'debian/checkbox-touch.desktop' => 'debian/checkbox-converged.desktop' | |||
2 | --- debian/checkbox-touch.desktop 2015-07-23 20:18:44 +0000 | |||
3 | +++ debian/checkbox-converged.desktop 2016-09-29 12:09:15 +0000 | |||
4 | @@ -1,8 +1,8 @@ | |||
5 | 1 | [Desktop Entry] | 1 | [Desktop Entry] |
6 | 2 | Name=Checkbox Converged | 2 | Name=Checkbox Converged |
7 | 3 | Comment=System testing utility for Ubuntu | 3 | Comment=System testing utility for Ubuntu |
10 | 4 | Exec=env LD_LIBRARY_PATH=/opt/qt-5.4/usr/lib/x86_64-linux-gnu qmlscene -qt=5.4 --settings=/usr/share/checkbox-converged/settings.json $@ /usr/share/checkbox-converged/checkbox-touch.qml | 4 | Exec=env LD_LIBRARY_PATH=/opt/qt-5.4/usr/lib/x86_64-linux-gnu qmlscene -qt=5.4 --settings=/usr/share/checkbox-converged/settings.json $@ /usr/share/checkbox-converged/checkbox-converged.qml |
11 | 5 | Icon=checkbox-touch.svg | 5 | Icon=checkbox-converged.svg |
12 | 6 | Terminal=false | 6 | Terminal=false |
13 | 7 | Type=Application | 7 | Type=Application |
14 | 8 | X-Ubuntu-Touch=true | 8 | X-Ubuntu-Touch=true |
15 | 9 | 9 | ||
16 | === modified file 'debian/clean' | |||
17 | --- debian/clean 2015-07-07 14:42:13 +0000 | |||
18 | +++ debian/clean 2016-09-29 12:09:15 +0000 | |||
19 | @@ -1,2 +1,2 @@ | |||
21 | 1 | checkbox-touch/py/__pycache__/*.pyc | 1 | converged/py/__pycache__/*.pyc |
22 | 2 | 2 | ||
23 | 3 | 3 | ||
24 | === modified file 'debian/install' | |||
25 | --- debian/install 2015-07-23 20:18:44 +0000 | |||
26 | +++ debian/install 2016-09-29 12:09:15 +0000 | |||
27 | @@ -1,8 +1,8 @@ | |||
33 | 1 | checkbox-touch/checkbox-touch.qml usr/share/checkbox-converged/ | 1 | converged/checkbox-converged.qml usr/share/checkbox-converged/ |
34 | 2 | checkbox-touch/checkbox-touch.svg usr/share/icons/hicolor/scalable/apps/ | 2 | converged/checkbox-converged.svg usr/share/icons/hicolor/scalable/apps/ |
35 | 3 | checkbox-touch/components usr/share/checkbox-converged/ | 3 | converged/components usr/share/checkbox-converged/ |
36 | 4 | checkbox-touch/py usr/share/checkbox-converged/ | 4 | converged/py usr/share/checkbox-converged/ |
37 | 5 | debian/checkbox-touch.desktop usr/share/applications | 5 | debian/checkbox-converged.desktop usr/share/applications |
38 | 6 | debian/settings.json usr/share/checkbox-converged/ | 6 | debian/settings.json usr/share/checkbox-converged/ |
39 | 7 | debian/tick.svg usr/share/icons/suru/actions/scalable/ | 7 | debian/tick.svg usr/share/icons/suru/actions/scalable/ |
40 | 8 | debian/window-close.svg usr/share/icons/suru/actions/scalable/ | 8 | debian/window-close.svg usr/share/icons/suru/actions/scalable/ |
41 | 9 | 9 | ||
42 | === modified file 'debian/patches/components_1.3_removal.diff' | |||
43 | --- debian/patches/components_1.3_removal.diff 2016-08-19 09:06:46 +0000 | |||
44 | +++ debian/patches/components_1.3_removal.diff 2016-09-29 12:09:15 +0000 | |||
45 | @@ -1,7 +1,7 @@ | |||
47 | 1 | diff --git b/checkbox-touch/checkbox-touch.qml a/checkbox-touch/checkbox-touch.qml | 1 | diff --git b/converged/checkbox-converged.qml a/converged/checkbox-converged.qml |
48 | 2 | index cb896ef..c6c3b93 100644 | 2 | index cb896ef..c6c3b93 100644 |
51 | 3 | --- b/checkbox-touch/checkbox-touch.qml | 3 | --- b/converged/checkbox-converged.qml |
52 | 4 | +++ a/checkbox-touch/checkbox-touch.qml | 4 | +++ a/converged/checkbox-converged.qml |
53 | 5 | @@ -20,8 +20,8 @@ | 5 | @@ -20,8 +20,8 @@ |
54 | 6 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 6 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
55 | 7 | */ | 7 | */ |
56 | @@ -39,12 +39,12 @@ | |||
57 | 39 | } | 39 | } |
58 | 40 | return pageObject; | 40 | return pageObject; |
59 | 41 | } | 41 | } |
61 | 42 | diff --git b/checkbox-touch/components/AboutPage.qml a/checkbox-touch/components/AboutPage.qml | 42 | diff --git b/converged/components/AboutPage.qml a/converged/components/AboutPage.qml |
62 | 43 | index bb0f50e..d3de734 100644 | 43 | index bb0f50e..d3de734 100644 |
65 | 44 | --- b/checkbox-touch/components/AboutPage.qml | 44 | --- b/converged/components/AboutPage.qml |
66 | 45 | +++ a/checkbox-touch/components/AboutPage.qml | 45 | +++ a/converged/components/AboutPage.qml |
67 | 46 | @@ -24,7 +24,7 @@ | 46 | @@ -24,7 +24,7 @@ |
69 | 47 | This page shows version information and contents of AUTHORS file located in top chekckbox-touch directory | 47 | This page shows version information and contents of AUTHORS file located in top chekckbox-converged directory |
70 | 48 | */ | 48 | */ |
71 | 49 | import QtQuick 2.0 | 49 | import QtQuick 2.0 |
72 | 50 | -import Ubuntu.Components 1.3 | 50 | -import Ubuntu.Components 1.3 |
73 | @@ -72,10 +72,10 @@ | |||
74 | 72 | topMargin: units.gu(3) | 72 | topMargin: units.gu(3) |
75 | 73 | bottomMargin: units.gu(3) | 73 | bottomMargin: units.gu(3) |
76 | 74 | leftMargin: units.gu(1) | 74 | leftMargin: units.gu(1) |
78 | 75 | diff --git b/checkbox-touch/components/AutomatedTestPage.qml a/checkbox-touch/components/AutomatedTestPage.qml | 75 | diff --git b/converged/components/AutomatedTestPage.qml a/converged/components/AutomatedTestPage.qml |
79 | 76 | index 49e9ba2..7102aa9 100644 | 76 | index 49e9ba2..7102aa9 100644 |
82 | 77 | --- b/checkbox-touch/components/AutomatedTestPage.qml | 77 | --- b/converged/components/AutomatedTestPage.qml |
83 | 78 | +++ a/checkbox-touch/components/AutomatedTestPage.qml | 78 | +++ a/converged/components/AutomatedTestPage.qml |
84 | 79 | @@ -20,7 +20,7 @@ | 79 | @@ -20,7 +20,7 @@ |
85 | 80 | */ | 80 | */ |
86 | 81 | 81 | ||
87 | @@ -101,10 +101,10 @@ | |||
88 | 101 | 101 | ||
89 | 102 | TestPageBody { | 102 | TestPageBody { |
90 | 103 | header: test["name"] | 103 | header: test["name"] |
92 | 104 | diff --git b/checkbox-touch/components/CbtDialog.qml a/checkbox-touch/components/CbtDialog.qml | 104 | diff --git b/converged/components/CbtDialog.qml a/converged/components/CbtDialog.qml |
93 | 105 | index a7e36c3..ab3f281 100644 | 105 | index a7e36c3..ab3f281 100644 |
96 | 106 | --- b/checkbox-touch/components/CbtDialog.qml | 106 | --- b/converged/components/CbtDialog.qml |
97 | 107 | +++ a/checkbox-touch/components/CbtDialog.qml | 107 | +++ a/converged/components/CbtDialog.qml |
98 | 108 | @@ -19,8 +19,8 @@ | 108 | @@ -19,8 +19,8 @@ |
99 | 109 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 109 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
100 | 110 | */ | 110 | */ |
101 | @@ -116,10 +116,10 @@ | |||
102 | 116 | import QtQuick.Layouts 1.1 | 116 | import QtQuick.Layouts 1.1 |
103 | 117 | 117 | ||
104 | 118 | /*! \brief Common dialog popup. | 118 | /*! \brief Common dialog popup. |
106 | 119 | diff --git b/checkbox-touch/components/CheckboxTouchApplication.qml a/checkbox-touch/components/CheckboxTouchApplication.qml | 119 | diff --git b/converged/components/CheckboxConvergedApplication.qml a/converged/components/CheckboxConvergedApplication.qml |
107 | 120 | index 2aa8df3..46b92b4 100644 | 120 | index 2aa8df3..46b92b4 100644 |
110 | 121 | --- b/checkbox-touch/components/CheckboxTouchApplication.qml | 121 | --- b/converged/components/CheckboxConvergedApplication.qml |
111 | 122 | +++ a/checkbox-touch/components/CheckboxTouchApplication.qml | 122 | +++ a/converged/components/CheckboxConvergedApplication.qml |
112 | 123 | @@ -21,6 +21,7 @@ | 123 | @@ -21,6 +21,7 @@ |
113 | 124 | */ | 124 | */ |
114 | 125 | 125 | ||
115 | @@ -128,10 +128,10 @@ | |||
116 | 128 | 128 | ||
117 | 129 | PythonObjectRef { | 129 | PythonObjectRef { |
118 | 130 | id: app | 130 | id: app |
120 | 131 | diff --git b/checkbox-touch/components/CommandOutputPage.qml a/checkbox-touch/components/CommandOutputPage.qml | 131 | diff --git b/converged/components/CommandOutputPage.qml a/converged/components/CommandOutputPage.qml |
121 | 132 | index 52a534f..144c4d0 100644 | 132 | index 52a534f..144c4d0 100644 |
124 | 133 | --- b/checkbox-touch/components/CommandOutputPage.qml | 133 | --- b/converged/components/CommandOutputPage.qml |
125 | 134 | +++ a/checkbox-touch/components/CommandOutputPage.qml | 134 | +++ a/converged/components/CommandOutputPage.qml |
126 | 135 | @@ -24,8 +24,8 @@ | 135 | @@ -24,8 +24,8 @@ |
127 | 136 | */ | 136 | */ |
128 | 137 | 137 | ||
129 | @@ -177,10 +177,10 @@ | |||
130 | 177 | } | 177 | } |
131 | 178 | 178 | ||
132 | 179 | Timer { | 179 | Timer { |
134 | 180 | diff --git b/checkbox-touch/components/CommentsDialog.qml a/checkbox-touch/components/CommentsDialog.qml | 180 | diff --git b/converged/components/CommentsDialog.qml a/converged/components/CommentsDialog.qml |
135 | 181 | index 3323788..8dc1b6c 100644 | 181 | index 3323788..8dc1b6c 100644 |
138 | 182 | --- b/checkbox-touch/components/CommentsDialog.qml | 182 | --- b/converged/components/CommentsDialog.qml |
139 | 183 | +++ a/checkbox-touch/components/CommentsDialog.qml | 183 | +++ a/converged/components/CommentsDialog.qml |
140 | 184 | @@ -19,8 +19,8 @@ | 184 | @@ -19,8 +19,8 @@ |
141 | 185 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 185 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
142 | 186 | */ | 186 | */ |
143 | @@ -192,10 +192,10 @@ | |||
144 | 192 | 192 | ||
145 | 193 | /*! \brief Comment addition dialog. | 193 | /*! \brief Comment addition dialog. |
146 | 194 | \inherits Item | 194 | \inherits Item |
148 | 195 | diff --git b/checkbox-touch/components/ConfirmationDialog.qml a/checkbox-touch/components/ConfirmationDialog.qml | 195 | diff --git b/converged/components/ConfirmationDialog.qml a/converged/components/ConfirmationDialog.qml |
149 | 196 | index 25e8734..44e8963 100644 | 196 | index 25e8734..44e8963 100644 |
152 | 197 | --- b/checkbox-touch/components/ConfirmationDialog.qml | 197 | --- b/converged/components/ConfirmationDialog.qml |
153 | 198 | +++ a/checkbox-touch/components/ConfirmationDialog.qml | 198 | +++ a/converged/components/ConfirmationDialog.qml |
154 | 199 | @@ -19,8 +19,8 @@ | 199 | @@ -19,8 +19,8 @@ |
155 | 200 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 200 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
156 | 201 | */ | 201 | */ |
157 | @@ -207,10 +207,10 @@ | |||
158 | 207 | 207 | ||
159 | 208 | /*! \brief Skip-confirmation dialog. | 208 | /*! \brief Skip-confirmation dialog. |
160 | 209 | \inherits Item | 209 | \inherits Item |
162 | 210 | diff --git b/checkbox-touch/components/ErrorDialog.qml a/checkbox-touch/components/ErrorDialog.qml | 210 | diff --git b/converged/components/ErrorDialog.qml a/converged/components/ErrorDialog.qml |
163 | 211 | index edbcc1a..688e68a 100644 | 211 | index edbcc1a..688e68a 100644 |
166 | 212 | --- b/checkbox-touch/components/ErrorDialog.qml | 212 | --- b/converged/components/ErrorDialog.qml |
167 | 213 | +++ a/checkbox-touch/components/ErrorDialog.qml | 213 | +++ a/converged/components/ErrorDialog.qml |
168 | 214 | @@ -19,8 +19,8 @@ | 214 | @@ -19,8 +19,8 @@ |
169 | 215 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 215 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
170 | 216 | */ | 216 | */ |
171 | @@ -222,10 +222,10 @@ | |||
172 | 222 | 222 | ||
173 | 223 | /*! \brief Error message popup. | 223 | /*! \brief Error message popup. |
174 | 224 | \inherits Item | 224 | \inherits Item |
176 | 225 | diff --git b/checkbox-touch/components/InputDialog.qml a/checkbox-touch/components/InputDialog.qml | 225 | diff --git b/converged/components/InputDialog.qml a/converged/components/InputDialog.qml |
177 | 226 | index a9d9776..99fa4c5 100644 | 226 | index a9d9776..99fa4c5 100644 |
180 | 227 | --- b/checkbox-touch/components/InputDialog.qml | 227 | --- b/converged/components/InputDialog.qml |
181 | 228 | +++ a/checkbox-touch/components/InputDialog.qml | 228 | +++ a/converged/components/InputDialog.qml |
182 | 229 | @@ -19,8 +19,8 @@ | 229 | @@ -19,8 +19,8 @@ |
183 | 230 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 230 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
184 | 231 | */ | 231 | */ |
185 | @@ -237,10 +237,10 @@ | |||
186 | 237 | 237 | ||
187 | 238 | /*! \brief Simple input dialog. | 238 | /*! \brief Simple input dialog. |
188 | 239 | \inherits Item | 239 | \inherits Item |
190 | 240 | diff --git b/checkbox-touch/components/InteractIntroPage.qml a/checkbox-touch/components/InteractIntroPage.qml | 240 | diff --git b/converged/components/InteractIntroPage.qml a/converged/components/InteractIntroPage.qml |
191 | 241 | index 01e285b..d62965f 100644 | 241 | index 01e285b..d62965f 100644 |
194 | 242 | --- b/checkbox-touch/components/InteractIntroPage.qml | 242 | --- b/converged/components/InteractIntroPage.qml |
195 | 243 | +++ a/checkbox-touch/components/InteractIntroPage.qml | 243 | +++ a/converged/components/InteractIntroPage.qml |
196 | 244 | @@ -27,8 +27,8 @@ | 244 | @@ -27,8 +27,8 @@ |
197 | 245 | */ | 245 | */ |
198 | 246 | 246 | ||
199 | @@ -289,10 +289,10 @@ | |||
200 | 289 | } | 289 | } |
201 | 290 | 290 | ||
202 | 291 | state: "idle" | 291 | state: "idle" |
204 | 292 | diff --git b/checkbox-touch/components/LatchButton.qml a/checkbox-touch/components/LatchButton.qml | 292 | diff --git b/converged/components/LatchButton.qml a/converged/components/LatchButton.qml |
205 | 293 | index 8fe9252..b1ea81b 100644 | 293 | index 8fe9252..b1ea81b 100644 |
208 | 294 | --- b/checkbox-touch/components/LatchButton.qml | 294 | --- b/converged/components/LatchButton.qml |
209 | 295 | +++ a/checkbox-touch/components/LatchButton.qml | 295 | +++ a/converged/components/LatchButton.qml |
210 | 296 | @@ -20,7 +20,7 @@ | 296 | @@ -20,7 +20,7 @@ |
211 | 297 | */ | 297 | */ |
212 | 298 | 298 | ||
213 | @@ -302,10 +302,10 @@ | |||
214 | 302 | 302 | ||
215 | 303 | /*! \brief Latch button. | 303 | /*! \brief Latch button. |
216 | 304 | \inherits Button | 304 | \inherits Button |
218 | 305 | diff --git b/checkbox-touch/components/ListItemWrappable.qml a/checkbox-touch/components/ListItemWrappable.qml | 305 | diff --git b/converged/components/ListItemWrappable.qml a/converged/components/ListItemWrappable.qml |
219 | 306 | index e9297bf..a380ea2 100644 | 306 | index e9297bf..a380ea2 100644 |
222 | 307 | --- b/checkbox-touch/components/ListItemWrappable.qml | 307 | --- b/converged/components/ListItemWrappable.qml |
223 | 308 | +++ a/checkbox-touch/components/ListItemWrappable.qml | 308 | +++ a/converged/components/ListItemWrappable.qml |
224 | 309 | @@ -19,7 +19,7 @@ | 309 | @@ -19,7 +19,7 @@ |
225 | 310 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 310 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
226 | 311 | */ | 311 | */ |
227 | @@ -315,10 +315,10 @@ | |||
228 | 315 | import Ubuntu.Components.ListItems 1.0 | 315 | import Ubuntu.Components.ListItems 1.0 |
229 | 316 | 316 | ||
230 | 317 | /*! \brief ListItemWrappable | 317 | /*! \brief ListItemWrappable |
232 | 318 | diff --git b/checkbox-touch/components/ManualIntroPage.qml a/checkbox-touch/components/ManualIntroPage.qml | 318 | diff --git b/converged/components/ManualIntroPage.qml a/converged/components/ManualIntroPage.qml |
233 | 319 | index 0fce6f5..afe007a 100644 | 319 | index 0fce6f5..afe007a 100644 |
236 | 320 | --- b/checkbox-touch/components/ManualIntroPage.qml | 320 | --- b/converged/components/ManualIntroPage.qml |
237 | 321 | +++ a/checkbox-touch/components/ManualIntroPage.qml | 321 | +++ a/converged/components/ManualIntroPage.qml |
238 | 322 | @@ -26,9 +26,9 @@ | 322 | @@ -26,9 +26,9 @@ |
239 | 323 | */ | 323 | */ |
240 | 324 | 324 | ||
241 | @@ -368,10 +368,10 @@ | |||
242 | 368 | } | 368 | } |
243 | 369 | 369 | ||
244 | 370 | TestPageBody { | 370 | TestPageBody { |
246 | 371 | diff --git b/checkbox-touch/components/PasswordDialog.qml a/checkbox-touch/components/PasswordDialog.qml | 371 | diff --git b/converged/components/PasswordDialog.qml a/converged/components/PasswordDialog.qml |
247 | 372 | index dea1b0f..c3931bc 100644 | 372 | index dea1b0f..c3931bc 100644 |
250 | 373 | --- b/checkbox-touch/components/PasswordDialog.qml | 373 | --- b/converged/components/PasswordDialog.qml |
251 | 374 | +++ a/checkbox-touch/components/PasswordDialog.qml | 374 | +++ a/converged/components/PasswordDialog.qml |
252 | 375 | @@ -19,8 +19,8 @@ | 375 | @@ -19,8 +19,8 @@ |
253 | 376 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 376 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
254 | 377 | */ | 377 | */ |
255 | @@ -383,10 +383,10 @@ | |||
256 | 383 | 383 | ||
257 | 384 | /*! \brief Password prompt dialog. | 384 | /*! \brief Password prompt dialog. |
258 | 385 | \inherits Item | 385 | \inherits Item |
260 | 386 | diff --git b/checkbox-touch/components/ProgressBox.qml a/checkbox-touch/components/ProgressBox.qml | 386 | diff --git b/converged/components/ProgressBox.qml a/converged/components/ProgressBox.qml |
261 | 387 | index b9fc720..a2b5d05 100644 | 387 | index b9fc720..a2b5d05 100644 |
264 | 388 | --- b/checkbox-touch/components/ProgressBox.qml | 388 | --- b/converged/components/ProgressBox.qml |
265 | 389 | +++ a/checkbox-touch/components/ProgressBox.qml | 389 | +++ a/converged/components/ProgressBox.qml |
266 | 390 | @@ -20,7 +20,7 @@ | 390 | @@ -20,7 +20,7 @@ |
267 | 391 | */ | 391 | */ |
268 | 392 | 392 | ||
269 | @@ -396,10 +396,10 @@ | |||
270 | 396 | import QtQuick.Layouts 1.1 | 396 | import QtQuick.Layouts 1.1 |
271 | 397 | 397 | ||
272 | 398 | /*! \brief Progress Box. | 398 | /*! \brief Progress Box. |
274 | 399 | diff --git b/checkbox-touch/components/ProgressHeader.qml a/checkbox-touch/components/ProgressHeader.qml | 399 | diff --git b/converged/components/ProgressHeader.qml a/converged/components/ProgressHeader.qml |
275 | 400 | deleted file mode 100644 | 400 | deleted file mode 100644 |
276 | 401 | index a7db263..0000000 | 401 | index a7db263..0000000 |
278 | 402 | --- b/checkbox-touch/components/ProgressHeader.qml | 402 | --- b/converged/components/ProgressHeader.qml |
279 | 403 | +++ /dev/null | 403 | +++ /dev/null |
280 | 404 | @@ -1,59 +0,0 @@ | 404 | @@ -1,59 +0,0 @@ |
281 | 405 | -/* | 405 | -/* |
282 | @@ -461,10 +461,10 @@ | |||
283 | 461 | - } | 461 | - } |
284 | 462 | - } | 462 | - } |
285 | 463 | -} | 463 | -} |
287 | 464 | diff --git b/checkbox-touch/components/QmlConfinedPage.qml a/checkbox-touch/components/QmlConfinedPage.qml | 464 | diff --git b/converged/components/QmlConfinedPage.qml a/converged/components/QmlConfinedPage.qml |
288 | 465 | index 0c8f773..527525f 100644 | 465 | index 0c8f773..527525f 100644 |
291 | 466 | --- b/checkbox-touch/components/QmlConfinedPage.qml | 466 | --- b/converged/components/QmlConfinedPage.qml |
292 | 467 | +++ a/checkbox-touch/components/QmlConfinedPage.qml | 467 | +++ a/converged/components/QmlConfinedPage.qml |
293 | 468 | @@ -23,8 +23,8 @@ | 468 | @@ -23,8 +23,8 @@ |
294 | 469 | */ | 469 | */ |
295 | 470 | 470 | ||
296 | @@ -520,10 +520,10 @@ | |||
297 | 520 | } | 520 | } |
298 | 521 | 521 | ||
299 | 522 | TestPageBody { | 522 | TestPageBody { |
301 | 523 | diff --git b/checkbox-touch/components/QmlNativePage.qml a/checkbox-touch/components/QmlNativePage.qml | 523 | diff --git b/converged/components/QmlNativePage.qml a/converged/components/QmlNativePage.qml |
302 | 524 | index 8928f60..a33a883 100644 | 524 | index 8928f60..a33a883 100644 |
305 | 525 | --- b/checkbox-touch/components/QmlNativePage.qml | 525 | --- b/converged/components/QmlNativePage.qml |
306 | 526 | +++ a/checkbox-touch/components/QmlNativePage.qml | 526 | +++ a/converged/components/QmlNativePage.qml |
307 | 527 | @@ -23,8 +23,8 @@ | 527 | @@ -23,8 +23,8 @@ |
308 | 528 | */ | 528 | */ |
309 | 529 | 529 | ||
310 | @@ -579,10 +579,10 @@ | |||
311 | 579 | } | 579 | } |
312 | 580 | 580 | ||
313 | 581 | TestPageBody { | 581 | TestPageBody { |
315 | 582 | diff --git b/checkbox-touch/components/ResultsPage.qml a/checkbox-touch/components/ResultsPage.qml | 582 | diff --git b/converged/components/ResultsPage.qml a/converged/components/ResultsPage.qml |
316 | 583 | index 35fdcd1..ca6d567 100644 | 583 | index 35fdcd1..ca6d567 100644 |
319 | 584 | --- b/checkbox-touch/components/ResultsPage.qml | 584 | --- b/converged/components/ResultsPage.qml |
320 | 585 | +++ a/checkbox-touch/components/ResultsPage.qml | 585 | +++ a/converged/components/ResultsPage.qml |
321 | 586 | @@ -26,10 +26,11 @@ | 586 | @@ -26,10 +26,11 @@ |
322 | 587 | */ | 587 | */ |
323 | 588 | 588 | ||
324 | @@ -652,10 +652,10 @@ | |||
325 | 652 | topMargin: units.gu(3) | 652 | topMargin: units.gu(3) |
326 | 653 | bottomMargin: units.gu(3) | 653 | bottomMargin: units.gu(3) |
327 | 654 | leftMargin: units.gu(1) | 654 | leftMargin: units.gu(1) |
329 | 655 | diff --git b/checkbox-touch/components/ResumeSessionPage.qml a/checkbox-touch/components/ResumeSessionPage.qml | 655 | diff --git b/converged/components/ResumeSessionPage.qml a/converged/components/ResumeSessionPage.qml |
330 | 656 | index cbfbb59..ad57715 100644 | 656 | index cbfbb59..ad57715 100644 |
333 | 657 | --- b/checkbox-touch/components/ResumeSessionPage.qml | 657 | --- b/converged/components/ResumeSessionPage.qml |
334 | 658 | +++ a/checkbox-touch/components/ResumeSessionPage.qml | 658 | +++ a/converged/components/ResumeSessionPage.qml |
335 | 659 | @@ -26,7 +26,7 @@ | 659 | @@ -26,7 +26,7 @@ |
336 | 660 | */ | 660 | */ |
337 | 661 | 661 | ||
338 | @@ -689,10 +689,10 @@ | |||
339 | 689 | topMargin: units.gu(3) | 689 | topMargin: units.gu(3) |
340 | 690 | bottomMargin: units.gu(3) | 690 | bottomMargin: units.gu(3) |
341 | 691 | leftMargin: units.gu(1) | 691 | leftMargin: units.gu(1) |
343 | 692 | diff --git b/checkbox-touch/components/SelectionPage.qml a/checkbox-touch/components/SelectionPage.qml | 692 | diff --git b/converged/components/SelectionPage.qml a/converged/components/SelectionPage.qml |
344 | 693 | index 6df9cb1..fbc2e75 100644 | 693 | index 6df9cb1..fbc2e75 100644 |
347 | 694 | --- b/checkbox-touch/components/SelectionPage.qml | 694 | --- b/converged/components/SelectionPage.qml |
348 | 695 | +++ a/checkbox-touch/components/SelectionPage.qml | 695 | +++ a/converged/components/SelectionPage.qml |
349 | 696 | @@ -21,7 +21,7 @@ | 696 | @@ -21,7 +21,7 @@ |
350 | 697 | 697 | ||
351 | 698 | import QtQuick 2.0 | 698 | import QtQuick 2.0 |
352 | @@ -809,10 +809,10 @@ | |||
353 | 809 | bottomMargin: units.gu(3) | 809 | bottomMargin: units.gu(3) |
354 | 810 | leftMargin: units.gu(1) | 810 | leftMargin: units.gu(1) |
355 | 811 | rightMargin: units.gu(1) | 811 | rightMargin: units.gu(1) |
357 | 812 | diff --git b/checkbox-touch/components/TestPageBody.qml a/checkbox-touch/components/TestPageBody.qml | 812 | diff --git b/converged/components/TestPageBody.qml a/converged/components/TestPageBody.qml |
358 | 813 | index 73832e2..9693dae 100644 | 813 | index 73832e2..9693dae 100644 |
361 | 814 | --- b/checkbox-touch/components/TestPageBody.qml | 814 | --- b/converged/components/TestPageBody.qml |
362 | 815 | +++ a/checkbox-touch/components/TestPageBody.qml | 815 | +++ a/converged/components/TestPageBody.qml |
363 | 816 | @@ -25,8 +25,8 @@ | 816 | @@ -25,8 +25,8 @@ |
364 | 817 | 817 | ||
365 | 818 | import QtQuick 2.0 | 818 | import QtQuick 2.0 |
366 | @@ -836,10 +836,10 @@ | |||
367 | 836 | topMargin: units.gu(3) | 836 | topMargin: units.gu(3) |
368 | 837 | bottomMargin: units.gu(3) | 837 | bottomMargin: units.gu(3) |
369 | 838 | leftMargin: units.gu(1) | 838 | leftMargin: units.gu(1) |
371 | 839 | diff --git b/checkbox-touch/components/TestVerificationPage.qml a/checkbox-touch/components/TestVerificationPage.qml | 839 | diff --git b/converged/components/TestVerificationPage.qml a/converged/components/TestVerificationPage.qml |
372 | 840 | index 2178ffb..ad86d85 100644 | 840 | index 2178ffb..ad86d85 100644 |
375 | 841 | --- b/checkbox-touch/components/TestVerificationPage.qml | 841 | --- b/converged/components/TestVerificationPage.qml |
376 | 842 | +++ a/checkbox-touch/components/TestVerificationPage.qml | 842 | +++ a/converged/components/TestVerificationPage.qml |
377 | 843 | @@ -26,9 +26,9 @@ | 843 | @@ -26,9 +26,9 @@ |
378 | 844 | */ | 844 | */ |
379 | 845 | 845 | ||
380 | @@ -889,10 +889,10 @@ | |||
381 | 889 | } | 889 | } |
382 | 890 | 890 | ||
383 | 891 | TestPageBody { | 891 | TestPageBody { |
385 | 892 | diff --git b/checkbox-touch/components/UserInteractSummaryPage.qml a/checkbox-touch/components/UserInteractSummaryPage.qml | 892 | diff --git b/converged/components/UserInteractSummaryPage.qml a/converged/components/UserInteractSummaryPage.qml |
386 | 893 | index 8f3ca06..2dc286d 100644 | 893 | index 8f3ca06..2dc286d 100644 |
389 | 894 | --- b/checkbox-touch/components/UserInteractSummaryPage.qml | 894 | --- b/converged/components/UserInteractSummaryPage.qml |
390 | 895 | +++ a/checkbox-touch/components/UserInteractSummaryPage.qml | 895 | +++ a/converged/components/UserInteractSummaryPage.qml |
391 | 896 | @@ -26,8 +26,8 @@ | 896 | @@ -26,8 +26,8 @@ |
392 | 897 | */ | 897 | */ |
393 | 898 | 898 | ||
394 | @@ -941,10 +941,10 @@ | |||
395 | 941 | } | 941 | } |
396 | 942 | 942 | ||
397 | 943 | TestPageBody { | 943 | TestPageBody { |
399 | 944 | diff --git b/checkbox-touch/components/WebViewer.qml a/checkbox-touch/components/WebViewer.qml | 944 | diff --git b/converged/components/WebViewer.qml a/converged/components/WebViewer.qml |
400 | 945 | index 0348919..7b5ef78 100644 | 945 | index 0348919..7b5ef78 100644 |
403 | 946 | --- b/checkbox-touch/components/WebViewer.qml | 946 | --- b/converged/components/WebViewer.qml |
404 | 947 | +++ a/checkbox-touch/components/WebViewer.qml | 947 | +++ a/converged/components/WebViewer.qml |
405 | 948 | @@ -21,7 +21,7 @@ | 948 | @@ -21,7 +21,7 @@ |
406 | 949 | 949 | ||
407 | 950 | import QtQuick 2.0 | 950 | import QtQuick 2.0 |
408 | @@ -954,10 +954,10 @@ | |||
409 | 954 | 954 | ||
410 | 955 | 955 | ||
411 | 956 | Page { | 956 | Page { |
413 | 957 | diff --git b/checkbox-touch/components/WelcomePage.qml a/checkbox-touch/components/WelcomePage.qml | 957 | diff --git b/converged/components/WelcomePage.qml a/converged/components/WelcomePage.qml |
414 | 958 | index a310e41..cf328d0 100644 | 958 | index a310e41..cf328d0 100644 |
417 | 959 | --- b/checkbox-touch/components/WelcomePage.qml | 959 | --- b/converged/components/WelcomePage.qml |
418 | 960 | +++ a/checkbox-touch/components/WelcomePage.qml | 960 | +++ a/converged/components/WelcomePage.qml |
419 | 961 | @@ -21,7 +21,7 @@ | 961 | @@ -21,7 +21,7 @@ |
420 | 962 | */ | 962 | */ |
421 | 963 | 963 | ||
422 | @@ -1001,10 +1001,10 @@ | |||
423 | 1001 | Label { | 1001 | Label { |
424 | 1002 | id: welcomeText | 1002 | id: welcomeText |
425 | 1003 | 1003 | ||
427 | 1004 | diff --git b/checkbox-touch/components/actions/AddCommentAction.qml a/checkbox-touch/components/actions/AddCommentAction.qml | 1004 | diff --git b/converged/components/actions/AddCommentAction.qml a/converged/components/actions/AddCommentAction.qml |
428 | 1005 | index b3977ce..d7daf53 100644 | 1005 | index b3977ce..d7daf53 100644 |
431 | 1006 | --- b/checkbox-touch/components/actions/AddCommentAction.qml | 1006 | --- b/converged/components/actions/AddCommentAction.qml |
432 | 1007 | +++ a/checkbox-touch/components/actions/AddCommentAction.qml | 1007 | +++ a/converged/components/actions/AddCommentAction.qml |
433 | 1008 | @@ -22,8 +22,8 @@ | 1008 | @@ -22,8 +22,8 @@ |
434 | 1009 | /*! \brief Action component for adding a comment. */ | 1009 | /*! \brief Action component for adding a comment. */ |
435 | 1010 | 1010 | ||
436 | @@ -1016,10 +1016,10 @@ | |||
437 | 1016 | 1016 | ||
438 | 1017 | Action { | 1017 | Action { |
439 | 1018 | id: addCommentAction | 1018 | id: addCommentAction |
441 | 1019 | diff --git b/checkbox-touch/components/actions/SkipAction.qml a/checkbox-touch/components/actions/SkipAction.qml | 1019 | diff --git b/converged/components/actions/SkipAction.qml a/converged/components/actions/SkipAction.qml |
442 | 1020 | index 124c7dd..712d746 100644 | 1020 | index 124c7dd..712d746 100644 |
445 | 1021 | --- b/checkbox-touch/components/actions/SkipAction.qml | 1021 | --- b/converged/components/actions/SkipAction.qml |
446 | 1022 | +++ a/checkbox-touch/components/actions/SkipAction.qml | 1022 | +++ a/converged/components/actions/SkipAction.qml |
447 | 1023 | @@ -22,8 +22,8 @@ | 1023 | @@ -22,8 +22,8 @@ |
448 | 1024 | /*! \brief Action component for skipping a test. */ | 1024 | /*! \brief Action component for skipping a test. */ |
449 | 1025 | 1025 | ||
450 | @@ -1031,10 +1031,10 @@ | |||
451 | 1031 | 1031 | ||
452 | 1032 | Action { | 1032 | Action { |
453 | 1033 | id: skipAction | 1033 | id: skipAction |
455 | 1034 | diff --git b/checkbox-touch/tests/autopilot/checkbox_touch/__init__.py a/checkbox-touch/tests/autopilot/checkbox_touch/__init__.py | 1034 | diff --git b/converged/tests/autopilot/checkbox_converged/__init__.py a/converged/tests/autopilot/checkbox_converged/__init__.py |
456 | 1035 | index 547ab73..77e5220 100644 | 1035 | index 547ab73..77e5220 100644 |
459 | 1036 | --- b/checkbox-touch/tests/autopilot/checkbox_touch/__init__.py | 1036 | --- b/converged/tests/autopilot/checkbox_converged/__init__.py |
460 | 1037 | +++ a/checkbox-touch/tests/autopilot/checkbox_touch/__init__.py | 1037 | +++ a/converged/tests/autopilot/checkbox_converged/__init__.py |
461 | 1038 | @@ -87,7 +87,7 @@ class ClickAppTestCase(base.UbuntuUIToolkitAppTestCase): | 1038 | @@ -87,7 +87,7 @@ class ClickAppTestCase(base.UbuntuUIToolkitAppTestCase): |
462 | 1039 | self.pointing_device.click_object(continue_btn) | 1039 | self.pointing_device.click_object(continue_btn) |
463 | 1040 | category_page = self.app.wait_select_single( | 1040 | category_page = self.app.wait_select_single( |
464 | @@ -1065,11 +1065,11 @@ | |||
465 | 1065 | def _launch_application_from_phablet(self): | 1065 | def _launch_application_from_phablet(self): |
466 | 1066 | # On phablet, we only run the tests against the installed click | 1066 | # On phablet, we only run the tests against the installed click |
467 | 1067 | # package. | 1067 | # package. |
469 | 1068 | diff --git b/checkbox-touch/tests/autopilot/checkbox_touch/test_checkbox_touch.py a/checkbox-touch/tests/autopilot/checkbox_touch/test_checkbox_touch.py | 1068 | diff --git b/converged/tests/autopilot/checkbox_converged/test_checkbox_converged.py a/converged/tests/autopilot/checkbox_converged/test_checkbox_converged.py |
470 | 1069 | index e9fe916..c0bf6a3 100644 | 1069 | index e9fe916..c0bf6a3 100644 |
474 | 1070 | --- b/checkbox-touch/tests/autopilot/checkbox_touch/test_checkbox_touch.py | 1070 | --- b/converged/tests/autopilot/checkbox_converged/test_checkbox_converged.py |
475 | 1071 | +++ a/checkbox-touch/tests/autopilot/checkbox_touch/test_checkbox_touch.py | 1071 | +++ a/converged/tests/autopilot/checkbox_converged/test_checkbox_converged.py |
476 | 1072 | @@ -19,7 +19,7 @@ class TestCheckboxTouch(checkbox_touch.ClickAppTestCase): | 1072 | @@ -19,7 +19,7 @@ class TestCheckboxConverged(checkbox_converged.ClickAppTestCase): |
477 | 1073 | if selectable_object_name is not None: | 1073 | if selectable_object_name is not None: |
478 | 1074 | self.app.wait_select_single( | 1074 | self.app.wait_select_single( |
479 | 1075 | objectName=selectable_object_name, visible=True) | 1075 | objectName=selectable_object_name, visible=True) |
480 | @@ -1078,7 +1078,7 @@ | |||
481 | 1078 | dialog = self.app.wait_select_single(objectName='dialog') | 1078 | dialog = self.app.wait_select_single(objectName='dialog') |
482 | 1079 | yes_btn = dialog.select_single(objectName='yesButton') | 1079 | yes_btn = dialog.select_single(objectName='yesButton') |
483 | 1080 | self.pointing_device.click_object(yes_btn) | 1080 | self.pointing_device.click_object(yes_btn) |
485 | 1081 | @@ -62,7 +62,7 @@ class TestCheckboxTouch(checkbox_touch.ClickAppTestCase): | 1081 | @@ -62,7 +62,7 @@ class TestCheckboxConverged(checkbox_converged.ClickAppTestCase): |
486 | 1082 | self.pointing_device.click_object(continue_btn) | 1082 | self.pointing_device.click_object(continue_btn) |
487 | 1083 | category_page = self.app.wait_select_single( | 1083 | category_page = self.app.wait_select_single( |
488 | 1084 | objectName='categorySelectionPage', visible=True) | 1084 | objectName='categorySelectionPage', visible=True) |
489 | @@ -1087,7 +1087,7 @@ | |||
490 | 1087 | category_id = '2015.com.canonical.certification::normal' | 1087 | category_id = '2015.com.canonical.certification::normal' |
491 | 1088 | list_item = category_page.wait_select_single( | 1088 | list_item = category_page.wait_select_single( |
492 | 1089 | objectName='listItem', item_mod_id=category_id) | 1089 | objectName='listItem', item_mod_id=category_id) |
494 | 1090 | @@ -299,7 +299,7 @@ class RerunTests(checkbox_touch.ClickAppTestCase): | 1090 | @@ -299,7 +299,7 @@ class RerunTests(checkbox_converged.ClickAppTestCase): |
495 | 1091 | self.process_sequence_of_clicks_on_pages(next_steps) | 1091 | self.process_sequence_of_clicks_on_pages(next_steps) |
496 | 1092 | results_page = self.app.wait_select_single( | 1092 | results_page = self.app.wait_select_single( |
497 | 1093 | objectName='resultsPage', visible=True) | 1093 | objectName='resultsPage', visible=True) |
498 | @@ -1096,7 +1096,7 @@ | |||
499 | 1096 | # we now should see a re-run screen; let's select the only test | 1096 | # we now should see a re-run screen; let's select the only test |
500 | 1097 | rerun_page = self.app.wait_select_single( | 1097 | rerun_page = self.app.wait_select_single( |
501 | 1098 | objectName='rerunSelectionPage', visible=True) | 1098 | objectName='rerunSelectionPage', visible=True) |
503 | 1099 | @@ -313,7 +313,7 @@ class RerunTests(checkbox_touch.ClickAppTestCase): | 1099 | @@ -313,7 +313,7 @@ class RerunTests(checkbox_converged.ClickAppTestCase): |
504 | 1100 | self.process_sequence_of_clicks_on_pages(next_steps) | 1100 | self.process_sequence_of_clicks_on_pages(next_steps) |
505 | 1101 | results_page = self.app.wait_select_single( | 1101 | results_page = self.app.wait_select_single( |
506 | 1102 | objectName='resultsPage', visible=True) | 1102 | objectName='resultsPage', visible=True) |
507 | @@ -1105,7 +1105,7 @@ | |||
508 | 1105 | # we should see the re-run screen again | 1105 | # we should see the re-run screen again |
509 | 1106 | rerun_page = self.app.wait_select_single( | 1106 | rerun_page = self.app.wait_select_single( |
510 | 1107 | objectName='rerunSelectionPage', visible=True) | 1107 | objectName='rerunSelectionPage', visible=True) |
512 | 1108 | @@ -333,7 +333,7 @@ class RerunTests(checkbox_touch.ClickAppTestCase): | 1108 | @@ -333,7 +333,7 @@ class RerunTests(checkbox_converged.ClickAppTestCase): |
513 | 1109 | self.process_sequence_of_clicks_on_pages(next_steps) | 1109 | self.process_sequence_of_clicks_on_pages(next_steps) |
514 | 1110 | results_page = self.app.wait_select_single( | 1110 | results_page = self.app.wait_select_single( |
515 | 1111 | objectName='resultsPage', visible=True) | 1111 | objectName='resultsPage', visible=True) |
516 | @@ -1114,8 +1114,8 @@ | |||
517 | 1114 | # we now should see a re-run screen; let's select the only test | 1114 | # we now should see a re-run screen; let's select the only test |
518 | 1115 | rerun_page = self.app.wait_select_single( | 1115 | rerun_page = self.app.wait_select_single( |
519 | 1116 | objectName='rerunSelectionPage', visible=True) | 1116 | objectName='rerunSelectionPage', visible=True) |
522 | 1117 | --- a/checkbox-touch/components/DialogMgr.qml | 1117 | --- a/converged/components/DialogMgr.qml |
523 | 1118 | +++ b/checkbox-touch/components/DialogMgr.qml | 1118 | +++ b/converged/components/DialogMgr.qml |
524 | 1119 | @@ -19,8 +19,8 @@ | 1119 | @@ -19,8 +19,8 @@ |
525 | 1120 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 1120 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
526 | 1121 | */ | 1121 | */ |
527 | 1122 | 1122 | ||
528 | === modified file 'debian/rules' | |||
529 | --- debian/rules 2015-07-07 14:42:13 +0000 | |||
530 | +++ debian/rules 2016-09-29 12:09:15 +0000 | |||
531 | @@ -2,7 +2,7 @@ | |||
532 | 2 | export LANG= | 2 | export LANG= |
533 | 3 | export LANGUAGE= | 3 | export LANGUAGE= |
534 | 4 | export http_proxy=http://127.0.0.1:9 | 4 | export http_proxy=http://127.0.0.1:9 |
536 | 5 | PPA_DISPLACEMENT=checkbox-touch | 5 | PPA_DISPLACEMENT=converged |
537 | 6 | 6 | ||
538 | 7 | %: | 7 | %: |
539 | 8 | dh $@ --sourcedirectory=$(PPA_DISPLACEMENT) | 8 | dh $@ --sourcedirectory=$(PPA_DISPLACEMENT) |
I have some doubts with the patch, but let's tru to see where it fails (if it fails)