Merge lp:~kissiel/checkbox/fix-dependencies into lp:checkbox

Proposed by Maciej Kisielewski
Status: Rejected
Rejected by: Maciej Kisielewski
Proposed branch: lp:~kissiel/checkbox/fix-dependencies
Merge into: lp:checkbox
Diff against target: 140 lines (+89/-0)
10 files modified
debian/changelog (+5/-0)
debian/checkbox-touch.desktop (+10/-0)
debian/clean (+2/-0)
debian/compat (+1/-0)
debian/control (+25/-0)
debian/copyright (+21/-0)
debian/install (+6/-0)
debian/rules (+11/-0)
debian/settings.json (+7/-0)
debian/source/format (+1/-0)
To merge this branch: bzr merge lp:~kissiel/checkbox/fix-dependencies
Reviewer Review Type Date Requested Status
Checkbox Developers Pending
Review via email: mp+271685@code.launchpad.net

Description of the change

This MR adds qtdeclarative5-dev-tools to C-C's dependencies.

To post a comment you must log in.

Unmerged revisions

5. By Maciej Kisielewski

Add qtdeclarative5-dev-tools to deps.

4. By Maciej Kisielewski

merged with trunk

3. By Maciej Kisielewski

add forgotten `qmlscene` to control

2. By Maciej Kisielewski

move files into ./debian/

1. By Maciej Kisielewski

Initial commit

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'debian'
2=== added file 'debian/changelog'
3--- debian/changelog 1970-01-01 00:00:00 +0000
4+++ debian/changelog 2015-09-18 17:04:24 +0000
5@@ -0,0 +1,5 @@
6+checkbox-converged (1.2.0) UNRELEASED; urgency=medium
7+
8+ * Initial release. (Closes: #XXXXXX)
9+
10+ -- Maciej Kisielewski <maciej.kisielewski@canonical.com> Tue, 07 Jul 2015 12:19:29 +0200
11
12=== added file 'debian/checkbox-touch.desktop'
13--- debian/checkbox-touch.desktop 1970-01-01 00:00:00 +0000
14+++ debian/checkbox-touch.desktop 2015-09-18 17:04:24 +0000
15@@ -0,0 +1,10 @@
16+
17+# This file has been generated by build-me script
18+[Desktop Entry]
19+Name=Checkbox Converged
20+Comment=System testing utility for Ubuntu
21+Exec=qmlscene --settings=/usr/share/checkbox-converged/settings.json $@ /usr/share/checkbox-converged/checkbox-touch.qml
22+Icon=checkbox-touch.svg
23+Terminal=false
24+Type=Application
25+X-Ubuntu-Touch=true
26
27=== added file 'debian/clean'
28--- debian/clean 1970-01-01 00:00:00 +0000
29+++ debian/clean 2015-09-18 17:04:24 +0000
30@@ -0,0 +1,2 @@
31+checkbox-touch/py/__pycache__/*.pyc
32+
33
34=== added file 'debian/compat'
35--- debian/compat 1970-01-01 00:00:00 +0000
36+++ debian/compat 2015-09-18 17:04:24 +0000
37@@ -0,0 +1,1 @@
38+9
39
40=== added file 'debian/control'
41--- debian/control 1970-01-01 00:00:00 +0000
42+++ debian/control 2015-09-18 17:04:24 +0000
43@@ -0,0 +1,25 @@
44+Source: checkbox-converged
45+Section: utils
46+Priority: optional
47+Maintainer: Checkbox Developers <checkbox-dev@lists.launchpad.net>
48+Uploaders: Sylvain Pineau <sylvain.pineau@canonical.com>,
49+ Zygmunt Krynicki <zygmunt.krynicki@canonical.com>,
50+ Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
51+Build-Depends: debhelper (>= 9)
52+Standards-Version: 3.9.6
53+Homepage: http://launchpad.net/checkbox
54+
55+Package: checkbox-converged
56+Architecture: all
57+Depends: pyotherside,
58+ python3,
59+ python3-plainbox (>= 0.22),
60+ qml-module-qtquick-layouts,
61+ qml-module-qtquick-qchartjs,
62+ qmlscene,
63+ qtdeclarative5-dev-tools,
64+ qtdeclarative5-test-plugin,
65+ qtdeclarative5-ubuntu-ui-toolkit-plugin,
66+ ${misc:Depends}
67+Description: testing tool for all Ubuntu devices
68+ This tool helps to test devices ranging from servers to phones.
69
70=== added file 'debian/copyright'
71--- debian/copyright 1970-01-01 00:00:00 +0000
72+++ debian/copyright 2015-09-18 17:04:24 +0000
73@@ -0,0 +1,21 @@
74+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
75+Upstream-Name: checkbox-converged
76+Source: https://launchpad.net/checkbox
77+
78+Files: *
79+Copyright: Copyright 2012-2015 Canonical Ltd.
80+License: GPL-3
81+ This program is free software: you can redistribute it and/or modify
82+ it under the terms of the GNU General Public License version 3,
83+ as published by the Free Software Foundation.
84+ .
85+ This program is distributed in the hope that it will be useful,
86+ but WITHOUT ANY WARRANTY; without even the implied warranty of
87+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
88+ GNU General Public License for more details.
89+ .
90+ You should have received a copy of the GNU General Public License
91+ along with this program. If not, see <http://www.gnu.org/licenses/>.
92+ .
93+ On Debian-based systems the full text of the GPL, version 3, can be found at
94+ /usr/share/common-licenses/GPL-3.
95
96=== added file 'debian/install'
97--- debian/install 1970-01-01 00:00:00 +0000
98+++ debian/install 2015-09-18 17:04:24 +0000
99@@ -0,0 +1,6 @@
100+checkbox-touch/checkbox-touch.qml usr/share/checkbox-converged/
101+checkbox-touch/checkbox-touch.svg usr/share/icons/hicolor/scalable/apps/
102+checkbox-touch/components usr/share/checkbox-converged/
103+checkbox-touch/py usr/share/checkbox-converged/
104+debian/checkbox-touch.desktop usr/share/applications
105+debian/settings.json usr/share/checkbox-converged/
106
107=== added file 'debian/rules'
108--- debian/rules 1970-01-01 00:00:00 +0000
109+++ debian/rules 2015-09-18 17:04:24 +0000
110@@ -0,0 +1,11 @@
111+#!/usr/bin/make -f
112+export LANG=
113+export LANGUAGE=
114+export http_proxy=http://127.0.0.1:9
115+PPA_DISPLACEMENT=checkbox-touch
116+
117+%:
118+ dh $@ --sourcedirectory=$(PPA_DISPLACEMENT)
119+
120+override_dh_auto_test:
121+ :
122
123=== added file 'debian/settings.json'
124--- debian/settings.json 1970-01-01 00:00:00 +0000
125+++ debian/settings.json 2015-09-18 17:04:24 +0000
126@@ -0,0 +1,7 @@
127+{
128+ "_comment": "file generated automatically with build-me",
129+ "clickBuildDate": "2015-07-05",
130+ "providersDir": "providers",
131+ "revision": "1.2.0",
132+ "testplan": ""
133+}
134
135=== added directory 'debian/source'
136=== added file 'debian/source/format'
137--- debian/source/format 1970-01-01 00:00:00 +0000
138+++ debian/source/format 2015-09-18 17:04:24 +0000
139@@ -0,0 +1,1 @@
140+3.0 (native)

Subscribers

People subscribed via source and target branches