Checkbox

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

  1. ppa-packaging-touch2converged-trusty
  2. Merge into trunk
Proposed by Maciej Kisielewski
Status: Superseded
Proposed branch: lp:~kissiel/checkbox/ppa-packaging-touch2converged-trusty
Merge into: lp:checkbox
Diff against target: 1537 lines (+1460/-0)
15 files modified
debian/changelog (+64/-0)
debian/checkbox-converged.desktop (+8/-0)
debian/clean (+2/-0)
debian/compat (+1/-0)
debian/control (+23/-0)
debian/copyright (+21/-0)
debian/install (+8/-0)
debian/links (+3/-0)
debian/patches/components_1.3_removal.diff (+1129/-0)
debian/patches/series (+1/-0)
debian/rules (+11/-0)
debian/settings.json (+15/-0)
debian/source/format (+1/-0)
debian/tick.svg (+154/-0)
debian/window-close.svg (+19/-0)
To merge this branch: bzr merge lp:~kissiel/checkbox/ppa-packaging-touch2converged-trusty
Reviewer Review Type Date Requested Status
Checkbox Developers Pending
Review via email: mp+307164@code.launchpad.net

This proposal has been superseded by 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.

Unmerged revisions

22. By Maciej Kisielewski

use new file and dir names (converged instead of touch)

21. By Sylvain Pineau

debian/patches/components_1.3_removal.diff: Refresh

And add components/DialogMgr.qml to the patch

20. By Pierre Equoy

"Release_2016_Week30 [r=pierre-equoy][bug=][author=checkbox-dev]"

19. By Sylvain Pineau

debian/patches/components_1.3_removal.diff: Refresh

18. By Sylvain Pineau

"Release_2016_Week28 [r=sylvain-pineau][bug=][author=checkbox-dev]"

17. By Sylvain Pineau

Revert the transition to ubuntu compoents 1.3 as a patch (making the package non native)

16. By Pierre Equoy

"Release_2016_Week25 [r=pierre-equoy][bug=][author=checkbox-dev]"

15. By Pierre Equoy

Automatic merge

14. By Pierre Equoy

"automatic merge of lp:~pierre-equoy/checkbox/ppa-packaging-checkbox-converged-trusty_fix-1563763/ by tarmac [r=sylvain-pineau][bug=1563763][author=pierre-equoy]"

13. By Pierre Equoy

"Release_2016_Week12 [r=pierre-equoy][bug=][author=checkbox-dev]"

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog 1970-01-01 00:00:00 +0000
+++ debian/changelog 2016-09-29 12:03:24 +0000
@@ -0,0 +1,64 @@
1checkbox-converged (1.5) UNRELEASED; urgency=medium
2
3 * Open for development (remove this message before releasing)
4
5 -- Pierre Equoy <pierre.equoy@canonical.com> Mon, 25 Jul 2016 10:57:42 +0800
6
7checkbox-converged (1.4.1) unstable; urgency=medium
8
9 [ Sylvain Pineau ]
10
11 [ Pierre Equoy ]
12 * New upstream release
13
14 -- Pierre Equoy <pierre.equoy@canonical.com> Mon, 25 Jul 2016 10:57:31 +0800
15
16checkbox-converged (1.4) unstable; urgency=medium
17
18 [ Pierre Equoy ]
19
20 [ Sylvain Pineau ]
21 * New upstream release
22
23 -- Sylvain Pineau <sylvain.pineau@canonical.com> Tue, 12 Jul 2016 23:06:00 +0200
24
25checkbox-converged (1.3) unstable; urgency=medium
26
27 * New upstream release
28
29 -- Pierre Equoy <pierre.equoy@canonical.com> Mon, 20 Jun 2016 10:02:10 +0800
30
31checkbox-converged (1.2.6) unstable; urgency=medium
32
33 * Update dependencies minimum version to avoid issues in Xenial (Fix lp:1563763)
34 * New upstream release
35
36 -- Pierre Equoy <pierre.equoy@canonical.com> Tue, 19 Apr 2016 14:13:08 +0800
37
38checkbox-converged (1.2.5) unstable; urgency=medium
39
40 * New upstream release
41
42 -- Pierre Equoy <pierre.equoy@canonical.com> Mon, 21 Mar 2016 11:13:29 +0800
43
44checkbox-converged (1.2.4) unstable; urgency=medium
45
46 [ Sylvain Pineau ]
47
48 [ Pierre Equoy ]
49 * New upstream release
50
51 -- Pierre Equoy <pierre.equoy@canonical.com> Tue, 15 Dec 2015 10:28:28 +0800
52
53checkbox-converged (1.2.3) unstable; urgency=medium
54
55 * New upstream release
56
57 -- Sylvain Pineau <sylvain.pineau@canonical.com> Mon, 16 Nov 2015 21:13:12 +0100
58
59checkbox-converged (1.2.0-2~ppa3) trusty; urgency=medium
60
61 * Initial trusty release.
62
63 -- Sylvain Pineau <sylvain.pineau@canonical.com> Thu, 23 Jul 2015 18:45:28 +0200
64
065
=== added file 'debian/checkbox-converged.desktop'
--- debian/checkbox-converged.desktop 1970-01-01 00:00:00 +0000
+++ debian/checkbox-converged.desktop 2016-09-29 12:03:24 +0000
@@ -0,0 +1,8 @@
1[Desktop Entry]
2Name=Checkbox Converged
3Comment=System testing utility for Ubuntu
4Exec=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
5Icon=checkbox-converged.svg
6Terminal=false
7Type=Application
8X-Ubuntu-Touch=true
09
=== added file 'debian/clean'
--- debian/clean 1970-01-01 00:00:00 +0000
+++ debian/clean 2016-09-29 12:03:24 +0000
@@ -0,0 +1,2 @@
1converged/py/__pycache__/*.pyc
2
03
=== added file 'debian/compat'
--- debian/compat 1970-01-01 00:00:00 +0000
+++ debian/compat 2016-09-29 12:03:24 +0000
@@ -0,0 +1,1 @@
19
02
=== added file 'debian/control'
--- debian/control 1970-01-01 00:00:00 +0000
+++ debian/control 2016-09-29 12:03:24 +0000
@@ -0,0 +1,23 @@
1Source: checkbox-converged
2Section: utils
3Priority: optional
4Maintainer: Checkbox Developers <checkbox-dev@lists.launchpad.net>
5Uploaders: Sylvain Pineau <sylvain.pineau@canonical.com>,
6 Zygmunt Krynicki <zygmunt.krynicki@canonical.com>,
7 Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
8Build-Depends: debhelper (>= 9)
9Standards-Version: 3.9.6
10Homepage: http://launchpad.net/checkbox
11
12Package: checkbox-converged
13Architecture: amd64
14Depends: pyotherside,
15 python3,
16 python3-plainbox (>= 0.27~),
17 qt (>= 5.4) | qml-module-qtquick-layouts,
18 qtdeclarative5-test-plugin,
19 qtdeclarative5-ubuntu-ui-toolkit-plugin,
20 suru-icon-theme
21 ${misc:Depends}
22Description: testing tool for all Ubuntu devices
23 This tool helps to test devices ranging from servers to phones.
024
=== added file 'debian/copyright'
--- debian/copyright 1970-01-01 00:00:00 +0000
+++ debian/copyright 2016-09-29 12:03:24 +0000
@@ -0,0 +1,21 @@
1Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2Upstream-Name: checkbox-converged
3Source: https://launchpad.net/checkbox
4
5Files: *
6Copyright: Copyright 2012-2015 Canonical Ltd.
7License: GPL-3
8 This program is free software: you can redistribute it and/or modify
9 it under the terms of the GNU General Public License version 3,
10 as published by the Free Software Foundation.
11 .
12 This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details.
16 .
17 You should have received a copy of the GNU General Public License
18 along with this program. If not, see <http://www.gnu.org/licenses/>.
19 .
20 On Debian-based systems the full text of the GPL, version 3, can be found at
21 /usr/share/common-licenses/GPL-3.
022
=== added file 'debian/install'
--- debian/install 1970-01-01 00:00:00 +0000
+++ debian/install 2016-09-29 12:03:24 +0000
@@ -0,0 +1,8 @@
1converged/checkbox-converged.qml usr/share/checkbox-converged/
2converged/checkbox-converged.svg usr/share/icons/hicolor/scalable/apps/
3converged/components usr/share/checkbox-converged/
4converged/py usr/share/checkbox-converged/
5debian/checkbox-converged.desktop usr/share/applications
6debian/settings.json usr/share/checkbox-converged/
7debian/tick.svg usr/share/icons/suru/actions/scalable/
8debian/window-close.svg usr/share/icons/suru/actions/scalable/
09
=== added file 'debian/links'
--- debian/links 1970-01-01 00:00:00 +0000
+++ debian/links 2016-09-29 12:03:24 +0000
@@ -0,0 +1,3 @@
1/usr/lib/x86_64-linux-gnu/qt5/qml/io /opt/qt-5.4/usr/lib/x86_64-linux-gnu/qt5/qml/io
2/usr/lib/x86_64-linux-gnu/qt5/qml/jbQuick /opt/qt-5.4/usr/lib/x86_64-linux-gnu/qt5/qml/jbQuick
3/opt/qt-5.4/usr/share/qtchooser/qt5-x86_64-linux-gnu.conf /etc/xdg/qtchooser/5.4.conf
04
=== added directory 'debian/patches'
=== added file 'debian/patches/components_1.3_removal.diff'
--- debian/patches/components_1.3_removal.diff 1970-01-01 00:00:00 +0000
+++ debian/patches/components_1.3_removal.diff 2016-09-29 12:03:24 +0000
@@ -0,0 +1,1129 @@
1diff --git b/converged/checkbox-converged.qml a/converged/checkbox-converged.qml
2index cb896ef..c6c3b93 100644
3--- b/converged/checkbox-converged.qml
4+++ a/converged/checkbox-converged.qml
5@@ -20,8 +20,8 @@
6 * along with this program. If not, see <http://www.gnu.org/licenses/>.
7 */
8 import QtQuick 2.0
9-import Ubuntu.Components 1.3
10-import Ubuntu.Components.Popups 1.3
11+import Ubuntu.Components 1.1
12+import Ubuntu.Components.Popups 0.1
13 import QtQuick.Layouts 1.1
14 import io.thp.pyotherside 1.4
15 import "components"
16@@ -48,6 +48,8 @@ MainView {
17 width: units.gu(100)
18 height: units.gu(75)
19
20+ useDeprecatedToolbar: false
21+
22 // appSettings serves as application-wide storage for global variables
23 // it has to have at least one entry to be constructed
24 property var appSettings: {
25@@ -483,6 +485,7 @@ to rerun last test, continue to the next test, or start a new session?")
26 CommandOutputPage {
27 id: commandOutputPage
28 visible: false
29+ __customHeaderContents: progressHeader;
30 }
31 /*
32 * Create a page from a Component defined in `url` with a common
33@@ -499,6 +502,8 @@ to rerun last test, continue to the next test, or start a new session?")
34 var pageObject = pageComponent.createObject();
35 if (test) {
36 pageObject.test = test;
37+ pageObject.__customHeaderContents = progressHeader;
38+ progressHeader.update(test)
39 }
40 return pageObject;
41 }
42diff --git b/converged/components/AboutPage.qml a/converged/components/AboutPage.qml
43index bb0f50e..d3de734 100644
44--- b/converged/components/AboutPage.qml
45+++ a/converged/components/AboutPage.qml
46@@ -24,7 +24,7 @@
47 This page shows version information and contents of AUTHORS file located in top chekckbox-converged directory
48 */
49 import QtQuick 2.0
50-import Ubuntu.Components 1.3
51+import Ubuntu.Components 1.1
52 import QtQuick.Layouts 1.1
53
54 Page {
55@@ -36,17 +36,12 @@ Page {
56
57 onVersionInfoChanged: body.generateVersionText()
58
59- header: PageHeader {
60- title: i18n.tr("About")
61- }
62+ title: i18n.tr("About")
63
64 ColumnLayout {
65 spacing: units.gu(3)
66 anchors {
67- top: header.bottom
68- bottom: aboutPage.bottom
69- right: aboutPage.right
70- left: aboutPage.left
71+ fill: parent
72 topMargin: units.gu(3)
73 bottomMargin: units.gu(3)
74 leftMargin: units.gu(1)
75diff --git b/converged/components/AutomatedTestPage.qml a/converged/components/AutomatedTestPage.qml
76index 49e9ba2..7102aa9 100644
77--- b/converged/components/AutomatedTestPage.qml
78+++ a/converged/components/AutomatedTestPage.qml
79@@ -20,7 +20,7 @@
80 */
81
82 import QtQuick 2.0
83-import Ubuntu.Components 1.3
84+import Ubuntu.Components 1.1
85 import QtQuick.Layouts 1.1
86
87 /*! \brief Page for Automated Test
88@@ -36,13 +36,9 @@ Page {
89
90 property var test: { "name": "", "description": "", "test_number": 0, "tests_count": 0}
91
92- visible: false
93+ title: i18n.tr("Automated test")
94
95- header: ProgressHeader {
96- value: test['test_number']
97- maximumValue: test['tests_count']
98- title: i18n.tr("Automated test")
99- }
100+ visible: false
101
102 TestPageBody {
103 header: test["name"]
104diff --git b/converged/components/CbtDialog.qml a/converged/components/CbtDialog.qml
105index a7e36c3..ab3f281 100644
106--- b/converged/components/CbtDialog.qml
107+++ a/converged/components/CbtDialog.qml
108@@ -19,8 +19,8 @@
109 * along with this program. If not, see <http://www.gnu.org/licenses/>.
110 */
111 import QtQuick 2.0
112-import Ubuntu.Components 1.3
113-import Ubuntu.Components.Popups 1.3
114+import Ubuntu.Components 1.1
115+import Ubuntu.Components.Popups 0.1
116 import QtQuick.Layouts 1.1
117
118 /*! \brief Common dialog popup.
119diff --git b/converged/components/CheckboxConvergedApplication.qml a/converged/components/CheckboxConvergedApplication.qml
120index 2aa8df3..46b92b4 100644
121--- b/converged/components/CheckboxConvergedApplication.qml
122+++ a/converged/components/CheckboxConvergedApplication.qml
123@@ -21,6 +21,7 @@
124 */
125
126 import QtQuick 2.0
127+import Ubuntu.Components 1.1
128
129 PythonObjectRef {
130 id: app
131diff --git b/converged/components/CommandOutputPage.qml a/converged/components/CommandOutputPage.qml
132index 52a534f..144c4d0 100644
133--- b/converged/components/CommandOutputPage.qml
134+++ a/converged/components/CommandOutputPage.qml
135@@ -24,8 +24,8 @@
136 */
137
138 import QtQuick 2.0
139-import Ubuntu.Components 1.3
140-import Ubuntu.Components.Popups 1.3
141+import Ubuntu.Components 1.1
142+import Ubuntu.Components.Popups 0.1
143 import QtQuick.Layouts 1.1
144
145 Page {
146@@ -43,21 +43,18 @@ Page {
147 textArea.text = "";
148 }
149
150- header: PageHeader {
151- title: i18n.tr("Command output")
152- trailingActionBar {
153- objectName: 'trailingActionBar'
154- actions: [
155- Action {
156- id: copyAction
157- objectName: "copyOutputAction"
158- iconName: "edit-copy"
159- // TRANSLATORS: a verb (call to action)
160- text: i18n.tr("Copy")
161- onTriggered: Clipboard.push(mimeData)
162- }
163- ]
164- }
165+ title: i18n.tr("Command output")
166+ head {
167+ actions: [
168+ Action {
169+ id: skipAction
170+ objectName: "copyOutputAction"
171+ iconName: "edit-copy"
172+ // TRANSLATORS: a verb (call to action)
173+ text: i18n.tr("Copy")
174+ onTriggered: Clipboard.push(mimeData)
175+ }
176+ ]
177 }
178
179 Timer {
180diff --git b/converged/components/CommentsDialog.qml a/converged/components/CommentsDialog.qml
181index 3323788..8dc1b6c 100644
182--- b/converged/components/CommentsDialog.qml
183+++ a/converged/components/CommentsDialog.qml
184@@ -19,8 +19,8 @@
185 * along with this program. If not, see <http://www.gnu.org/licenses/>.
186 */
187 import QtQuick 2.0
188-import Ubuntu.Components 1.3
189-import Ubuntu.Components.Popups 1.3
190+import Ubuntu.Components 1.1
191+import Ubuntu.Components.Popups 0.1
192
193 /*! \brief Comment addition dialog.
194 \inherits Item
195diff --git b/converged/components/ConfirmationDialog.qml a/converged/components/ConfirmationDialog.qml
196index 25e8734..44e8963 100644
197--- b/converged/components/ConfirmationDialog.qml
198+++ a/converged/components/ConfirmationDialog.qml
199@@ -19,8 +19,8 @@
200 * along with this program. If not, see <http://www.gnu.org/licenses/>.
201 */
202 import QtQuick 2.0
203-import Ubuntu.Components 1.3
204-import Ubuntu.Components.Popups 1.3
205+import Ubuntu.Components 1.1
206+import Ubuntu.Components.Popups 0.1
207
208 /*! \brief Skip-confirmation dialog.
209 \inherits Item
210diff --git b/converged/components/ErrorDialog.qml a/converged/components/ErrorDialog.qml
211index edbcc1a..688e68a 100644
212--- b/converged/components/ErrorDialog.qml
213+++ a/converged/components/ErrorDialog.qml
214@@ -19,8 +19,8 @@
215 * along with this program. If not, see <http://www.gnu.org/licenses/>.
216 */
217 import QtQuick 2.0
218-import Ubuntu.Components 1.3
219-import Ubuntu.Components.Popups 1.3
220+import Ubuntu.Components 1.1
221+import Ubuntu.Components.Popups 0.1
222
223 /*! \brief Error message popup.
224 \inherits Item
225diff --git b/converged/components/InputDialog.qml a/converged/components/InputDialog.qml
226index a9d9776..99fa4c5 100644
227--- b/converged/components/InputDialog.qml
228+++ a/converged/components/InputDialog.qml
229@@ -19,8 +19,8 @@
230 * along with this program. If not, see <http://www.gnu.org/licenses/>.
231 */
232 import QtQuick 2.0
233-import Ubuntu.Components 1.3
234-import Ubuntu.Components.Popups 1.3
235+import Ubuntu.Components 1.1
236+import Ubuntu.Components.Popups 0.1
237
238 /*! \brief Simple input dialog.
239 \inherits Item
240diff --git b/converged/components/InteractIntroPage.qml a/converged/components/InteractIntroPage.qml
241index 01e285b..d62965f 100644
242--- b/converged/components/InteractIntroPage.qml
243+++ a/converged/components/InteractIntroPage.qml
244@@ -27,8 +27,8 @@
245 */
246
247 import QtQuick 2.0
248-import Ubuntu.Components 1.3
249-import Ubuntu.Components.Popups 1.3
250+import Ubuntu.Components 1.1
251+import Ubuntu.Components.Popups 0.1
252 import QtQuick.Layouts 1.1
253 import "actions"
254
255@@ -45,26 +45,16 @@ Page {
256 startTestButton.unlatch()
257 }
258
259- onTestChanged: {
260- header.value = test['test_number']
261- header.maximumValue = test['tests_count']
262- }
263- header: ProgressHeader {
264- value: test['test_number']
265- maximumValue: test['tests_count']
266- title: i18n.tr("Test Description")
267- leadingActionBar { actions: [] }
268- trailingActionBar {
269- objectName: 'trailingActionBar'
270- actions: [
271- AddCommentAction {
272- id: addCommentAction
273- },
274- SkipAction {
275- id: skipAction
276- }
277- ]
278- }
279+ title: i18n.tr("Test Description")
280+ head {
281+ actions: [
282+ AddCommentAction {
283+ id: addCommentAction
284+ },
285+ SkipAction {
286+ id: skipAction
287+ }
288+ ]
289 }
290
291 state: "idle"
292diff --git b/converged/components/LatchButton.qml a/converged/components/LatchButton.qml
293index 8fe9252..b1ea81b 100644
294--- b/converged/components/LatchButton.qml
295+++ a/converged/components/LatchButton.qml
296@@ -20,7 +20,7 @@
297 */
298
299 import QtQuick 2.0
300-import Ubuntu.Components 1.3
301+import Ubuntu.Components 1.1
302
303 /*! \brief Latch button.
304 \inherits Button
305diff --git b/converged/components/ListItemWrappable.qml a/converged/components/ListItemWrappable.qml
306index e9297bf..a380ea2 100644
307--- b/converged/components/ListItemWrappable.qml
308+++ a/converged/components/ListItemWrappable.qml
309@@ -19,7 +19,7 @@
310 * along with this program. If not, see <http://www.gnu.org/licenses/>.
311 */
312 import QtQuick 2.0
313-import Ubuntu.Components 1.3
314+import Ubuntu.Components 1.1
315 import Ubuntu.Components.ListItems 1.0
316
317 /*! \brief ListItemWrappable
318diff --git b/converged/components/ManualIntroPage.qml a/converged/components/ManualIntroPage.qml
319index 0fce6f5..afe007a 100644
320--- b/converged/components/ManualIntroPage.qml
321+++ a/converged/components/ManualIntroPage.qml
322@@ -26,9 +26,9 @@
323 */
324
325 import QtQuick 2.0
326-import Ubuntu.Components 1.3
327+import Ubuntu.Components 1.1
328 import QtQuick.Layouts 1.1
329-import Ubuntu.Components.Popups 1.3
330+import Ubuntu.Components.Popups 0.1
331 import "actions"
332
333 Page {
334@@ -39,26 +39,16 @@ Page {
335 signal continueClicked();
336 signal testDone(var test);
337
338- onTestChanged: {
339- header.value = test['test_number']
340- header.maximumValue = test['tests_count']
341- }
342- header: ProgressHeader {
343- value: test['test_number']
344- maximumValue: test['tests_count']
345- title: i18n.tr("Test Description")
346- leadingActionBar { actions: [] }
347- trailingActionBar {
348- objectName: 'trailingActionBar'
349- actions: [
350- AddCommentAction {
351- id: addCommentAction
352- },
353- SkipAction {
354- id: skipAction
355- }
356- ]
357- }
358+ title: i18n.tr("Test Description")
359+ head {
360+ actions: [
361+ AddCommentAction {
362+ id: addCommentAction
363+ },
364+ SkipAction {
365+ id: skipAction
366+ }
367+ ]
368 }
369
370 TestPageBody {
371diff --git b/converged/components/PasswordDialog.qml a/converged/components/PasswordDialog.qml
372index dea1b0f..c3931bc 100644
373--- b/converged/components/PasswordDialog.qml
374+++ a/converged/components/PasswordDialog.qml
375@@ -19,8 +19,8 @@
376 * along with this program. If not, see <http://www.gnu.org/licenses/>.
377 */
378 import QtQuick 2.0
379-import Ubuntu.Components 1.3
380-import Ubuntu.Components.Popups 1.3
381+import Ubuntu.Components 1.1
382+import Ubuntu.Components.Popups 0.1
383
384 /*! \brief Password prompt dialog.
385 \inherits Item
386diff --git b/converged/components/ProgressBox.qml a/converged/components/ProgressBox.qml
387index b9fc720..a2b5d05 100644
388--- b/converged/components/ProgressBox.qml
389+++ a/converged/components/ProgressBox.qml
390@@ -20,7 +20,7 @@
391 */
392
393 import QtQuick 2.0
394-import Ubuntu.Components 1.3
395+import Ubuntu.Components 1.1
396 import QtQuick.Layouts 1.1
397
398 /*! \brief Progress Box.
399diff --git b/converged/components/ProgressHeader.qml a/converged/components/ProgressHeader.qml
400deleted file mode 100644
401index a7db263..0000000
402--- b/converged/components/ProgressHeader.qml
403+++ /dev/null
404@@ -1,59 +0,0 @@
405-/*
406- * This file is part of Checkbox
407- *
408- * Copyright 2016 Canonical Ltd.
409- *
410- * Authors:
411- * - Maciej Kisielewski <maciej.kisielewski@canonical.com>
412- *
413- * This program is free software; you can redistribute it and/or modify
414- * it under the terms of the GNU General Public License as published by
415- * the Free Software Foundation; version 3.
416- *
417- * This program is distributed in the hope that it will be useful,
418- * but WITHOUT ANY WARRANTY; without even the implied warranty of
419- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
420- * GNU General Public License for more details.
421- *
422- * You should have received a copy of the GNU General Public License
423- * along with this program. If not, see <http://www.gnu.org/licenses/>.
424- */
425-/*!
426- \brief Header with embedded progress bar
427-*/
428-import Ubuntu.Components 1.3
429-import QtQuick.Layouts 1.1
430-import QtQuick 2.2
431-
432-PageHeader {
433- id: header
434- property alias progressText: _progressText.text
435- property alias value: _progressBar.value
436- property alias maximumValue: _progressBar.maximumValue
437-
438- ColumnLayout{
439- anchors {
440- fill: parent
441- verticalCenter: parent.verticalCenter
442- bottomMargin: units.gu(0.5)
443- rightMargin: units.gu(2)
444- leftMargin: units.gu(5)
445- }
446- Label {
447- id: _progressText
448- fontSize: "x-small"
449- font.weight: Font.Light
450- anchors.right: _progressBar.right
451- anchors.bottom: parent.bottom
452- anchors.bottomMargin: units.gu(0.5)
453- text : Number(_progressBar.value / _progressBar.maximumValue * 100.0).toFixed(0) + "% (" + _progressBar.value + "/" + _progressBar.maximumValue + ")";
454- }
455- ProgressBox {
456- id: _progressBar
457- value: 0
458- maximumValue: 1
459- implicitWidth: parent.width - trailingActionBar.width
460- anchors.bottom: parent.bottom
461- }
462- }
463-}
464diff --git b/converged/components/QmlConfinedPage.qml a/converged/components/QmlConfinedPage.qml
465index 0c8f773..527525f 100644
466--- b/converged/components/QmlConfinedPage.qml
467+++ a/converged/components/QmlConfinedPage.qml
468@@ -23,8 +23,8 @@
469 */
470
471 import QtQuick 2.0
472-import Ubuntu.Components 1.3
473-import Ubuntu.Components.Popups 1.3
474+import Ubuntu.Components 1.1
475+import Ubuntu.Components.Popups 0.1
476 import QtQuick.Layouts 1.1
477 import Ubuntu.Content 1.1
478 import "actions"
479@@ -37,6 +37,7 @@ Page {
480 signal testDone(var test);
481
482 objectName: "qmlNativePage"
483+ title: i18n.tr("Test Description")
484
485 /* testingShell serves as the interface to the external world from the
486 * qml-test. */
487@@ -74,26 +75,15 @@ Page {
488 }
489 }
490
491- onTestChanged: {
492- header.value = test['test_number']
493- header.maximumValue = test['tests_count']
494- }
495- header: ProgressHeader {
496- value: test['test_number']
497- maximumValue: test['tests_count']
498- title: i18n.tr("Test Description")
499- leadingActionBar { actions: [] }
500- trailingActionBar {
501- objectName: 'trailingActionBar'
502- actions: [
503- AddCommentAction {
504- id: addCommentAction
505- },
506- SkipAction {
507- id: skipAction
508- }
509- ]
510- }
511+ head {
512+ actions: [
513+ AddCommentAction {
514+ id: addCommentAction
515+ },
516+ SkipAction {
517+ id: skipAction
518+ }
519+ ]
520 }
521
522 TestPageBody {
523diff --git b/converged/components/QmlNativePage.qml a/converged/components/QmlNativePage.qml
524index 8928f60..a33a883 100644
525--- b/converged/components/QmlNativePage.qml
526+++ a/converged/components/QmlNativePage.qml
527@@ -23,8 +23,8 @@
528 */
529
530 import QtQuick 2.0
531-import Ubuntu.Components 1.3
532-import Ubuntu.Components.Popups 1.3
533+import Ubuntu.Components 1.1
534+import Ubuntu.Components.Popups 0.1
535 import QtQuick.Layouts 1.1
536 import "actions"
537
538@@ -35,6 +35,7 @@ Page {
539 signal testDone(var test);
540
541 objectName: "qmlNativePage"
542+ title: i18n.tr("Test Description")
543
544 Object {
545 id: testingShell
546@@ -47,26 +48,15 @@ Page {
547 }
548 }
549
550- onTestChanged: {
551- header.value = test['test_number']
552- header.maximumValue = test['tests_count']
553- }
554- header: ProgressHeader {
555- value: test['test_number']
556- maximumValue: test['tests_count']
557- title: i18n.tr("Test Description")
558- leadingActionBar { actions: [] }
559- trailingActionBar {
560- objectName: 'trailingActionBar'
561- actions: [
562- AddCommentAction {
563- id: addCommentAction
564- },
565- SkipAction {
566- id: skipAction
567- }
568- ]
569- }
570+ head {
571+ actions: [
572+ AddCommentAction {
573+ id: addCommentAction
574+ },
575+ SkipAction {
576+ id: skipAction
577+ }
578+ ]
579 }
580
581 TestPageBody {
582diff --git b/converged/components/ResultsPage.qml a/converged/components/ResultsPage.qml
583index 35fdcd1..ca6d567 100644
584--- b/converged/components/ResultsPage.qml
585+++ a/converged/components/ResultsPage.qml
586@@ -26,10 +26,11 @@
587 */
588
589 import QtQuick 2.0
590-import Ubuntu.Components 1.3
591+import Ubuntu.Components 1.1
592 import QtQuick.Layouts 1.1
593
594 Page {
595+ title: i18n.tr("Test Results")
596 visible: false
597
598 objectName: "resultsPage"
599@@ -45,27 +46,22 @@ Page {
600 submitResultsButton.unlatch();
601 }
602
603- header: PageHeader {
604- title: i18n.tr("Test Results")
605- leadingActionBar { actions: [] }
606- trailingActionBar {
607- objectName: 'trailingActionBar'
608- actions: [
609- Action {
610- iconName: "close"
611- text: i18n.tr("Close")
612- onTriggered: endTesting();
613- },
614- Action {
615- id: rerunAction
616- objectName: "rerunAction"
617- iconName: "view-refresh"
618- text: i18n.tr("Rerun")
619- onTriggered: rerunTests();
620- visible: rerunEnabled
621- }
622- ]
623- }
624+ head {
625+ actions: [
626+ Action {
627+ id: rerunAction
628+ objectName: "rerunAction"
629+ iconName: "view-refresh"
630+ text: i18n.tr("Rerun")
631+ onTriggered: rerunTests();
632+ visible: rerunEnabled
633+ },
634+ Action {
635+ iconName: "close"
636+ text: i18n.tr("Close")
637+ onTriggered: endTesting();
638+ }
639+ ]
640 }
641
642 onResultsChanged: {
643@@ -88,10 +84,7 @@ Page {
644 ColumnLayout {
645 spacing: units.gu(2)
646 anchors {
647- top: parent.header.bottom
648- right: parent.right
649- left: parent.left
650- bottom: parent.bottom
651+ fill: parent
652 topMargin: units.gu(3)
653 bottomMargin: units.gu(3)
654 leftMargin: units.gu(1)
655diff --git b/converged/components/ResumeSessionPage.qml a/converged/components/ResumeSessionPage.qml
656index cbfbb59..ad57715 100644
657--- b/converged/components/ResumeSessionPage.qml
658+++ a/converged/components/ResumeSessionPage.qml
659@@ -26,7 +26,7 @@
660 */
661
662 import QtQuick 2.0
663-import Ubuntu.Components 1.3
664+import Ubuntu.Components 1.1
665 import QtQuick.Layouts 1.1
666
667 Page {
668@@ -39,21 +39,14 @@ Page {
669 signal deleteIncomplete();
670
671 objectName: "resumeSessionPage"
672+ title: i18n.tr("Resume session")
673 visible: false
674
675- header: PageHeader {
676- leadingActionBar { actions: [] }
677- title: i18n.tr("Resume session")
678- }
679-
680 ColumnLayout {
681 id: columnLayout
682 spacing: units.gu(3)
683 anchors {
684- top: parent.header.bottom
685- bottom: parent.bottom
686- right: parent.right
687- left: parent.left
688+ fill: parent
689 topMargin: units.gu(3)
690 bottomMargin: units.gu(3)
691 leftMargin: units.gu(1)
692diff --git b/converged/components/SelectionPage.qml a/converged/components/SelectionPage.qml
693index 6df9cb1..fbc2e75 100644
694--- b/converged/components/SelectionPage.qml
695+++ a/converged/components/SelectionPage.qml
696@@ -21,7 +21,7 @@
697
698 import QtQuick 2.0
699 import QtQuick.Layouts 1.1
700-import Ubuntu.Components 1.3
701+import Ubuntu.Components 1.1
702 import Ubuntu.Components.ListItems 0.1 as ListItem
703
704 /*! \brief Selection page
705@@ -32,15 +32,13 @@ import Ubuntu.Components.ListItems 0.1 as ListItem
706 */
707
708 Page {
709- id: root
710 signal selectionDone(var selected_id_list)
711 property string continueText: i18n.tr("Continue")
712 readonly property alias model: selectionModel
713 property alias keys: keysDelegator
714 property bool onlyOneAllowed: false
715 property bool emptyAllowed: false
716 property bool largeBuffer: false
717- property string title: ''
718
719 visible: false
720 flickable: null
721@@ -126,42 +124,40 @@ Page {
722 }
723 }
724
725- header: PageHeader {
726- title: root.title
727- trailingActionBar {
728- objectName: 'trailingActionBar'
729- actions: [
730- Action {
731- id: toggleSelection
732- objectName: "toggleSelectionAction"
733- iconName: "select"
734- text: i18n.tr("Toggle selection")
735- visible: !onlyOneAllowed
736- onTriggered: {
737- if (state === "empty selection" || state == "disabled only selection") {
738- if (!onlyOneAllowed) // still reachable via key shortcut
739- selectAll();
740- }
741- else if (state === "nonempty selection") {
742- deselectAll();
743- }
744- }
745- },
746- Action {
747- id: findAction
748- text: i18n.tr("Find")
749- iconName: 'find'
750- onTriggered: {
751- if (!searchBox.visible) {
752- searchBox.visible = true;
753- searchBox.forceActiveFocus();
754- } else {
755- searchBox.visible = false;
756- }
757- }
758- }
759- ]
760- }
761+ head {
762+ actions: [
763+ Action {
764+ id: toggleSelection
765+ objectName: "toggleSelectionAction"
766+ iconName: "select"
767+ text: i18n.tr("Toggle selection")
768+ visible: !onlyOneAllowed
769+ onTriggered: {
770+ if (state === "empty selection" || state == "disabled only selection") {
771+ if (!onlyOneAllowed) // still reachable via key shortcut
772+ selectAll();
773+ }
774+ else if (state === "nonempty selection") {
775+ deselectAll();
776+ }
777+
778+ }
779+ },
780+ Action {
781+ id: findAction
782+ text: i18n.tr("Find")
783+ iconName: 'find'
784+ onTriggered: {
785+ if (!searchBox.visible) {
786+ searchBox.visible = true;
787+ searchBox.forceActiveFocus();
788+ } else {
789+ searchBox.visible = false;
790+ }
791+ }
792+ }
793+ ]
794+ }
795 }
796
797 states: [
798@@ -209,11 +205,8 @@ Page {
799 ColumnLayout {
800 spacing: units.gu(3)
801 anchors {
802- top: parent.header.bottom
803- bottom: parent.bottom
804- right: parent.right
805- left: parent.left
806- topMargin: units.gu(1)
807+ fill: parent
808+ topMargin: units.gu(3)
809 bottomMargin: units.gu(3)
810 leftMargin: units.gu(1)
811 rightMargin: units.gu(1)
812diff --git b/converged/components/TestPageBody.qml a/converged/components/TestPageBody.qml
813index 73832e2..9693dae 100644
814--- b/converged/components/TestPageBody.qml
815+++ a/converged/components/TestPageBody.qml
816@@ -25,8 +25,8 @@
817
818 import QtQuick 2.0
819 import QtQuick.Layouts 1.1
820-import Ubuntu.Components 1.3
821-import Ubuntu.Components.Popups 1.3
822+import Ubuntu.Components 1.1
823+import Ubuntu.Components.Popups 0.1
824
825 ColumnLayout {
826 /* this property is the text to be shown in the top label */
827@@ -45,10 +45,7 @@ ColumnLayout {
828
829 spacing: units.gu(3)
830 anchors {
831- top: parent.header.bottom
832- right: parent.right
833- left: parent.left
834- bottom: parent.bottom
835+ fill: parent
836 topMargin: units.gu(3)
837 bottomMargin: units.gu(3)
838 leftMargin: units.gu(1)
839diff --git b/converged/components/TestVerificationPage.qml a/converged/components/TestVerificationPage.qml
840index 2178ffb..ad86d85 100644
841--- b/converged/components/TestVerificationPage.qml
842+++ a/converged/components/TestVerificationPage.qml
843@@ -26,9 +26,9 @@
844 */
845
846 import QtQuick 2.0
847-import Ubuntu.Components 1.3
848+import Ubuntu.Components 1.1
849 import QtQuick.Layouts 1.1
850-import Ubuntu.Components.Popups 1.3
851+import Ubuntu.Components.Popups 0.1
852 import "actions"
853
854 Page {
855@@ -38,26 +38,17 @@ Page {
856 signal testDone(var test);
857
858 objectName: "testVerificationPage"
859+ title: i18n.tr("Verification")
860
861- onTestChanged: {
862- header.value = test['test_number']
863- header.maximumValue = test['tests_count']
864- }
865- header: ProgressHeader {
866- value: test['test_number']
867- maximumValue: test['tests_count']
868- title: i18n.tr("Verification")
869- trailingActionBar {
870- objectName: 'trailingActionBar'
871- actions: [
872- AddCommentAction {
873- id: addCommentAction
874- },
875- SkipAction {
876- id: skipAction
877- }
878- ]
879- }
880+ head {
881+ actions: [
882+ AddCommentAction {
883+ id: addCommentAction
884+ },
885+ SkipAction {
886+ id: skipAction
887+ }
888+ ]
889 }
890
891 TestPageBody {
892diff --git b/converged/components/UserInteractSummaryPage.qml a/converged/components/UserInteractSummaryPage.qml
893index 8f3ca06..2dc286d 100644
894--- b/converged/components/UserInteractSummaryPage.qml
895+++ a/converged/components/UserInteractSummaryPage.qml
896@@ -26,8 +26,8 @@
897 */
898
899 import QtQuick 2.0
900-import Ubuntu.Components 1.3
901-import Ubuntu.Components.Popups 1.3
902+import Ubuntu.Components 1.1
903+import Ubuntu.Components.Popups 0.1
904 import QtQuick.Layouts 1.1
905 import "actions"
906
907@@ -38,25 +38,17 @@ Page {
908
909 signal testDone(var test);
910
911- onTestChanged: {
912- header.value = test['test_number']
913- header.maximumValue = test['tests_count']
914- }
915- header: ProgressHeader {
916- value: test['test_number']
917- maximumValue: test['tests_count']
918- title: i18n.tr("Verification")
919- trailingActionBar {
920- objectName: 'trailingActionBar'
921- actions: [
922- AddCommentAction {
923- id: addCommentAction
924- },
925- SkipAction {
926- id: skipAction
927- }
928- ]
929- }
930+ title: i18n.tr("Verification")
931+
932+ head {
933+ actions: [
934+ AddCommentAction {
935+ id: addCommentAction
936+ },
937+ SkipAction {
938+ id: skipAction
939+ }
940+ ]
941 }
942
943 TestPageBody {
944diff --git b/converged/components/WebViewer.qml a/converged/components/WebViewer.qml
945index 0348919..7b5ef78 100644
946--- b/converged/components/WebViewer.qml
947+++ a/converged/components/WebViewer.qml
948@@ -21,7 +21,7 @@
949
950 import QtQuick 2.0
951 import Ubuntu.Web 0.2
952-import Ubuntu.Components 1.3
953+import Ubuntu.Components 1.1
954
955
956 Page {
957diff --git b/converged/components/WelcomePage.qml a/converged/components/WelcomePage.qml
958index a310e41..cf328d0 100644
959--- b/converged/components/WelcomePage.qml
960+++ a/converged/components/WelcomePage.qml
961@@ -21,7 +21,7 @@
962 */
963
964 import QtQuick 2.0
965-import Ubuntu.Components 1.3
966+import Ubuntu.Components 1.1
967
968 Page {
969 id: welcomePage
970@@ -39,24 +39,17 @@ Page {
971 startTestButton.unlatch();
972 state = "loaded";
973 }
974- header: PageHeader {
975- Component.onCompleted: {
976- console.log('DEPTH: ', pageStack.depth)
977- }
978- leadingActionBar { actions: [] }
979- trailingActionBar {
980- actions: [
981- Action {
982- id: continueAction
983- iconName: "info"
984- text: i18n.tr("About")
985- onTriggered: aboutClicked()
986- }
987- ]
988- }
989+ head {
990+ actions: [
991+ Action {
992+ id: continueAction
993+ iconName: "info"
994+ text: i18n.tr("About")
995+ onTriggered: aboutClicked()
996+ }
997+ ]
998 }
999
1000-
1001 Label {
1002 id: welcomeText
1003
1004diff --git b/converged/components/actions/AddCommentAction.qml a/converged/components/actions/AddCommentAction.qml
1005index b3977ce..d7daf53 100644
1006--- b/converged/components/actions/AddCommentAction.qml
1007+++ a/converged/components/actions/AddCommentAction.qml
1008@@ -22,8 +22,8 @@
1009 /*! \brief Action component for adding a comment. */
1010
1011 import QtQuick 2.0
1012-import Ubuntu.Components 1.3
1013-import Ubuntu.Components.Popups 1.3
1014+import Ubuntu.Components 1.1
1015+import Ubuntu.Components.Popups 0.1
1016
1017 Action {
1018 id: addCommentAction
1019diff --git b/converged/components/actions/SkipAction.qml a/converged/components/actions/SkipAction.qml
1020index 124c7dd..712d746 100644
1021--- b/converged/components/actions/SkipAction.qml
1022+++ a/converged/components/actions/SkipAction.qml
1023@@ -22,8 +22,8 @@
1024 /*! \brief Action component for skipping a test. */
1025
1026 import QtQuick 2.0
1027-import Ubuntu.Components 1.3
1028-import Ubuntu.Components.Popups 1.3
1029+import Ubuntu.Components 1.1
1030+import Ubuntu.Components.Popups 0.1
1031
1032 Action {
1033 id: skipAction
1034diff --git b/converged/tests/autopilot/checkbox_converged/__init__.py a/converged/tests/autopilot/checkbox_converged/__init__.py
1035index 547ab73..77e5220 100644
1036--- b/converged/tests/autopilot/checkbox_converged/__init__.py
1037+++ a/converged/tests/autopilot/checkbox_converged/__init__.py
1038@@ -87,7 +87,7 @@ class ClickAppTestCase(base.UbuntuUIToolkitAppTestCase):
1039 self.pointing_device.click_object(continue_btn)
1040 category_page = self.app.wait_select_single(
1041 objectName='categorySelectionPage', visible=True)
1042- self._click_action_button('trailingActionBar', 'toggleSelectionAction')
1043+ self.main_view.get_header().click_action_button('toggleSelectionAction')
1044 list_item = category_page.wait_select_single(
1045 objectName='listItem', item_mod_id=category_id)
1046 self.pointing_device.click_object(list_item)
1047@@ -96,7 +96,7 @@ class ClickAppTestCase(base.UbuntuUIToolkitAppTestCase):
1048 self.pointing_device.click_object(continue_btn)
1049 test_selection_page = self.app.wait_select_single(
1050 objectName='testSelectionPage', visible=True)
1051- self._click_action_button('trailingActionBar', 'toggleSelectionAction')
1052+ self.main_view.get_header().click_action_button('toggleSelectionAction')
1053 # lists are built dynamically, so there is a chance that proxies for
1054 # qml objects for list items that are down below are not yet present.
1055 # To make sure everything is loaded and ready, scroll to the bottom
1056@@ -217,11 +217,6 @@ class ClickAppTestCase(base.UbuntuUIToolkitAppTestCase):
1057 return os.path.join(self._get_path_to_app_source(), 'lib', 'py',
1058 'plainbox', 'data', 'plainbox-qml-modules')
1059
1060- def _click_action_button(self, bar_name, actionName):
1061- action_bar = self.app.wait_select_single(
1062- objectName=bar_name, visible=True)
1063- action_bar.click_action_button(actionName)
1064-
1065 def _launch_application_from_phablet(self):
1066 # On phablet, we only run the tests against the installed click
1067 # package.
1068diff --git b/converged/tests/autopilot/checkbox_converged/test_checkbox_converged.py a/converged/tests/autopilot/checkbox_converged/test_checkbox_converged.py
1069index e9fe916..c0bf6a3 100644
1070--- b/converged/tests/autopilot/checkbox_converged/test_checkbox_converged.py
1071+++ a/converged/tests/autopilot/checkbox_converged/test_checkbox_converged.py
1072@@ -19,7 +19,7 @@ class TestCheckboxConverged(checkbox_converged.ClickAppTestCase):
1073 if selectable_object_name is not None:
1074 self.app.wait_select_single(
1075 objectName=selectable_object_name, visible=True)
1076- self._click_action_button('trailingActionBar', 'skip')
1077+ self.main_view.get_header().click_action_button('skip')
1078 dialog = self.app.wait_select_single(objectName='dialog')
1079 yes_btn = dialog.select_single(objectName='yesButton')
1080 self.pointing_device.click_object(yes_btn)
1081@@ -62,7 +62,7 @@ class TestCheckboxConverged(checkbox_converged.ClickAppTestCase):
1082 self.pointing_device.click_object(continue_btn)
1083 category_page = self.app.wait_select_single(
1084 objectName='categorySelectionPage', visible=True)
1085- self._click_action_button('trailingActionBar', 'toggleSelectionAction')
1086+ self.main_view.get_header().click_action_button('toggleSelectionAction')
1087 category_id = '2015.com.canonical.certification::normal'
1088 list_item = category_page.wait_select_single(
1089 objectName='listItem', item_mod_id=category_id)
1090@@ -299,7 +299,7 @@ class RerunTests(checkbox_converged.ClickAppTestCase):
1091 self.process_sequence_of_clicks_on_pages(next_steps)
1092 results_page = self.app.wait_select_single(
1093 objectName='resultsPage', visible=True)
1094- self._click_action_button('trailingActionBar', 'rerunAction')
1095+ self.main_view.get_header().click_action_button('rerunAction')
1096 # we now should see a re-run screen; let's select the only test
1097 rerun_page = self.app.wait_select_single(
1098 objectName='rerunSelectionPage', visible=True)
1099@@ -313,7 +313,7 @@ class RerunTests(checkbox_converged.ClickAppTestCase):
1100 self.process_sequence_of_clicks_on_pages(next_steps)
1101 results_page = self.app.wait_select_single(
1102 objectName='resultsPage', visible=True)
1103- self._click_action_button('trailingActionBar', 'rerunAction')
1104+ self.main_view.get_header().click_action_button('rerunAction')
1105 # we should see the re-run screen again
1106 rerun_page = self.app.wait_select_single(
1107 objectName='rerunSelectionPage', visible=True)
1108@@ -333,7 +333,7 @@ class RerunTests(checkbox_converged.ClickAppTestCase):
1109 self.process_sequence_of_clicks_on_pages(next_steps)
1110 results_page = self.app.wait_select_single(
1111 objectName='resultsPage', visible=True)
1112- self._click_action_button('trailingActionBar', 'rerunAction')
1113+ self.main_view.get_header().click_action_button('rerunAction')
1114 # we now should see a re-run screen; let's select the only test
1115 rerun_page = self.app.wait_select_single(
1116 objectName='rerunSelectionPage', visible=True)
1117--- a/converged/components/DialogMgr.qml
1118+++ b/converged/components/DialogMgr.qml
1119@@ -19,8 +19,8 @@
1120 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1121 */
1122 import QtQuick 2.0
1123-import Ubuntu.Components 1.3
1124-import Ubuntu.Components.Popups 1.3
1125+import Ubuntu.Components 1.1
1126+import Ubuntu.Components.Popups 0.1
1127
1128 Item {
1129 function showDialog(caller, message, buttons) {
01130
=== added file 'debian/patches/series'
--- debian/patches/series 1970-01-01 00:00:00 +0000
+++ debian/patches/series 2016-09-29 12:03:24 +0000
@@ -0,0 +1,1 @@
1components_1.3_removal.diff
02
=== added file 'debian/rules'
--- debian/rules 1970-01-01 00:00:00 +0000
+++ debian/rules 2016-09-29 12:03:24 +0000
@@ -0,0 +1,11 @@
1#!/usr/bin/make -f
2export LANG=
3export LANGUAGE=
4export http_proxy=http://127.0.0.1:9
5PPA_DISPLACEMENT=converged
6
7%:
8 dh $@ --sourcedirectory=$(PPA_DISPLACEMENT)
9
10override_dh_auto_test:
11 :
012
=== added file 'debian/settings.json'
--- debian/settings.json 1970-01-01 00:00:00 +0000
+++ debian/settings.json 2016-09-29 12:03:24 +0000
@@ -0,0 +1,15 @@
1{
2 "_comment": "file generated automatically with build-me",
3 "clickBuildDate": "2015-07-05",
4 "providersDir": "providers",
5 "revision": "1.2.0",
6 "testplan": "",
7 "submission": {
8 "type": "c3",
9 "name": "Certification site",
10 "input": [{
11 "paramName": "secure_id",
12 "prompt": "Enter the Secure ID for the system-under-test:"
13 }]
14 }
15}
016
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format 1970-01-01 00:00:00 +0000
+++ debian/source/format 2016-09-29 12:03:24 +0000
@@ -0,0 +1,1 @@
13.0 (quilt)
02
=== added file 'debian/tick.svg'
--- debian/tick.svg 1970-01-01 00:00:00 +0000
+++ debian/tick.svg 2016-09-29 12:03:24 +0000
@@ -0,0 +1,154 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<!-- Created with Inkscape (http://www.inkscape.org/) -->
3
4<svg
5 xmlns:dc="http://purl.org/dc/elements/1.1/"
6 xmlns:cc="http://creativecommons.org/ns#"
7 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
8 xmlns:svg="http://www.w3.org/2000/svg"
9 xmlns="http://www.w3.org/2000/svg"
10 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
11 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
12 width="90"
13 height="90"
14 id="svg4874"
15 version="1.1"
16 inkscape:version="0.48+devel r"
17 viewBox="0 0 90 90.000001"
18 sodipodi:docname="check02.svg">
19 <defs
20 id="defs4876" />
21 <sodipodi:namedview
22 id="base"
23 pagecolor="#ffffff"
24 bordercolor="#666666"
25 borderopacity="1.0"
26 inkscape:pageopacity="0.0"
27 inkscape:pageshadow="2"
28 inkscape:zoom="4.0745363"
29 inkscape:cx="6.0865817"
30 inkscape:cy="88.3168"
31 inkscape:document-units="px"
32 inkscape:current-layer="g1311"
33 showgrid="true"
34 showborder="true"
35 fit-margin-top="0"
36 fit-margin-left="0"
37 fit-margin-right="0"
38 fit-margin-bottom="0"
39 inkscape:snap-bbox="true"
40 inkscape:bbox-paths="true"
41 inkscape:bbox-nodes="true"
42 inkscape:snap-bbox-edge-midpoints="true"
43 inkscape:snap-bbox-midpoints="true"
44 inkscape:object-paths="true"
45 inkscape:snap-intersection-paths="true"
46 inkscape:object-nodes="true"
47 inkscape:snap-smooth-nodes="true"
48 inkscape:snap-midpoints="true"
49 inkscape:snap-object-midpoints="true"
50 inkscape:snap-center="true"
51 showguides="true"
52 inkscape:guide-bbox="true">
53 <inkscape:grid
54 type="xygrid"
55 id="grid5451"
56 empspacing="6" />
57 <sodipodi:guide
58 orientation="1,0"
59 position="6,77"
60 id="guide4063" />
61 <sodipodi:guide
62 orientation="1,0"
63 position="3,78"
64 id="guide4065" />
65 <sodipodi:guide
66 orientation="0,1"
67 position="55,84"
68 id="guide4067" />
69 <sodipodi:guide
70 orientation="0,1"
71 position="53,87"
72 id="guide4069" />
73 <sodipodi:guide
74 orientation="0,1"
75 position="20,3"
76 id="guide4071" />
77 <sodipodi:guide
78 orientation="0,1"
79 position="20,6"
80 id="guide4073" />
81 <sodipodi:guide
82 orientation="1,0"
83 position="87,7"
84 id="guide4075" />
85 <sodipodi:guide
86 orientation="1,0"
87 position="84,7"
88 id="guide4077" />
89 <sodipodi:guide
90 orientation="0,1"
91 position="58,81"
92 id="guide4074" />
93 <sodipodi:guide
94 orientation="1,0"
95 position="9,74"
96 id="guide4076" />
97 <sodipodi:guide
98 orientation="0,1"
99 position="21,9"
100 id="guide4078" />
101 <sodipodi:guide
102 orientation="1,0"
103 position="81,4"
104 id="guide4080" />
105 </sodipodi:namedview>
106 <metadata
107 id="metadata4879">
108 <rdf:RDF>
109 <cc:Work
110 rdf:about="">
111 <dc:format>image/svg+xml</dc:format>
112 <dc:type
113 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
114 <dc:title></dc:title>
115 </cc:Work>
116 </rdf:RDF>
117 </metadata>
118 <g
119 inkscape:label="Layer 1"
120 inkscape:groupmode="layer"
121 id="layer1"
122 transform="translate(67.857146,-84.50504)">
123 <g
124 transform="matrix(0,-1,-1,0,373.50506,516.50504)"
125 id="g4845"
126 style="display:inline">
127 <g
128 transform="matrix(0,-1,-1,0,567.36222,615.36221)"
129 id="g1311"
130 inkscape:export-filename="envelope02.png"
131 inkscape:export-xdpi="90"
132 inkscape:export-ydpi="90">
133 <g
134 id="g1313"
135 transform="matrix(1.875,0,0,1.875,-366,-1657.8169)">
136 <rect
137 transform="translate(0,804.3622)"
138 y="152"
139 x="288"
140 height="48"
141 width="48"
142 id="rect1315"
143 style="opacity:0.21171169;fill:none;stroke:none" />
144 </g>
145 <path
146 style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none"
147 d="m 256.82022,151.04429 -47.05336,42.21417 -27.13214,-24.27339 -5.57027,6.29782 32.69198,34.39726 L 261,155.75985 Z"
148 id="path4041-9"
149 inkscape:connector-curvature="0"
150 sodipodi:nodetypes="ccccccc" />
151 </g>
152 </g>
153 </g>
154</svg>
0155
=== added file 'debian/window-close.svg'
--- debian/window-close.svg 1970-01-01 00:00:00 +0000
+++ debian/window-close.svg 2016-09-29 12:03:24 +0000
@@ -0,0 +1,19 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<!-- Created with Inkscape (http://www.inkscape.org/) -->
3<svg id="svg7384" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
4 <title id="title9167">Gnome Symbolic Icon Theme</title>
5 <metadata id="metadata90">
6 <rdf:RDF>
7 <cc:Work rdf:about="">
8 <dc:format>image/svg+xml</dc:format>
9 <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
10 <dc:title>Gnome Symbolic Icon Theme</dc:title>
11 </cc:Work>
12 </rdf:RDF>
13 </metadata>
14 <g id="layer12" transform="translate(-60,-518)">
15 <g id="layer4-4-1" transform="translate(19,-242)">
16 <path id="path10839-9" style="block-progression:tb;text-indent:0;color:#bebebe;enable-background:new;text-transform:none;fill:#bebebe" d="m45 764h1c0.01037-0.00012 0.02079-0.00046 0.03125 0 0.25495 0.0112 0.50987 0.12858 0.6875 0.3125l2.281 2.28 2.312-2.28c0.266-0.23 0.447-0.3 0.688-0.31h1v1c0 0.28647-0.03434 0.55065-0.25 0.75l-2.2812 2.2812 2.25 2.25c0.188 0.19 0.281 0.45 0.281 0.72v1h-1c-0.2653-0.00001-0.53059-0.0931-0.71875-0.28125l-2.281-2.28-2.281 2.28c-0.188 0.19-0.454 0.28-0.719 0.28h-1v-1c-0.000003-0.26529 0.09306-0.53058 0.28125-0.71875l2.2812-2.25-2.281-2.28c-0.21-0.19-0.303-0.47-0.281-0.75v-1z"/>
17 </g>
18 </g>
19</svg>

Subscribers

People subscribed via source and target branches