Checkbox

Merge lp:~brendan-donegan/checkbox/plainbox_gui_transplant_packaging into lp:~checkbox-dev/checkbox/checkbox-packaging

  1. plainbox_gui_transplant_packaging
  2. Merge into checkbox-packaging
Proposed by Brendan Donegan
Status: Rejected
Rejected by: Zygmunt Krynicki
Proposed branch: lp:~brendan-donegan/checkbox/plainbox_gui_transplant_packaging
Merge into: lp:~checkbox-dev/checkbox/checkbox-packaging
Diff against target: 298 lines (+78/-29)
9 files modified
debian/canonical-certification-server.install (+2/-2)
debian/checkbox-gui.install (+4/-0)
debian/checkbox-ng-service.install (+1/-1)
debian/checkbox.install (+1/-1)
debian/control (+63/-20)
debian/python3-checkbox-ng.install (+1/-1)
debian/python3-checkbox.install (+1/-1)
debian/python3-plainbox.install (+2/-2)
debian/rules (+3/-1)
To merge this branch: bzr merge lp:~brendan-donegan/checkbox/plainbox_gui_transplant_packaging
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Needs Fixing
Review via email: mp+197843@code.launchpad.net

Description of the change

This merge includes changes to the checkbox packaging branch to include the new checkbox-gui package.

To post a comment you must log in.
lp:~brendan-donegan/checkbox/plainbox_gui_transplant_packaging updated
66. By Brendan Donegan

checkbox-gui depend on checkbox-ng-service

Revision history for this message
Daniel Manrique (roadmr) wrote :

I see you didn't run wrap-and-sort. It may be worth doing so, since you're fixing and tidying up packaging anyway.

Run this in the top-level directory for packaging (i.e. if you do "ls" you should see the "debian" subdirectory). Then just look at the diff to ensure it didn't do anything unexpected.

Revision history for this message
Zygmunt Krynicki (zyga) wrote :

Hi

Please squash stuff so that we can track logical changes and not development progress.
Otherwise, looks ok.

(though I may find stuff after I can read the history in a way that I can keep track of)

review: Needs Fixing
lp:~brendan-donegan/checkbox/plainbox_gui_transplant_packaging updated
67. By Brendan Donegan

wrap and sort run

68. By Brendan Donegan

Add desktop file to install of checkbox-gui

69. By Brendan Donegan

Another run of wrap and sort

Revision history for this message
Zygmunt Krynicki (zyga) wrote :

Replaced with https://code.launchpad.net/~zkrynicki/checkbox/checkbox-gui-packaging/+merge/198621

Unmerged revisions

69. By Brendan Donegan

Another run of wrap and sort

68. By Brendan Donegan

Add desktop file to install of checkbox-gui

67. By Brendan Donegan

wrap and sort run

66. By Brendan Donegan

checkbox-gui depend on checkbox-ng-service

65. By Brendan Donegan

Exclude the whole checkbox-gui package

64. By Brendan Donegan

Mention the binary by name (brute force)

63. By Brendan Donegan

Try the binary package name instead of a path

62. By Brendan Donegan

Try excluding checkbox-gui from dh_python3

61. By Brendan Donegan

Qt package doesn't need python3 depends

60. By Brendan Donegan

Any not All

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/canonical-certification-server.install'
2--- debian/canonical-certification-server.install 2013-11-07 12:27:46 +0000
3+++ debian/canonical-certification-server.install 2013-12-11 10:15:30 +0000
4@@ -1,3 +1,3 @@
5+checkbox-ng/contrib/canonical-certification-server.conf etc/init
6+debian/extras/canonical-certification-config/canonical-certification.conf /etc/xdg
7 usr/bin/canonical-certification-server
8-debian/extras/canonical-certification-config/canonical-certification.conf /etc/xdg
9-checkbox-ng/contrib/canonical-certification-server.conf etc/init
10
11=== added file 'debian/checkbox-gui.install'
12--- debian/checkbox-gui.install 1970-01-01 00:00:00 +0000
13+++ debian/checkbox-gui.install 2013-12-11 10:15:30 +0000
14@@ -0,0 +1,4 @@
15+usr/bin/checkbox-gui
16+usr/lib/checkbox-gui/plugins/*
17+usr/share/applications/checkbox-gui.desktop
18+usr/share/checkbox-gui/qml/*
19
20=== modified file 'debian/checkbox-ng-service.install'
21--- debian/checkbox-ng-service.install 2013-11-06 12:10:16 +0000
22+++ debian/checkbox-ng-service.install 2013-12-11 10:15:30 +0000
23@@ -1,2 +1,2 @@
24+
25 checkbox-ng/contrib/com.canonical.certification.PlainBox1.service usr/share/dbus-1/services/
26-
27
28=== modified file 'debian/checkbox.install'
29--- debian/checkbox.install 2013-10-21 13:38:57 +0000
30+++ debian/checkbox.install 2013-12-11 10:15:30 +0000
31@@ -6,8 +6,8 @@
32 usr/share/checkbox/data/*
33 usr/share/checkbox/examples/checkbox.ini
34 usr/share/checkbox/examples/network.cfg
35+usr/share/checkbox/examples/org.freedesktop.policykit.checkbox.policy usr/share/polkit-1/actions/
36 usr/share/checkbox/examples/virtualization.cfg
37-usr/share/checkbox/examples/org.freedesktop.policykit.checkbox.policy usr/share/polkit-1/actions/
38 usr/share/checkbox/install/*
39 usr/share/checkbox/jobs/*
40 usr/share/checkbox/patches/*
41
42=== modified file 'debian/control'
43--- debian/control 2013-11-26 13:41:01 +0000
44+++ debian/control 2013-12-11 10:15:30 +0000
45@@ -21,7 +21,8 @@
46 python3-requests ( >= 1.0),
47 python3-setuptools,
48 python3-sphinx,
49- qt4-qmake
50+ qt4-qmake,
51+ ubuntu-sdk
52 Vcs-Bzr: https://code.launchpad.net/~checkbox-dev/checkbox/checkbox-packaging
53
54 Package: python3-plainbox-doc
55@@ -80,14 +81,14 @@
56 nmap,
57 obexd-client,
58 obexftp,
59+ python (>= 2.7),
60 render-bench,
61 smartmontools,
62 sox,
63 stress,
64 sysstat,
65 wmctrl,
66- wodim,
67- python (>= 2.7),
68+ wodim
69 Description: System testing application
70 This project provides an extensible interface for system testing. The
71 results can then be sent to Launchpad.
72@@ -140,7 +141,7 @@
73
74 Package: plainbox-provider-resource-generic
75 Architecture: all
76-Depends: python3-checkbox, ${misc:Depends}, python3 (>= 3.2)
77+Depends: python3 (>= 3.2), python3-checkbox, ${misc:Depends}
78 Recommends: dmidecode, dpkg (>= 1.13), lsb-release, wodim
79 Description: CheckBox generic resource jobs provider
80 This package provides the generic resource jobs.
81@@ -155,8 +156,8 @@
82 Package: plainbox-provider-checkbox
83 Architecture: any
84 Depends: plainbox-provider-resource-generic,
85- ${misc:Depends},
86 python3 (>= 3.2),
87+ ${misc:Depends},
88 ${shlibs:Depends}
89 Recommends: gir1.2-gst-plugins-base-1.0,
90 gir1.2-gstreamer-1.0,
91@@ -181,13 +182,13 @@
92 nmap,
93 obexd-client,
94 obexftp,
95+ python (>= 2.7),
96 render-bench,
97 smartmontools,
98 sox,
99 stress,
100 sysstat,
101- wmctrl,
102- python (>= 2.7),
103+ wmctrl
104 Description: CheckBox jobs
105 This package provides the CheckBox jobs collection.
106
107@@ -201,14 +202,44 @@
108 Package: plainbox-provider-certification-server
109 Architecture: all
110 Depends: plainbox-provider-checkbox
111-Recommends: apache2, bind9, cups, dnsutils, ipmitool, iperf, libapache2-mod-php5, mysql-server, php5-mysql, samba, ssh, tomcat6, winbind, cpu-checker, qemu-kvm, qemu-utils
112+Recommends: apache2,
113+ bind9,
114+ cpu-checker,
115+ cups,
116+ dnsutils,
117+ iperf,
118+ ipmitool,
119+ libapache2-mod-php5,
120+ mysql-server,
121+ php5-mysql,
122+ qemu-kvm,
123+ qemu-utils,
124+ samba,
125+ ssh,
126+ tomcat6,
127+ winbind
128 Description: Server Certification
129 This package provides the Server Certification whitelists.
130
131 Package: plainbox-provider-certification-server-soc
132 Architecture: all
133 Depends: plainbox-provider-checkbox
134-Recommends: apache2, bind9, cups, dnsutils, ipmitool, iperf, libapache2-mod-php5, mysql-server, php5-mysql, samba, ssh, tomcat6, winbind, cpu-checker, qemu-kvm, qemu-utils
135+Recommends: apache2,
136+ bind9,
137+ cpu-checker,
138+ cups,
139+ dnsutils,
140+ iperf,
141+ ipmitool,
142+ libapache2-mod-php5,
143+ mysql-server,
144+ php5-mysql,
145+ qemu-kvm,
146+ qemu-utils,
147+ samba,
148+ ssh,
149+ tomcat6,
150+ winbind
151 Description: SoC Certification
152 This package provides the Server SoC Certification whitelists.
153
154@@ -236,9 +267,7 @@
155
156 Package: plainbox
157 Architecture: all
158-Depends: python3-plainbox (>= 0.3+bzr2359),
159- ${misc:Depends},
160- ${python3:Depends}
161+Depends: python3-plainbox (>= 0.3+bzr2359), ${misc:Depends}, ${python3:Depends}
162 Description: Simple replacement for CheckBox
163 PlainBox is a hardware testing tool useful for certifying laptops, desktops
164 and servers with Ubuntu. It is a replacement for the current certification
165@@ -263,8 +292,7 @@
166 Package: checkbox-ng
167 Architecture: all
168 Depends: python3-checkbox-ng
169- ${misc:Depends},
170- ${python3:Depends}
171+ ${misc:Depends}, ${python3:Depends}
172 Description: Simple replacement for CheckBox
173 CheckBox command line tool
174
175@@ -272,13 +300,13 @@
176 Priority: extra
177 Section: oldlibs
178 Architecture: all
179-Depends: checkbox-ng-service
180+Depends: checkbox-ng-service
181 Description: PlainBox D-Bus service (transitional package)
182 Transitional package that can be safely removed
183
184 Package: checkbox-ng-service
185 Architecture: all
186-Depends: checkbox-ng, python3-gi, python3-dbus
187+Depends: checkbox-ng, python3-dbus, python3-gi
188 Description: CheckBox D-Bus service
189 File(s) needed for auto-starting CheckBox D-Bus service on demand.
190
191@@ -286,7 +314,7 @@
192 Architecture: all
193 Priority: extra
194 Section: oldlibs
195-Depends: checkbox-autostart-desktop
196+Depends: checkbox-autostart-desktop
197 Description: PlainBox autostart for desktop install
198 Transitional package that can be safely removed
199
200@@ -294,7 +322,7 @@
201 Architecture: all
202 Priority: extra
203 Section: oldlibs
204-Depends: checkbox-autostart-server
205+Depends: checkbox-autostart-server
206 Description: PlainBox autostart for server install
207 Transitional package that can be safely removed
208
209@@ -333,13 +361,13 @@
210 Architecture: all
211 Priority: extra
212 Section: oldlibs
213-Depends: checkbox-ci-mailer
214+Depends: checkbox-ci-mailer
215 Description: PlainBox CI mailer
216 Transitional package that can be safely removed
217
218 Package: checkbox-ci-mailer
219 Architecture: all
220-Depends: curl, checkbox-autostart-server | checkbox-autostart-desktop
221+Depends: checkbox-autostart-server | checkbox-autostart-desktop, curl
222 Description: CheckBox CI mailer
223 Helper that e-mails CheckBox output from autostart packages when run is
224 finished.
225@@ -366,3 +394,18 @@
226 Replaces: checkbox-certification-server
227 Description: Canonical Certification Server.
228 checkbox-certification-server
229+
230+Package: checkbox-gui
231+Architecture: any
232+Depends: checkbox-ng-service,
233+ plainbox-provider-checkbox,
234+ qtdeclarative5-qtquick2-plugin,
235+ qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
236+ ${misc:Depends}
237+Provides: checkbox-qt
238+Conflicts: checkbox-qt
239+Replaces: checkbox-qt
240+Description: QML based interface for system testing based on the PlainBox test framework
241+ Provides an interface for executing system tests. The results can be viewed at the end.
242+ .
243+ This package provides the checkbox-gui binary.
244
245=== modified file 'debian/python3-checkbox-ng.install'
246--- debian/python3-checkbox-ng.install 2013-10-31 10:42:42 +0000
247+++ debian/python3-checkbox-ng.install 2013-12-11 10:15:30 +0000
248@@ -1,2 +1,2 @@
249+usr/lib/python3/dist-packages/checkbox_ng-*.egg-info/*
250 usr/lib/python3/dist-packages/checkbox_ng/*
251-usr/lib/python3/dist-packages/checkbox_ng-*.egg-info/*
252
253=== modified file 'debian/python3-checkbox.install'
254--- debian/python3-checkbox.install 2013-10-31 10:42:42 +0000
255+++ debian/python3-checkbox.install 2013-12-11 10:15:30 +0000
256@@ -1,2 +1,2 @@
257+usr/lib/python3/dist-packages/checkbox-*.egg-info/*
258 usr/lib/python3/dist-packages/checkbox/*
259-usr/lib/python3/dist-packages/checkbox-*.egg-info/*
260
261=== modified file 'debian/python3-plainbox.install'
262--- debian/python3-plainbox.install 2013-10-31 10:42:42 +0000
263+++ debian/python3-plainbox.install 2013-12-11 10:15:30 +0000
264@@ -1,3 +1,3 @@
265+usr/bin/plainbox-trusted-launcher-1
266+usr/lib/python3/dist-packages/plainbox-*.egg-info/*
267 usr/lib/python3/dist-packages/plainbox/*
268-usr/lib/python3/dist-packages/plainbox-*.egg-info/*
269-usr/bin/plainbox-trusted-launcher-1
270
271=== modified file 'debian/rules'
272--- debian/rules 2013-11-26 13:42:58 +0000
273+++ debian/rules 2013-12-11 10:15:30 +0000
274@@ -35,6 +35,7 @@
275 echo "from unittest.mock import *" > $(CURDIR)/plainbox/plainbox/vendor/mock.py
276 dh_quilt_patch
277 endif
278+ cd $(CURDIR)/checkbox-gui && qmake PREFIX=/usr && make
279 python3 setup.py build
280
281 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
282@@ -54,6 +55,7 @@
283 python3 setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
284 mkdir -p $(CURDIR)/debian/tmp/usr/lib/checkbox/bin/
285 cp -R $(CURDIR)/debian/tmp/usr/share/checkbox/scripts/* $(CURDIR)/debian/tmp/usr/lib/checkbox/bin/
286+ cd $(CURDIR)/checkbox-gui && make INSTALL_ROOT=$(CURDIR)/debian/tmp install
287 dh_install
288
289 override_dh_installdocs:
290@@ -71,7 +73,7 @@
291 # dh_python3 runs automatically on packages with the python3- prefix
292 # let's not forget plainbox
293 dh_python3 --package=plainbox
294- dh_python3
295+ dh_python3 --no-package=checkbox-gui
296
297 override_dh_installdeb:
298 cp debian/checkbox.postrm debian/checkbox-cli.postrm

Subscribers

People subscribed via source and target branches