The Open Compute Project

Merge lp://staging/~jeffmarcom/opencompute/checkbox-ocp-package-names-update into lp://staging/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://staging/~jeffmarcom/opencompute/checkbox-ocp-package-names-update
Merge into: lp://staging/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://staging/~jeffmarcom/opencompute/checkbox-ocp-package-names-update
Reviewer Review Type Date Requested Status
Jeff Lane  Approve
Review via email: mp+187142@code.staging.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
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches