The Open Compute Project

Merge lp:~jeffmarcom/opencompute/checkbox-ocp-package-names-update into lp:opencompute/checkbox

  1. checkbox-ocp-package-names-update
  2. Merge into checkbox
Proposed by Jeff Marcom
Status: Merged
Approved by: Jeff Lane 
Approved revision: 2155
Merged at revision: 2151
Proposed branch: lp:~jeffmarcom/opencompute/checkbox-ocp-package-names-update
Merge into: lp:opencompute/checkbox
Diff against target: 807 lines (+222/-278)
48 files modified
bin/checkbox-cli (+0/-18)
bin/checkbox-gtk (+0/-18)
bin/checkbox-ocp (+0/-22)
bin/checkbox-ocp-cli (+22/-0)
bin/checkbox-ocp-gtk (+18/-0)
bin/checkbox-ocp-qt (+26/-0)
bin/checkbox-ocp-urwid (+18/-0)
bin/checkbox-qt (+0/-26)
bin/checkbox-urwid (+0/-18)
debian/checkbox-cli.install (+0/-3)
debian/checkbox-cli.links (+0/-1)
debian/checkbox-cli.postinst (+0/-7)
debian/checkbox-gtk.install (+0/-4)
debian/checkbox-gtk.links (+0/-1)
debian/checkbox-gtk.postinst (+0/-7)
debian/checkbox-ocp-cli.install (+3/-0)
debian/checkbox-ocp-cli.links (+1/-0)
debian/checkbox-ocp-cli.postinst (+7/-0)
debian/checkbox-ocp-gtk.install (+4/-0)
debian/checkbox-ocp-gtk.links (+1/-0)
debian/checkbox-ocp-gtk.postinst (+7/-0)
debian/checkbox-ocp-qt.install (+6/-0)
debian/checkbox-ocp-qt.links (+1/-0)
debian/checkbox-ocp-qt.postinst (+7/-0)
debian/checkbox-ocp-urwid.install (+3/-0)
debian/checkbox-ocp-urwid.links (+1/-0)
debian/checkbox-ocp-urwid.postinst (+7/-0)
debian/checkbox-ocp.install (+0/-3)
debian/checkbox-ocp.links (+0/-1)
debian/checkbox-ocp.postinst (+0/-7)
debian/checkbox-qt.install (+0/-6)
debian/checkbox-qt.links (+0/-1)
debian/checkbox-qt.postinst (+0/-7)
debian/checkbox-urwid.install (+0/-3)
debian/checkbox-urwid.links (+0/-1)
debian/checkbox-urwid.postinst (+0/-7)
debian/control (+8/-17)
debian/rules (+10/-11)
examples/checkbox-cli.ini (+0/-17)
examples/checkbox-gtk.ini (+0/-16)
examples/checkbox-ocp-cli.ini (+17/-0)
examples/checkbox-ocp-gtk.ini (+16/-0)
examples/checkbox-ocp-qt.ini (+20/-0)
examples/checkbox-ocp-urwid.ini (+17/-0)
examples/checkbox-ocp.ini (+0/-17)
examples/checkbox-qt.ini (+0/-20)
examples/checkbox-urwid.ini (+0/-17)
setup.py (+2/-2)
To merge this branch: bzr merge lp:~jeffmarcom/opencompute/checkbox-ocp-package-names-update
Reviewer Review Type Date Requested Status
Jeff Lane  Approve
Review via email: mp+187142@code.launchpad.net

Commit message

This simply updates the checkbox package names/executables to specify that they are from/for the open compute project.

Description of the change

This simply updates the checkbox package names/executables to specify that they are from/for the open compute project.

To post a comment you must log in.
Revision history for this message
Jeff Lane  (bladernr) wrote :

Still a lot of references to the old packages:
bladernr@klaatu:~/development/checkbox-ocp-package-names-update$ grep checkbox-cli -r *
debian/checkbox-ocp-cli.links:usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-cli.1.gz
man/checkbox.1:.B /etc/checkbox.d/checkbox-cli.ini
plainbox/plainbox/test-data/xml-exporter/example-data.xml: <package id="92" name="checkbox-cli">
plainbox/plainbox/test-data/xml-exporter/example-data.json: "name": "checkbox-cli",
plainbox/plainbox/test-data/html-exporter/example-data.html: <td class="label">checkbox-cli</td>

bladernr@klaatu:~/development/checkbox-ocp-package-names-update$ grep checkbox-gtk -r *
checkbox_gtk/gtk_interface.py: "checkbox-gtk.ui"))
checkbox_gtk/gtk_interface.py: "checkbox-gtk-head.png")
debian/checkbox-ocp-gtk.links:usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-gtk.1.gz
man/checkbox.1:.B /etc/checkbox.d/checkbox-gtk.ini
plainbox/plainbox/test-data/xml-exporter/example-data.xml: <package id="95" name="checkbox-gtk">
plainbox/plainbox/test-data/xml-exporter/example-data.json: "name": "checkbox-gtk",
plainbox/plainbox/test-data/html-exporter/example-data.html: <td class="label">checkbox-gtk</td>
po/ga.po:#: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
po/ga.po:#: ../gtk/checkbox-gtk.ui.h:2 ../checkbox_gtk/gtk_interface.py:561
<SNIT LOTS OF PO FILES>
setup.py: ("share/checkbox/gtk/", ["gtk/checkbox-gtk.ui", "gtk/*.png"]),

anyway, there seem to be a lot of references to the old package names in places like setup.py, debian/* and so forth. Not sure if they'll affect anything (though the man pages are outdated now)

I'm trying a build to see how the package builds now.

review: Needs Fixing
Revision history for this message
Jeff Lane  (bladernr) wrote :

Also, while all the packages for the UIs are called checkbox-ocp-*, the main package is still checkbox:
bladernr@klaatu:~/development/pbuilder/precise-amd64/result$ ll |grep "Sep 25"
-rw-rw-r-- 1 bladernr bladernr 2773 Sep 25 11:13 checkbox_1.16.12~OCP_amd64.changes
-rw-r--r-- 1 bladernr bladernr 1441430 Sep 25 11:13 checkbox_1.16.12~OCP_amd64.deb
-rw-r--r-- 1 bladernr bladernr 2028 Sep 25 11:06 checkbox_1.16.12~OCP.dsc
-rw-r--r-- 1 bladernr bladernr 3933525 Sep 25 11:05 checkbox_1.16.12~OCP.tar.gz
-rw-r--r-- 1 bladernr bladernr 3864 Sep 25 11:13 checkbox-hw-collection_1.16.12~OCP_amd64.deb
-rw-r--r-- 1 bladernr bladernr 7680 Sep 25 11:13 checkbox-ocp-cli_1.16.12~OCP_all.deb
-rw-r--r-- 1 bladernr bladernr 22274 Sep 25 11:13 checkbox-ocp-gtk_1.16.12~OCP_all.deb
-rw-r--r-- 1 bladernr bladernr 78268 Sep 25 11:13 checkbox-ocp-qt_1.16.12~OCP_amd64.deb
-rw-r--r-- 1 bladernr bladernr 10650 Sep 25 11:13 checkbox-ocp-urwid_1.16.12~OCP_all.deb

review: Needs Fixing
Revision history for this message
Jeff Lane  (bladernr) wrote :

Ok, after building and installing it seems to be OK. After talking with Jeff M, there's a reason for the above (less drama when cherry picking fixes from checkbox trunk) and it's not just accidental oversight.

So, I'll go ahead and set this to approve.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'bin/checkbox-cli'
2--- bin/checkbox-cli 2013-08-23 21:16:34 +0000
3+++ bin/checkbox-cli 1970-01-01 00:00:00 +0000
4@@ -1,18 +0,0 @@
5-#!/bin/bash
6-
7-export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
8-export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
9-export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
10-export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
11-export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
12-
13-if [ $CHECKBOX_DATA != '.' ]
14-then
15- old_data=$HOME/.checkbox
16- if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
17- then
18- mv -f $old_data $CHECKBOX_DATA
19- fi
20-fi
21-
22-python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
23
24=== removed file 'bin/checkbox-gtk'
25--- bin/checkbox-gtk 2013-08-05 14:33:05 +0000
26+++ bin/checkbox-gtk 1970-01-01 00:00:00 +0000
27@@ -1,18 +0,0 @@
28-#!/bin/bash
29-
30-export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
31-export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
32-export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
33-export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
34-export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
35-
36-if [ $CHECKBOX_DATA != '.' ]
37-then
38- old_data=$HOME/.checkbox
39- if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
40- then
41- mv -f $old_data $CHECKBOX_DATA
42- fi
43-fi
44-
45-python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
46
47=== removed file 'bin/checkbox-ocp'
48--- bin/checkbox-ocp 2013-08-30 22:57:50 +0000
49+++ bin/checkbox-ocp 1970-01-01 00:00:00 +0000
50@@ -1,22 +0,0 @@
51-#!/bin/bash
52-
53-export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
54-export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
55-export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
56-export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
57-export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
58-
59-if [ ! -s /etc/checkbox.d/configs ]
60-then ln -s /usr/share/checkbox/examples /etc/checkbox.d/configs
61-fi
62-
63-if [ $CHECKBOX_DATA != '.' ]
64-then
65- old_data=$HOME/.checkbox
66- if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
67- then
68- mv -f $old_data $CHECKBOX_DATA
69- fi
70-fi
71-
72-python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
73
74=== added file 'bin/checkbox-ocp-cli'
75--- bin/checkbox-ocp-cli 1970-01-01 00:00:00 +0000
76+++ bin/checkbox-ocp-cli 2013-09-24 03:15:31 +0000
77@@ -0,0 +1,22 @@
78+#!/bin/bash
79+
80+export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
81+export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
82+export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
83+export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
84+export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
85+
86+if [ ! -s /etc/checkbox.d/configs ]
87+then ln -s /usr/share/checkbox/examples /etc/checkbox.d/configs
88+fi
89+
90+if [ $CHECKBOX_DATA != '.' ]
91+then
92+ old_data=$HOME/.checkbox
93+ if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
94+ then
95+ mv -f $old_data $CHECKBOX_DATA
96+ fi
97+fi
98+
99+python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
100
101=== added file 'bin/checkbox-ocp-gtk'
102--- bin/checkbox-ocp-gtk 1970-01-01 00:00:00 +0000
103+++ bin/checkbox-ocp-gtk 2013-09-24 03:15:31 +0000
104@@ -0,0 +1,18 @@
105+#!/bin/bash
106+
107+export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
108+export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
109+export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
110+export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
111+export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
112+
113+if [ $CHECKBOX_DATA != '.' ]
114+then
115+ old_data=$HOME/.checkbox
116+ if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
117+ then
118+ mv -f $old_data $CHECKBOX_DATA
119+ fi
120+fi
121+
122+python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
123
124=== added file 'bin/checkbox-ocp-qt'
125--- bin/checkbox-ocp-qt 1970-01-01 00:00:00 +0000
126+++ bin/checkbox-ocp-qt 2013-09-24 03:15:31 +0000
127@@ -0,0 +1,26 @@
128+#!/bin/bash
129+
130+set -e
131+
132+export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
133+export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
134+export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
135+export CHECKBOX_FRONTEND=${CHECKBOX_FRONTEND:-$CHECKBOX_SHARE/qt/frontend}
136+export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
137+export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
138+
139+if [ $CHECKBOX_DATA != '.' ]
140+then
141+ old_data=$HOME/.checkbox
142+ if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
143+ then
144+ mv -f $old_data $CHECKBOX_DATA
145+ fi
146+fi
147+
148+if [ -e $CHECKBOX_FRONTEND ]
149+then
150+ (cd $CHECKBOX_FRONTEND; qmake; make; ./checkbox-qt-service &)
151+fi
152+
153+python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
154
155=== added file 'bin/checkbox-ocp-urwid'
156--- bin/checkbox-ocp-urwid 1970-01-01 00:00:00 +0000
157+++ bin/checkbox-ocp-urwid 2013-09-24 03:15:31 +0000
158@@ -0,0 +1,18 @@
159+#!/bin/bash
160+
161+export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
162+export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
163+export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
164+export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
165+export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
166+
167+if [ $CHECKBOX_DATA != '.' ]
168+then
169+ old_data=$HOME/.checkbox
170+ if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
171+ then
172+ mv -f $old_data $CHECKBOX_DATA
173+ fi
174+fi
175+
176+python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
177
178=== removed file 'bin/checkbox-qt'
179--- bin/checkbox-qt 2013-08-05 14:33:05 +0000
180+++ bin/checkbox-qt 1970-01-01 00:00:00 +0000
181@@ -1,26 +0,0 @@
182-#!/bin/bash
183-
184-set -e
185-
186-export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
187-export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
188-export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
189-export CHECKBOX_FRONTEND=${CHECKBOX_FRONTEND:-$CHECKBOX_SHARE/qt/frontend}
190-export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
191-export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
192-
193-if [ $CHECKBOX_DATA != '.' ]
194-then
195- old_data=$HOME/.checkbox
196- if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
197- then
198- mv -f $old_data $CHECKBOX_DATA
199- fi
200-fi
201-
202-if [ -e $CHECKBOX_FRONTEND ]
203-then
204- (cd $CHECKBOX_FRONTEND; qmake; make; ./checkbox-qt-service &)
205-fi
206-
207-python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
208
209=== removed file 'bin/checkbox-urwid'
210--- bin/checkbox-urwid 2013-08-05 14:33:05 +0000
211+++ bin/checkbox-urwid 1970-01-01 00:00:00 +0000
212@@ -1,18 +0,0 @@
213-#!/bin/bash
214-
215-export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
216-export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
217-export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
218-export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
219-export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
220-
221-if [ $CHECKBOX_DATA != '.' ]
222-then
223- old_data=$HOME/.checkbox
224- if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
225- then
226- mv -f $old_data $CHECKBOX_DATA
227- fi
228-fi
229-
230-python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
231
232=== removed file 'debian/checkbox-cli.install'
233--- debian/checkbox-cli.install 2013-07-05 16:43:48 +0000
234+++ debian/checkbox-cli.install 1970-01-01 00:00:00 +0000
235@@ -1,3 +0,0 @@
236-usr/bin/checkbox-cli
237-usr/lib/python*/*-packages/checkbox_cli/*
238-usr/share/checkbox/examples/checkbox-cli.ini
239
240=== removed file 'debian/checkbox-cli.links'
241--- debian/checkbox-cli.links 2009-09-16 19:49:25 +0000
242+++ debian/checkbox-cli.links 1970-01-01 00:00:00 +0000
243@@ -1,1 +0,0 @@
244-usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-cli.1.gz
245
246=== removed file 'debian/checkbox-cli.postinst'
247--- debian/checkbox-cli.postinst 2011-11-29 20:22:12 +0000
248+++ debian/checkbox-cli.postinst 1970-01-01 00:00:00 +0000
249@@ -1,7 +0,0 @@
250-#! /bin/sh -e
251-
252-base_package="checkbox"
253-. /usr/share/debconf/confmodule
254-. /usr/share/checkbox/install/postinst
255-
256-#DEBHELPER#
257
258=== removed file 'debian/checkbox-gtk.install'
259--- debian/checkbox-gtk.install 2013-07-05 16:43:48 +0000
260+++ debian/checkbox-gtk.install 1970-01-01 00:00:00 +0000
261@@ -1,4 +0,0 @@
262-usr/bin/checkbox-gtk
263-usr/lib/python*/*-packages/checkbox_gtk/*
264-usr/share/checkbox/examples/checkbox-gtk.ini
265-usr/share/checkbox/gtk/*
266
267=== removed file 'debian/checkbox-gtk.links'
268--- debian/checkbox-gtk.links 2009-09-16 19:49:25 +0000
269+++ debian/checkbox-gtk.links 1970-01-01 00:00:00 +0000
270@@ -1,1 +0,0 @@
271-usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-gtk.1.gz
272
273=== removed file 'debian/checkbox-gtk.postinst'
274--- debian/checkbox-gtk.postinst 2011-11-29 20:22:12 +0000
275+++ debian/checkbox-gtk.postinst 1970-01-01 00:00:00 +0000
276@@ -1,7 +0,0 @@
277-#! /bin/sh -e
278-
279-base_package="checkbox"
280-. /usr/share/debconf/confmodule
281-. /usr/share/checkbox/install/postinst
282-
283-#DEBHELPER#
284
285=== added file 'debian/checkbox-ocp-cli.install'
286--- debian/checkbox-ocp-cli.install 1970-01-01 00:00:00 +0000
287+++ debian/checkbox-ocp-cli.install 2013-09-24 03:15:31 +0000
288@@ -0,0 +1,3 @@
289+usr/bin/checkbox-ocp-cli
290+usr/lib/python*/*-packages/checkbox_cli/*
291+usr/share/checkbox/examples/checkbox-ocp-cli.ini
292
293=== added file 'debian/checkbox-ocp-cli.links'
294--- debian/checkbox-ocp-cli.links 1970-01-01 00:00:00 +0000
295+++ debian/checkbox-ocp-cli.links 2013-09-24 03:15:31 +0000
296@@ -0,0 +1,1 @@
297+usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-cli.1.gz
298
299=== added file 'debian/checkbox-ocp-cli.postinst'
300--- debian/checkbox-ocp-cli.postinst 1970-01-01 00:00:00 +0000
301+++ debian/checkbox-ocp-cli.postinst 2013-09-24 03:15:31 +0000
302@@ -0,0 +1,7 @@
303+#! /bin/sh -e
304+
305+base_package="checkbox"
306+. /usr/share/debconf/confmodule
307+. /usr/share/checkbox/install/postinst
308+
309+#DEBHELPER#
310
311=== added file 'debian/checkbox-ocp-gtk.install'
312--- debian/checkbox-ocp-gtk.install 1970-01-01 00:00:00 +0000
313+++ debian/checkbox-ocp-gtk.install 2013-09-24 03:15:31 +0000
314@@ -0,0 +1,4 @@
315+usr/bin/checkbox-ocp-gtk
316+usr/lib/python*/*-packages/checkbox_gtk/*
317+usr/share/checkbox/examples/checkbox-ocp-gtk.ini
318+usr/share/checkbox/gtk/*
319
320=== added file 'debian/checkbox-ocp-gtk.links'
321--- debian/checkbox-ocp-gtk.links 1970-01-01 00:00:00 +0000
322+++ debian/checkbox-ocp-gtk.links 2013-09-24 03:15:31 +0000
323@@ -0,0 +1,1 @@
324+usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-gtk.1.gz
325
326=== added file 'debian/checkbox-ocp-gtk.postinst'
327--- debian/checkbox-ocp-gtk.postinst 1970-01-01 00:00:00 +0000
328+++ debian/checkbox-ocp-gtk.postinst 2013-09-24 03:15:31 +0000
329@@ -0,0 +1,7 @@
330+#! /bin/sh -e
331+
332+base_package="checkbox"
333+. /usr/share/debconf/confmodule
334+. /usr/share/checkbox/install/postinst
335+
336+#DEBHELPER#
337
338=== added file 'debian/checkbox-ocp-qt.install'
339--- debian/checkbox-ocp-qt.install 1970-01-01 00:00:00 +0000
340+++ debian/checkbox-ocp-qt.install 2013-09-24 03:15:31 +0000
341@@ -0,0 +1,6 @@
342+usr/bin/checkbox-ocp-qt
343+usr/lib/checkbox/qt/*
344+usr/lib/python*/*-packages/checkbox_qt/*
345+usr/share/applications/checkbox-qt.desktop
346+usr/share/checkbox/examples/checkbox-ocp-qt.ini
347+usr/share/dbus-1/services/*
348
349=== added file 'debian/checkbox-ocp-qt.links'
350--- debian/checkbox-ocp-qt.links 1970-01-01 00:00:00 +0000
351+++ debian/checkbox-ocp-qt.links 2013-09-24 03:15:31 +0000
352@@ -0,0 +1,1 @@
353+usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-qt.1.gz
354
355=== added file 'debian/checkbox-ocp-qt.postinst'
356--- debian/checkbox-ocp-qt.postinst 1970-01-01 00:00:00 +0000
357+++ debian/checkbox-ocp-qt.postinst 2013-09-24 03:15:31 +0000
358@@ -0,0 +1,7 @@
359+#! /bin/sh -e
360+
361+base_package="checkbox"
362+. /usr/share/debconf/confmodule
363+. /usr/share/checkbox/install/postinst
364+
365+#DEBHELPER#
366
367=== added file 'debian/checkbox-ocp-urwid.install'
368--- debian/checkbox-ocp-urwid.install 1970-01-01 00:00:00 +0000
369+++ debian/checkbox-ocp-urwid.install 2013-09-24 03:15:31 +0000
370@@ -0,0 +1,3 @@
371+usr/bin/checkbox-ocp-urwid
372+usr/lib/python*/*-packages/checkbox_urwid/*
373+usr/share/checkbox/examples/checkbox-ocp-urwid.ini
374
375=== added file 'debian/checkbox-ocp-urwid.links'
376--- debian/checkbox-ocp-urwid.links 1970-01-01 00:00:00 +0000
377+++ debian/checkbox-ocp-urwid.links 2013-09-24 03:15:31 +0000
378@@ -0,0 +1,1 @@
379+usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-urwid.1.gz
380
381=== added file 'debian/checkbox-ocp-urwid.postinst'
382--- debian/checkbox-ocp-urwid.postinst 1970-01-01 00:00:00 +0000
383+++ debian/checkbox-ocp-urwid.postinst 2013-09-24 03:15:31 +0000
384@@ -0,0 +1,7 @@
385+#! /bin/sh -e
386+
387+base_package="checkbox"
388+. /usr/share/debconf/confmodule
389+. /usr/share/checkbox/install/postinst
390+
391+#DEBHELPER#
392
393=== removed file 'debian/checkbox-ocp.install'
394--- debian/checkbox-ocp.install 2013-08-21 16:19:46 +0000
395+++ debian/checkbox-ocp.install 1970-01-01 00:00:00 +0000
396@@ -1,3 +0,0 @@
397-usr/bin/checkbox-ocp
398-usr/lib/python*/*-packages/checkbox_ocp/*
399-usr/share/checkbox/examples/checkbox-ocp.ini
400
401=== removed file 'debian/checkbox-ocp.links'
402--- debian/checkbox-ocp.links 2013-08-21 16:19:46 +0000
403+++ debian/checkbox-ocp.links 1970-01-01 00:00:00 +0000
404@@ -1,1 +0,0 @@
405-usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-ocp.1.gz
406
407=== removed file 'debian/checkbox-ocp.postinst'
408--- debian/checkbox-ocp.postinst 2013-08-21 16:19:46 +0000
409+++ debian/checkbox-ocp.postinst 1970-01-01 00:00:00 +0000
410@@ -1,7 +0,0 @@
411-#! /bin/sh -e
412-
413-base_package="checkbox"
414-. /usr/share/debconf/confmodule
415-. /usr/share/checkbox/install/postinst
416-
417-#DEBHELPER#
418
419=== removed file 'debian/checkbox-qt.install'
420--- debian/checkbox-qt.install 2013-07-05 16:43:48 +0000
421+++ debian/checkbox-qt.install 1970-01-01 00:00:00 +0000
422@@ -1,6 +0,0 @@
423-usr/bin/checkbox-qt
424-usr/lib/checkbox/qt/*
425-usr/lib/python*/*-packages/checkbox_qt/*
426-usr/share/applications/checkbox-qt.desktop
427-usr/share/checkbox/examples/checkbox-qt.ini
428-usr/share/dbus-1/services/*
429
430=== removed file 'debian/checkbox-qt.links'
431--- debian/checkbox-qt.links 2012-02-07 22:33:29 +0000
432+++ debian/checkbox-qt.links 1970-01-01 00:00:00 +0000
433@@ -1,1 +0,0 @@
434-usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-qt.1.gz
435
436=== removed file 'debian/checkbox-qt.postinst'
437--- debian/checkbox-qt.postinst 2011-12-05 15:25:22 +0000
438+++ debian/checkbox-qt.postinst 1970-01-01 00:00:00 +0000
439@@ -1,7 +0,0 @@
440-#! /bin/sh -e
441-
442-base_package="checkbox"
443-. /usr/share/debconf/confmodule
444-. /usr/share/checkbox/install/postinst
445-
446-#DEBHELPER#
447
448=== removed file 'debian/checkbox-urwid.install'
449--- debian/checkbox-urwid.install 2013-07-05 16:43:48 +0000
450+++ debian/checkbox-urwid.install 1970-01-01 00:00:00 +0000
451@@ -1,3 +0,0 @@
452-usr/bin/checkbox-urwid
453-usr/lib/python*/*-packages/checkbox_urwid/*
454-usr/share/checkbox/examples/checkbox-urwid.ini
455
456=== removed file 'debian/checkbox-urwid.links'
457--- debian/checkbox-urwid.links 2010-05-20 09:00:22 +0000
458+++ debian/checkbox-urwid.links 1970-01-01 00:00:00 +0000
459@@ -1,1 +0,0 @@
460-usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-urwid.1.gz
461
462=== removed file 'debian/checkbox-urwid.postinst'
463--- debian/checkbox-urwid.postinst 2011-11-29 20:22:12 +0000
464+++ debian/checkbox-urwid.postinst 1970-01-01 00:00:00 +0000
465@@ -1,7 +0,0 @@
466-#! /bin/sh -e
467-
468-base_package="checkbox"
469-. /usr/share/debconf/confmodule
470-. /usr/share/checkbox/install/postinst
471-
472-#DEBHELPER#
473
474=== modified file 'debian/control'
475--- debian/control 2013-08-21 16:16:17 +0000
476+++ debian/control 2013-09-24 03:15:31 +0000
477@@ -47,7 +47,7 @@
478 python3-gi
479 Suggests: bonnie++,
480 bootchart,
481- checkbox-cli | checkbox-ocp, checkbox-gtk,
482+ checkbox-ocp-cli | checkbox-ocp-gtk,
483 curl,
484 ethtool,
485 fwts,
486@@ -71,16 +71,7 @@
487 This project provides an extensible interface for system testing. The
488 results can then be sent to Launchpad.
489
490-Package: checkbox-cli
491-Architecture: all
492-Depends: checkbox (>= ${source:Version}), ${misc:Depends}
493-Description: Command line interface for checkbox
494- This project provides an extensible interface for system testing. The
495- results can then be sent to Launchpad.
496- .
497- This package provides a command line interface for answering tests.
498-
499-Package: checkbox-ocp
500+Package: checkbox-ocp-cli
501 Architecture: all
502 Depends: checkbox (>= ${source:Version}), ${misc:Depends}
503 Description: Command line interface of checkbox for the Open Compute Project
504@@ -89,17 +80,17 @@
505 .
506 This package provides a command line interface for answering tests.
507
508-Package: checkbox-urwid
509+Package: checkbox-ocp-urwid
510 Architecture: all
511 Depends: checkbox (>= ${source:Version}), python3-urwid, ${misc:Depends}
512-Description: Urwid interface for checkbox
513+Description: Urwid interface for checkbox-ocp
514 This project provides an extensible interface for system testing. The
515 results can then be sent to Launchpad.
516 .
517 This package provides a command line interface (urwid version) for
518 answering tests.
519
520-Package: checkbox-gtk
521+Package: checkbox-ocp-gtk
522 Section: gnome
523 Architecture: all
524 Depends: checkbox (>= ${source:Version}),
525@@ -107,13 +98,13 @@
526 python3-gi,
527 python3-gi-cairo,
528 ${misc:Depends}
529-Description: GTK interface for checkbox
530+Description: GTK interface for checkbox-ocp
531 This project provides an extensible interface for system testing. The
532 results can then be sent to Launchpad.
533 .
534 This package provides a GTK interface for answering tests.
535
536-Package: checkbox-qt
537+Package: checkbox-ocp-qt
538 Architecture: any
539 Depends: checkbox (>= ${source:Version}),
540 libqt4-dbus,
541@@ -121,7 +112,7 @@
542 python3-dbus,
543 ${misc:Depends},
544 ${shlibs:Depends}
545-Description: QT4 interface for checkbox
546+Description: QT4 interface for checkbox-ocp
547 This project provides an extensible interface for system testing. The
548 results can then be sent to Launchpad.
549 .
550
551=== modified file 'debian/rules'
552--- debian/rules 2013-08-21 16:16:17 +0000
553+++ debian/rules 2013-09-24 03:15:31 +0000
554@@ -24,26 +24,25 @@
555 endif
556
557 override_dh_installdeb:
558- cp debian/checkbox.postrm debian/checkbox-cli.postrm
559- cp debian/checkbox.postrm debian/checkbox-ocp.postrm
560- cp debian/checkbox.postrm debian/checkbox-urwid.postrm
561- cp debian/checkbox.postrm debian/checkbox-gtk.postrm
562- cp debian/checkbox.postrm debian/checkbox-qt.postrm
563+ cp debian/checkbox.postrm debian/checkbox-ocp-cli.postrm
564+ cp debian/checkbox.postrm debian/.postrm
565+ cp debian/checkbox.postrm debian/checkbox-ocp-urwid.postrm
566+ cp debian/checkbox.postrm debian/checkbox-ocp-gtk.postrm
567+ cp debian/checkbox.postrm debian/checkbox-ocp-qt.postrm
568 cp debian/checkbox.postrm debian/checkbox-hw-collection.postrm
569 dh_installdeb
570
571 override_dh_installdocs:
572 dh_installdocs -pcheckbox ./README
573- dh_installdocs -pcheckbox-cli ./README
574- dh_installdocs -pcheckbox-ocp ./README
575- dh_installdocs -pcheckbox-urwid ./README
576- dh_installdocs -pcheckbox-gtk ./README
577- dh_installdocs -pcheckbox-qt ./README
578+ dh_installdocs -pcheckbox-ocp-cli ./README
579+ dh_installdocs -pcheckbox-ocp-urwid ./README
580+ dh_installdocs -pcheckbox-ocp-gtk ./README
581+ dh_installdocs -pcheckbox-ocp-qt ./README
582 dh_installdocs -pcheckbox-hw-collection ./README
583 dh_installdocs
584
585 override_dh_clean:
586 -find . -name \*.mo -exec rm {} \;
587- -rm -f debian/checkbox-cli.postrm debian/checkbox-ocp.postrm debian/checkbox-cli.postrmebian/checkbox-urwid.postrm debian/checkbox-gtk.postrm debian/checkbox-qt.postrm debian/checkbox-hw-collection.postrm
588+ -rm -f debian/checkbox-ocp-cli.postrm debian/.postrm debian/checkbox-ocp-cli.postrmebian/checkbox-ocp-urwid.postrm debian/checkbox-ocp-gtk.postrm debian/checkbox-ocp-qt.postrm debian/checkbox-hw-collection.postrm
589 debconf-updatepo
590 dh_clean
591
592=== removed file 'examples/checkbox-cli.ini'
593--- examples/checkbox-cli.ini 2013-05-06 14:42:42 +0000
594+++ examples/checkbox-cli.ini 1970-01-01 00:00:00 +0000
595@@ -1,17 +0,0 @@
596-[DEFAULT]
597-
598-# Space separated list of files to include as a dependency for the
599-# CLI interface.
600-includes = %(checkbox_share)s/configs/checkbox.ini
601-
602-[checkbox/plugins/user_interface]
603-
604-# Module where the user interface implementation is defined.
605-interface_module = checkbox_cli.cli_interface
606-
607-# Class implementing the UserInterface interface.
608-interface_class = CLIInterface
609-
610-[checkbox/plugins]
611-
612-blacklist = hexr_prompt hexr_transport
613
614=== removed file 'examples/checkbox-gtk.ini'
615--- examples/checkbox-gtk.ini 2009-02-15 15:40:07 +0000
616+++ examples/checkbox-gtk.ini 1970-01-01 00:00:00 +0000
617@@ -1,16 +0,0 @@
618-[DEFAULT]
619-
620-# Space separated list of files to include as a dependency for the
621-# GTK interface.
622-includes = %(checkbox_share)s/configs/checkbox.ini
623-
624-[checkbox/plugins/user_interface]
625-
626-# Module where the user interface implementation is defined.
627-interface_module = checkbox_gtk.gtk_interface
628-
629-# Class implementing the UserInterface interface.
630-interface_class = GTKInterface
631-
632-# Path where GTK files are stored.
633-data_path = %(checkbox_share)s/gtk
634
635=== added file 'examples/checkbox-ocp-cli.ini'
636--- examples/checkbox-ocp-cli.ini 1970-01-01 00:00:00 +0000
637+++ examples/checkbox-ocp-cli.ini 2013-09-24 03:15:31 +0000
638@@ -0,0 +1,17 @@
639+[DEFAULT]
640+
641+# Space separated list of files to include as a dependency for the
642+# CLI interface.
643+includes = %(checkbox_share)s/configs/checkbox.ini
644+
645+[checkbox/plugins/user_interface]
646+
647+# Module where the user interface implementation is defined.
648+interface_module = checkbox_cli.cli_interface
649+
650+# Class implementing the UserInterface interface.
651+interface_class = CLIInterface
652+
653+[checkbox/plugins]
654+
655+blacklist = hexr_prompt hexr_transport
656
657=== added file 'examples/checkbox-ocp-gtk.ini'
658--- examples/checkbox-ocp-gtk.ini 1970-01-01 00:00:00 +0000
659+++ examples/checkbox-ocp-gtk.ini 2013-09-24 03:15:31 +0000
660@@ -0,0 +1,16 @@
661+[DEFAULT]
662+
663+# Space separated list of files to include as a dependency for the
664+# GTK interface.
665+includes = %(checkbox_share)s/configs/checkbox.ini
666+
667+[checkbox/plugins/user_interface]
668+
669+# Module where the user interface implementation is defined.
670+interface_module = checkbox_gtk.gtk_interface
671+
672+# Class implementing the UserInterface interface.
673+interface_class = GTKInterface
674+
675+# Path where GTK files are stored.
676+data_path = %(checkbox_share)s/gtk
677
678=== added file 'examples/checkbox-ocp-qt.ini'
679--- examples/checkbox-ocp-qt.ini 1970-01-01 00:00:00 +0000
680+++ examples/checkbox-ocp-qt.ini 2013-09-24 03:15:31 +0000
681@@ -0,0 +1,20 @@
682+[DEFAULT]
683+
684+# Space separated list of files to include as a dependency for the
685+# GTK interface.
686+includes = %(checkbox_share)s/configs/checkbox.ini
687+
688+[checkbox/plugins/user_interface]
689+
690+# Module where the user interface implementation is defined.
691+interface_module = checkbox_qt.qt_interface
692+
693+# Class implementing the UserInterface interface.
694+interface_class = QTInterface
695+
696+# Path where qt files are stored.
697+data_path = %(checkbox_share)s/qt
698+
699+[checkbox/plugins]
700+
701+blacklist = hexr_prompt hexr_transport
702
703=== added file 'examples/checkbox-ocp-urwid.ini'
704--- examples/checkbox-ocp-urwid.ini 1970-01-01 00:00:00 +0000
705+++ examples/checkbox-ocp-urwid.ini 2013-09-24 03:15:31 +0000
706@@ -0,0 +1,17 @@
707+[DEFAULT]
708+
709+# Space separated list of files to include as a dependency for the
710+# CLI interface.
711+includes = %(checkbox_share)s/configs/checkbox.ini
712+
713+[checkbox/plugins/user_interface]
714+
715+# Module where the user interface implementation is defined.
716+interface_module = checkbox_urwid.urwid_interface
717+
718+# Class implementing the UserInterface interface.
719+interface_class = UrwidInterface
720+
721+[checkbox/plugins]
722+
723+blacklist = hexr_prompt hexr_transport
724
725=== removed file 'examples/checkbox-ocp.ini'
726--- examples/checkbox-ocp.ini 2013-08-21 16:42:53 +0000
727+++ examples/checkbox-ocp.ini 1970-01-01 00:00:00 +0000
728@@ -1,17 +0,0 @@
729-[DEFAULT]
730-
731-# Space separated list of files to include as a dependency for the
732-# CLI interface.
733-includes = %(checkbox_share)s/configs/checkbox.ini
734-
735-[checkbox/plugins/user_interface]
736-
737-# Module where the user interface implementation is defined.
738-interface_module = checkbox_ocp.cli_interface
739-
740-# Class implementing the UserInterface interface.
741-interface_class = CLIInterface
742-
743-[checkbox/plugins]
744-
745-blacklist = hexr_prompt hexr_transport
746
747=== removed file 'examples/checkbox-qt.ini'
748--- examples/checkbox-qt.ini 2013-05-06 14:42:42 +0000
749+++ examples/checkbox-qt.ini 1970-01-01 00:00:00 +0000
750@@ -1,20 +0,0 @@
751-[DEFAULT]
752-
753-# Space separated list of files to include as a dependency for the
754-# GTK interface.
755-includes = %(checkbox_share)s/configs/checkbox.ini
756-
757-[checkbox/plugins/user_interface]
758-
759-# Module where the user interface implementation is defined.
760-interface_module = checkbox_qt.qt_interface
761-
762-# Class implementing the UserInterface interface.
763-interface_class = QTInterface
764-
765-# Path where qt files are stored.
766-data_path = %(checkbox_share)s/qt
767-
768-[checkbox/plugins]
769-
770-blacklist = hexr_prompt hexr_transport
771
772=== removed file 'examples/checkbox-urwid.ini'
773--- examples/checkbox-urwid.ini 2013-05-06 14:42:42 +0000
774+++ examples/checkbox-urwid.ini 1970-01-01 00:00:00 +0000
775@@ -1,17 +0,0 @@
776-[DEFAULT]
777-
778-# Space separated list of files to include as a dependency for the
779-# CLI interface.
780-includes = %(checkbox_share)s/configs/checkbox.ini
781-
782-[checkbox/plugins/user_interface]
783-
784-# Module where the user interface implementation is defined.
785-interface_module = checkbox_urwid.urwid_interface
786-
787-# Class implementing the UserInterface interface.
788-interface_class = UrwidInterface
789-
790-[checkbox/plugins]
791-
792-blacklist = hexr_prompt hexr_transport
793
794=== modified file 'setup.py'
795--- setup.py 2013-09-08 04:07:31 +0000
796+++ setup.py 2013-09-24 03:15:31 +0000
797@@ -267,8 +267,8 @@
798 ],
799 },
800 scripts=[
801- "bin/checkbox-cli", "bin/checkbox-ocp", "bin/checkbox-gtk",
802- "bin/checkbox-urwid", "bin/checkbox-qt", "bin/checkbox-hw-collection"],
803+ "bin/checkbox-ocp-cli", "bin/checkbox-ocp-gtk",
804+ "bin/checkbox-ocp-urwid", "bin/checkbox-ocp-qt", "bin/checkbox-hw-collection"],
805 packages=find_packages(),
806 package_data={
807 "": ["cputable"]},

Subscribers

People subscribed via source and target branches