Merge lp:~kissiel/checkbox/ppa-packaging-touch2converged-trusty into lp:~checkbox-dev/checkbox/ppa-packaging-checkbox-converged-trusty

Proposed by Maciej Kisielewski on 2016-09-29
Status: Merged
Approved by: Sylvain Pineau on 2016-09-29
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
Reviewer Review Type Date Requested Status
Sylvain Pineau 2016-09-29 Approve on 2016-09-29
Review via email: mp+307168@code.launchpad.net

This proposal supersedes a proposal from 2016-09-29.

Description of the change

This MR updates packaging with new Checkbox-Converged files layout (Trusty).

To post a comment you must log in.
Sylvain Pineau (sylvain-pineau) wrote :

I have some doubts with the patch, but let's tru to see where it fails (if it fails)

review: Approve

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 [Desktop Entry]
6 Name=Checkbox Converged
7 Comment=System testing utility for Ubuntu
8-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
9-Icon=checkbox-touch.svg
10+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+Icon=checkbox-converged.svg
12 Terminal=false
13 Type=Application
14 X-Ubuntu-Touch=true
15
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 @@
20-checkbox-touch/py/__pycache__/*.pyc
21+converged/py/__pycache__/*.pyc
22
23
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 @@
28-checkbox-touch/checkbox-touch.qml usr/share/checkbox-converged/
29-checkbox-touch/checkbox-touch.svg usr/share/icons/hicolor/scalable/apps/
30-checkbox-touch/components usr/share/checkbox-converged/
31-checkbox-touch/py usr/share/checkbox-converged/
32-debian/checkbox-touch.desktop usr/share/applications
33+converged/checkbox-converged.qml usr/share/checkbox-converged/
34+converged/checkbox-converged.svg usr/share/icons/hicolor/scalable/apps/
35+converged/components usr/share/checkbox-converged/
36+converged/py usr/share/checkbox-converged/
37+debian/checkbox-converged.desktop usr/share/applications
38 debian/settings.json usr/share/checkbox-converged/
39 debian/tick.svg usr/share/icons/suru/actions/scalable/
40 debian/window-close.svg usr/share/icons/suru/actions/scalable/
41
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 @@
46-diff --git b/checkbox-touch/checkbox-touch.qml a/checkbox-touch/checkbox-touch.qml
47+diff --git b/converged/checkbox-converged.qml a/converged/checkbox-converged.qml
48 index cb896ef..c6c3b93 100644
49---- b/checkbox-touch/checkbox-touch.qml
50-+++ a/checkbox-touch/checkbox-touch.qml
51+--- b/converged/checkbox-converged.qml
52++++ a/converged/checkbox-converged.qml
53 @@ -20,8 +20,8 @@
54 * along with this program. If not, see <http://www.gnu.org/licenses/>.
55 */
56@@ -39,12 +39,12 @@
57 }
58 return pageObject;
59 }
60-diff --git b/checkbox-touch/components/AboutPage.qml a/checkbox-touch/components/AboutPage.qml
61+diff --git b/converged/components/AboutPage.qml a/converged/components/AboutPage.qml
62 index bb0f50e..d3de734 100644
63---- b/checkbox-touch/components/AboutPage.qml
64-+++ a/checkbox-touch/components/AboutPage.qml
65+--- b/converged/components/AboutPage.qml
66++++ a/converged/components/AboutPage.qml
67 @@ -24,7 +24,7 @@
68- This page shows version information and contents of AUTHORS file located in top chekckbox-touch directory
69+ This page shows version information and contents of AUTHORS file located in top chekckbox-converged directory
70 */
71 import QtQuick 2.0
72 -import Ubuntu.Components 1.3
73@@ -72,10 +72,10 @@
74 topMargin: units.gu(3)
75 bottomMargin: units.gu(3)
76 leftMargin: units.gu(1)
77-diff --git b/checkbox-touch/components/AutomatedTestPage.qml a/checkbox-touch/components/AutomatedTestPage.qml
78+diff --git b/converged/components/AutomatedTestPage.qml a/converged/components/AutomatedTestPage.qml
79 index 49e9ba2..7102aa9 100644
80---- b/checkbox-touch/components/AutomatedTestPage.qml
81-+++ a/checkbox-touch/components/AutomatedTestPage.qml
82+--- b/converged/components/AutomatedTestPage.qml
83++++ a/converged/components/AutomatedTestPage.qml
84 @@ -20,7 +20,7 @@
85 */
86
87@@ -101,10 +101,10 @@
88
89 TestPageBody {
90 header: test["name"]
91-diff --git b/checkbox-touch/components/CbtDialog.qml a/checkbox-touch/components/CbtDialog.qml
92+diff --git b/converged/components/CbtDialog.qml a/converged/components/CbtDialog.qml
93 index a7e36c3..ab3f281 100644
94---- b/checkbox-touch/components/CbtDialog.qml
95-+++ a/checkbox-touch/components/CbtDialog.qml
96+--- b/converged/components/CbtDialog.qml
97++++ a/converged/components/CbtDialog.qml
98 @@ -19,8 +19,8 @@
99 * along with this program. If not, see <http://www.gnu.org/licenses/>.
100 */
101@@ -116,10 +116,10 @@
102 import QtQuick.Layouts 1.1
103
104 /*! \brief Common dialog popup.
105-diff --git b/checkbox-touch/components/CheckboxTouchApplication.qml a/checkbox-touch/components/CheckboxTouchApplication.qml
106+diff --git b/converged/components/CheckboxConvergedApplication.qml a/converged/components/CheckboxConvergedApplication.qml
107 index 2aa8df3..46b92b4 100644
108---- b/checkbox-touch/components/CheckboxTouchApplication.qml
109-+++ a/checkbox-touch/components/CheckboxTouchApplication.qml
110+--- b/converged/components/CheckboxConvergedApplication.qml
111++++ a/converged/components/CheckboxConvergedApplication.qml
112 @@ -21,6 +21,7 @@
113 */
114
115@@ -128,10 +128,10 @@
116
117 PythonObjectRef {
118 id: app
119-diff --git b/checkbox-touch/components/CommandOutputPage.qml a/checkbox-touch/components/CommandOutputPage.qml
120+diff --git b/converged/components/CommandOutputPage.qml a/converged/components/CommandOutputPage.qml
121 index 52a534f..144c4d0 100644
122---- b/checkbox-touch/components/CommandOutputPage.qml
123-+++ a/checkbox-touch/components/CommandOutputPage.qml
124+--- b/converged/components/CommandOutputPage.qml
125++++ a/converged/components/CommandOutputPage.qml
126 @@ -24,8 +24,8 @@
127 */
128
129@@ -177,10 +177,10 @@
130 }
131
132 Timer {
133-diff --git b/checkbox-touch/components/CommentsDialog.qml a/checkbox-touch/components/CommentsDialog.qml
134+diff --git b/converged/components/CommentsDialog.qml a/converged/components/CommentsDialog.qml
135 index 3323788..8dc1b6c 100644
136---- b/checkbox-touch/components/CommentsDialog.qml
137-+++ a/checkbox-touch/components/CommentsDialog.qml
138+--- b/converged/components/CommentsDialog.qml
139++++ a/converged/components/CommentsDialog.qml
140 @@ -19,8 +19,8 @@
141 * along with this program. If not, see <http://www.gnu.org/licenses/>.
142 */
143@@ -192,10 +192,10 @@
144
145 /*! \brief Comment addition dialog.
146 \inherits Item
147-diff --git b/checkbox-touch/components/ConfirmationDialog.qml a/checkbox-touch/components/ConfirmationDialog.qml
148+diff --git b/converged/components/ConfirmationDialog.qml a/converged/components/ConfirmationDialog.qml
149 index 25e8734..44e8963 100644
150---- b/checkbox-touch/components/ConfirmationDialog.qml
151-+++ a/checkbox-touch/components/ConfirmationDialog.qml
152+--- b/converged/components/ConfirmationDialog.qml
153++++ a/converged/components/ConfirmationDialog.qml
154 @@ -19,8 +19,8 @@
155 * along with this program. If not, see <http://www.gnu.org/licenses/>.
156 */
157@@ -207,10 +207,10 @@
158
159 /*! \brief Skip-confirmation dialog.
160 \inherits Item
161-diff --git b/checkbox-touch/components/ErrorDialog.qml a/checkbox-touch/components/ErrorDialog.qml
162+diff --git b/converged/components/ErrorDialog.qml a/converged/components/ErrorDialog.qml
163 index edbcc1a..688e68a 100644
164---- b/checkbox-touch/components/ErrorDialog.qml
165-+++ a/checkbox-touch/components/ErrorDialog.qml
166+--- b/converged/components/ErrorDialog.qml
167++++ a/converged/components/ErrorDialog.qml
168 @@ -19,8 +19,8 @@
169 * along with this program. If not, see <http://www.gnu.org/licenses/>.
170 */
171@@ -222,10 +222,10 @@
172
173 /*! \brief Error message popup.
174 \inherits Item
175-diff --git b/checkbox-touch/components/InputDialog.qml a/checkbox-touch/components/InputDialog.qml
176+diff --git b/converged/components/InputDialog.qml a/converged/components/InputDialog.qml
177 index a9d9776..99fa4c5 100644
178---- b/checkbox-touch/components/InputDialog.qml
179-+++ a/checkbox-touch/components/InputDialog.qml
180+--- b/converged/components/InputDialog.qml
181++++ a/converged/components/InputDialog.qml
182 @@ -19,8 +19,8 @@
183 * along with this program. If not, see <http://www.gnu.org/licenses/>.
184 */
185@@ -237,10 +237,10 @@
186
187 /*! \brief Simple input dialog.
188 \inherits Item
189-diff --git b/checkbox-touch/components/InteractIntroPage.qml a/checkbox-touch/components/InteractIntroPage.qml
190+diff --git b/converged/components/InteractIntroPage.qml a/converged/components/InteractIntroPage.qml
191 index 01e285b..d62965f 100644
192---- b/checkbox-touch/components/InteractIntroPage.qml
193-+++ a/checkbox-touch/components/InteractIntroPage.qml
194+--- b/converged/components/InteractIntroPage.qml
195++++ a/converged/components/InteractIntroPage.qml
196 @@ -27,8 +27,8 @@
197 */
198
199@@ -289,10 +289,10 @@
200 }
201
202 state: "idle"
203-diff --git b/checkbox-touch/components/LatchButton.qml a/checkbox-touch/components/LatchButton.qml
204+diff --git b/converged/components/LatchButton.qml a/converged/components/LatchButton.qml
205 index 8fe9252..b1ea81b 100644
206---- b/checkbox-touch/components/LatchButton.qml
207-+++ a/checkbox-touch/components/LatchButton.qml
208+--- b/converged/components/LatchButton.qml
209++++ a/converged/components/LatchButton.qml
210 @@ -20,7 +20,7 @@
211 */
212
213@@ -302,10 +302,10 @@
214
215 /*! \brief Latch button.
216 \inherits Button
217-diff --git b/checkbox-touch/components/ListItemWrappable.qml a/checkbox-touch/components/ListItemWrappable.qml
218+diff --git b/converged/components/ListItemWrappable.qml a/converged/components/ListItemWrappable.qml
219 index e9297bf..a380ea2 100644
220---- b/checkbox-touch/components/ListItemWrappable.qml
221-+++ a/checkbox-touch/components/ListItemWrappable.qml
222+--- b/converged/components/ListItemWrappable.qml
223++++ a/converged/components/ListItemWrappable.qml
224 @@ -19,7 +19,7 @@
225 * along with this program. If not, see <http://www.gnu.org/licenses/>.
226 */
227@@ -315,10 +315,10 @@
228 import Ubuntu.Components.ListItems 1.0
229
230 /*! \brief ListItemWrappable
231-diff --git b/checkbox-touch/components/ManualIntroPage.qml a/checkbox-touch/components/ManualIntroPage.qml
232+diff --git b/converged/components/ManualIntroPage.qml a/converged/components/ManualIntroPage.qml
233 index 0fce6f5..afe007a 100644
234---- b/checkbox-touch/components/ManualIntroPage.qml
235-+++ a/checkbox-touch/components/ManualIntroPage.qml
236+--- b/converged/components/ManualIntroPage.qml
237++++ a/converged/components/ManualIntroPage.qml
238 @@ -26,9 +26,9 @@
239 */
240
241@@ -368,10 +368,10 @@
242 }
243
244 TestPageBody {
245-diff --git b/checkbox-touch/components/PasswordDialog.qml a/checkbox-touch/components/PasswordDialog.qml
246+diff --git b/converged/components/PasswordDialog.qml a/converged/components/PasswordDialog.qml
247 index dea1b0f..c3931bc 100644
248---- b/checkbox-touch/components/PasswordDialog.qml
249-+++ a/checkbox-touch/components/PasswordDialog.qml
250+--- b/converged/components/PasswordDialog.qml
251++++ a/converged/components/PasswordDialog.qml
252 @@ -19,8 +19,8 @@
253 * along with this program. If not, see <http://www.gnu.org/licenses/>.
254 */
255@@ -383,10 +383,10 @@
256
257 /*! \brief Password prompt dialog.
258 \inherits Item
259-diff --git b/checkbox-touch/components/ProgressBox.qml a/checkbox-touch/components/ProgressBox.qml
260+diff --git b/converged/components/ProgressBox.qml a/converged/components/ProgressBox.qml
261 index b9fc720..a2b5d05 100644
262---- b/checkbox-touch/components/ProgressBox.qml
263-+++ a/checkbox-touch/components/ProgressBox.qml
264+--- b/converged/components/ProgressBox.qml
265++++ a/converged/components/ProgressBox.qml
266 @@ -20,7 +20,7 @@
267 */
268
269@@ -396,10 +396,10 @@
270 import QtQuick.Layouts 1.1
271
272 /*! \brief Progress Box.
273-diff --git b/checkbox-touch/components/ProgressHeader.qml a/checkbox-touch/components/ProgressHeader.qml
274+diff --git b/converged/components/ProgressHeader.qml a/converged/components/ProgressHeader.qml
275 deleted file mode 100644
276 index a7db263..0000000
277---- b/checkbox-touch/components/ProgressHeader.qml
278+--- b/converged/components/ProgressHeader.qml
279 +++ /dev/null
280 @@ -1,59 +0,0 @@
281 -/*
282@@ -461,10 +461,10 @@
283 - }
284 - }
285 -}
286-diff --git b/checkbox-touch/components/QmlConfinedPage.qml a/checkbox-touch/components/QmlConfinedPage.qml
287+diff --git b/converged/components/QmlConfinedPage.qml a/converged/components/QmlConfinedPage.qml
288 index 0c8f773..527525f 100644
289---- b/checkbox-touch/components/QmlConfinedPage.qml
290-+++ a/checkbox-touch/components/QmlConfinedPage.qml
291+--- b/converged/components/QmlConfinedPage.qml
292++++ a/converged/components/QmlConfinedPage.qml
293 @@ -23,8 +23,8 @@
294 */
295
296@@ -520,10 +520,10 @@
297 }
298
299 TestPageBody {
300-diff --git b/checkbox-touch/components/QmlNativePage.qml a/checkbox-touch/components/QmlNativePage.qml
301+diff --git b/converged/components/QmlNativePage.qml a/converged/components/QmlNativePage.qml
302 index 8928f60..a33a883 100644
303---- b/checkbox-touch/components/QmlNativePage.qml
304-+++ a/checkbox-touch/components/QmlNativePage.qml
305+--- b/converged/components/QmlNativePage.qml
306++++ a/converged/components/QmlNativePage.qml
307 @@ -23,8 +23,8 @@
308 */
309
310@@ -579,10 +579,10 @@
311 }
312
313 TestPageBody {
314-diff --git b/checkbox-touch/components/ResultsPage.qml a/checkbox-touch/components/ResultsPage.qml
315+diff --git b/converged/components/ResultsPage.qml a/converged/components/ResultsPage.qml
316 index 35fdcd1..ca6d567 100644
317---- b/checkbox-touch/components/ResultsPage.qml
318-+++ a/checkbox-touch/components/ResultsPage.qml
319+--- b/converged/components/ResultsPage.qml
320++++ a/converged/components/ResultsPage.qml
321 @@ -26,10 +26,11 @@
322 */
323
324@@ -652,10 +652,10 @@
325 topMargin: units.gu(3)
326 bottomMargin: units.gu(3)
327 leftMargin: units.gu(1)
328-diff --git b/checkbox-touch/components/ResumeSessionPage.qml a/checkbox-touch/components/ResumeSessionPage.qml
329+diff --git b/converged/components/ResumeSessionPage.qml a/converged/components/ResumeSessionPage.qml
330 index cbfbb59..ad57715 100644
331---- b/checkbox-touch/components/ResumeSessionPage.qml
332-+++ a/checkbox-touch/components/ResumeSessionPage.qml
333+--- b/converged/components/ResumeSessionPage.qml
334++++ a/converged/components/ResumeSessionPage.qml
335 @@ -26,7 +26,7 @@
336 */
337
338@@ -689,10 +689,10 @@
339 topMargin: units.gu(3)
340 bottomMargin: units.gu(3)
341 leftMargin: units.gu(1)
342-diff --git b/checkbox-touch/components/SelectionPage.qml a/checkbox-touch/components/SelectionPage.qml
343+diff --git b/converged/components/SelectionPage.qml a/converged/components/SelectionPage.qml
344 index 6df9cb1..fbc2e75 100644
345---- b/checkbox-touch/components/SelectionPage.qml
346-+++ a/checkbox-touch/components/SelectionPage.qml
347+--- b/converged/components/SelectionPage.qml
348++++ a/converged/components/SelectionPage.qml
349 @@ -21,7 +21,7 @@
350
351 import QtQuick 2.0
352@@ -809,10 +809,10 @@
353 bottomMargin: units.gu(3)
354 leftMargin: units.gu(1)
355 rightMargin: units.gu(1)
356-diff --git b/checkbox-touch/components/TestPageBody.qml a/checkbox-touch/components/TestPageBody.qml
357+diff --git b/converged/components/TestPageBody.qml a/converged/components/TestPageBody.qml
358 index 73832e2..9693dae 100644
359---- b/checkbox-touch/components/TestPageBody.qml
360-+++ a/checkbox-touch/components/TestPageBody.qml
361+--- b/converged/components/TestPageBody.qml
362++++ a/converged/components/TestPageBody.qml
363 @@ -25,8 +25,8 @@
364
365 import QtQuick 2.0
366@@ -836,10 +836,10 @@
367 topMargin: units.gu(3)
368 bottomMargin: units.gu(3)
369 leftMargin: units.gu(1)
370-diff --git b/checkbox-touch/components/TestVerificationPage.qml a/checkbox-touch/components/TestVerificationPage.qml
371+diff --git b/converged/components/TestVerificationPage.qml a/converged/components/TestVerificationPage.qml
372 index 2178ffb..ad86d85 100644
373---- b/checkbox-touch/components/TestVerificationPage.qml
374-+++ a/checkbox-touch/components/TestVerificationPage.qml
375+--- b/converged/components/TestVerificationPage.qml
376++++ a/converged/components/TestVerificationPage.qml
377 @@ -26,9 +26,9 @@
378 */
379
380@@ -889,10 +889,10 @@
381 }
382
383 TestPageBody {
384-diff --git b/checkbox-touch/components/UserInteractSummaryPage.qml a/checkbox-touch/components/UserInteractSummaryPage.qml
385+diff --git b/converged/components/UserInteractSummaryPage.qml a/converged/components/UserInteractSummaryPage.qml
386 index 8f3ca06..2dc286d 100644
387---- b/checkbox-touch/components/UserInteractSummaryPage.qml
388-+++ a/checkbox-touch/components/UserInteractSummaryPage.qml
389+--- b/converged/components/UserInteractSummaryPage.qml
390++++ a/converged/components/UserInteractSummaryPage.qml
391 @@ -26,8 +26,8 @@
392 */
393
394@@ -941,10 +941,10 @@
395 }
396
397 TestPageBody {
398-diff --git b/checkbox-touch/components/WebViewer.qml a/checkbox-touch/components/WebViewer.qml
399+diff --git b/converged/components/WebViewer.qml a/converged/components/WebViewer.qml
400 index 0348919..7b5ef78 100644
401---- b/checkbox-touch/components/WebViewer.qml
402-+++ a/checkbox-touch/components/WebViewer.qml
403+--- b/converged/components/WebViewer.qml
404++++ a/converged/components/WebViewer.qml
405 @@ -21,7 +21,7 @@
406
407 import QtQuick 2.0
408@@ -954,10 +954,10 @@
409
410
411 Page {
412-diff --git b/checkbox-touch/components/WelcomePage.qml a/checkbox-touch/components/WelcomePage.qml
413+diff --git b/converged/components/WelcomePage.qml a/converged/components/WelcomePage.qml
414 index a310e41..cf328d0 100644
415---- b/checkbox-touch/components/WelcomePage.qml
416-+++ a/checkbox-touch/components/WelcomePage.qml
417+--- b/converged/components/WelcomePage.qml
418++++ a/converged/components/WelcomePage.qml
419 @@ -21,7 +21,7 @@
420 */
421
422@@ -1001,10 +1001,10 @@
423 Label {
424 id: welcomeText
425
426-diff --git b/checkbox-touch/components/actions/AddCommentAction.qml a/checkbox-touch/components/actions/AddCommentAction.qml
427+diff --git b/converged/components/actions/AddCommentAction.qml a/converged/components/actions/AddCommentAction.qml
428 index b3977ce..d7daf53 100644
429---- b/checkbox-touch/components/actions/AddCommentAction.qml
430-+++ a/checkbox-touch/components/actions/AddCommentAction.qml
431+--- b/converged/components/actions/AddCommentAction.qml
432++++ a/converged/components/actions/AddCommentAction.qml
433 @@ -22,8 +22,8 @@
434 /*! \brief Action component for adding a comment. */
435
436@@ -1016,10 +1016,10 @@
437
438 Action {
439 id: addCommentAction
440-diff --git b/checkbox-touch/components/actions/SkipAction.qml a/checkbox-touch/components/actions/SkipAction.qml
441+diff --git b/converged/components/actions/SkipAction.qml a/converged/components/actions/SkipAction.qml
442 index 124c7dd..712d746 100644
443---- b/checkbox-touch/components/actions/SkipAction.qml
444-+++ a/checkbox-touch/components/actions/SkipAction.qml
445+--- b/converged/components/actions/SkipAction.qml
446++++ a/converged/components/actions/SkipAction.qml
447 @@ -22,8 +22,8 @@
448 /*! \brief Action component for skipping a test. */
449
450@@ -1031,10 +1031,10 @@
451
452 Action {
453 id: skipAction
454-diff --git b/checkbox-touch/tests/autopilot/checkbox_touch/__init__.py a/checkbox-touch/tests/autopilot/checkbox_touch/__init__.py
455+diff --git b/converged/tests/autopilot/checkbox_converged/__init__.py a/converged/tests/autopilot/checkbox_converged/__init__.py
456 index 547ab73..77e5220 100644
457---- b/checkbox-touch/tests/autopilot/checkbox_touch/__init__.py
458-+++ a/checkbox-touch/tests/autopilot/checkbox_touch/__init__.py
459+--- b/converged/tests/autopilot/checkbox_converged/__init__.py
460++++ a/converged/tests/autopilot/checkbox_converged/__init__.py
461 @@ -87,7 +87,7 @@ class ClickAppTestCase(base.UbuntuUIToolkitAppTestCase):
462 self.pointing_device.click_object(continue_btn)
463 category_page = self.app.wait_select_single(
464@@ -1065,11 +1065,11 @@
465 def _launch_application_from_phablet(self):
466 # On phablet, we only run the tests against the installed click
467 # package.
468-diff --git b/checkbox-touch/tests/autopilot/checkbox_touch/test_checkbox_touch.py a/checkbox-touch/tests/autopilot/checkbox_touch/test_checkbox_touch.py
469+diff --git b/converged/tests/autopilot/checkbox_converged/test_checkbox_converged.py a/converged/tests/autopilot/checkbox_converged/test_checkbox_converged.py
470 index e9fe916..c0bf6a3 100644
471---- b/checkbox-touch/tests/autopilot/checkbox_touch/test_checkbox_touch.py
472-+++ a/checkbox-touch/tests/autopilot/checkbox_touch/test_checkbox_touch.py
473-@@ -19,7 +19,7 @@ class TestCheckboxTouch(checkbox_touch.ClickAppTestCase):
474+--- b/converged/tests/autopilot/checkbox_converged/test_checkbox_converged.py
475++++ a/converged/tests/autopilot/checkbox_converged/test_checkbox_converged.py
476+@@ -19,7 +19,7 @@ class TestCheckboxConverged(checkbox_converged.ClickAppTestCase):
477 if selectable_object_name is not None:
478 self.app.wait_select_single(
479 objectName=selectable_object_name, visible=True)
480@@ -1078,7 +1078,7 @@
481 dialog = self.app.wait_select_single(objectName='dialog')
482 yes_btn = dialog.select_single(objectName='yesButton')
483 self.pointing_device.click_object(yes_btn)
484-@@ -62,7 +62,7 @@ class TestCheckboxTouch(checkbox_touch.ClickAppTestCase):
485+@@ -62,7 +62,7 @@ class TestCheckboxConverged(checkbox_converged.ClickAppTestCase):
486 self.pointing_device.click_object(continue_btn)
487 category_page = self.app.wait_select_single(
488 objectName='categorySelectionPage', visible=True)
489@@ -1087,7 +1087,7 @@
490 category_id = '2015.com.canonical.certification::normal'
491 list_item = category_page.wait_select_single(
492 objectName='listItem', item_mod_id=category_id)
493-@@ -299,7 +299,7 @@ class RerunTests(checkbox_touch.ClickAppTestCase):
494+@@ -299,7 +299,7 @@ class RerunTests(checkbox_converged.ClickAppTestCase):
495 self.process_sequence_of_clicks_on_pages(next_steps)
496 results_page = self.app.wait_select_single(
497 objectName='resultsPage', visible=True)
498@@ -1096,7 +1096,7 @@
499 # we now should see a re-run screen; let's select the only test
500 rerun_page = self.app.wait_select_single(
501 objectName='rerunSelectionPage', visible=True)
502-@@ -313,7 +313,7 @@ class RerunTests(checkbox_touch.ClickAppTestCase):
503+@@ -313,7 +313,7 @@ class RerunTests(checkbox_converged.ClickAppTestCase):
504 self.process_sequence_of_clicks_on_pages(next_steps)
505 results_page = self.app.wait_select_single(
506 objectName='resultsPage', visible=True)
507@@ -1105,7 +1105,7 @@
508 # we should see the re-run screen again
509 rerun_page = self.app.wait_select_single(
510 objectName='rerunSelectionPage', visible=True)
511-@@ -333,7 +333,7 @@ class RerunTests(checkbox_touch.ClickAppTestCase):
512+@@ -333,7 +333,7 @@ class RerunTests(checkbox_converged.ClickAppTestCase):
513 self.process_sequence_of_clicks_on_pages(next_steps)
514 results_page = self.app.wait_select_single(
515 objectName='resultsPage', visible=True)
516@@ -1114,8 +1114,8 @@
517 # we now should see a re-run screen; let's select the only test
518 rerun_page = self.app.wait_select_single(
519 objectName='rerunSelectionPage', visible=True)
520---- a/checkbox-touch/components/DialogMgr.qml
521-+++ b/checkbox-touch/components/DialogMgr.qml
522+--- a/converged/components/DialogMgr.qml
523++++ b/converged/components/DialogMgr.qml
524 @@ -19,8 +19,8 @@
525 * along with this program. If not, see <http://www.gnu.org/licenses/>.
526 */
527
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 export LANG=
533 export LANGUAGE=
534 export http_proxy=http://127.0.0.1:9
535-PPA_DISPLACEMENT=checkbox-touch
536+PPA_DISPLACEMENT=converged
537
538 %:
539 dh $@ --sourcedirectory=$(PPA_DISPLACEMENT)

Subscribers

People subscribed via source and target branches