opencompute-developers team mailing list archive
-
opencompute-developers team
-
Mailing list archive
-
Message #00073
[Merge] lp:~jeffmarcom/opencompute/checkbox-ocp-package-names-update into lp:opencompute/checkbox
Jeff Marcom has proposed merging lp:~jeffmarcom/opencompute/checkbox-ocp-package-names-update into lp:opencompute/checkbox.
Requested reviews:
Open Compute Developers (opencompute-developers)
For more details, see:
https://code.launchpad.net/~jeffmarcom/opencompute/checkbox-ocp-package-names-update/+merge/187142
This simply updates the checkbox package names/executables to specify that they are from/for the open compute project.
--
https://code.launchpad.net/~jeffmarcom/opencompute/checkbox-ocp-package-names-update/+merge/187142
Your team Open Compute Developers is requested to review the proposed merge of lp:~jeffmarcom/opencompute/checkbox-ocp-package-names-update into lp:opencompute/checkbox.
=== removed file 'bin/checkbox-cli'
--- bin/checkbox-cli 2013-08-23 21:16:34 +0000
+++ bin/checkbox-cli 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
-export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
-export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
-export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
-export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
-
-if [ $CHECKBOX_DATA != '.' ]
-then
- old_data=$HOME/.checkbox
- if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
- then
- mv -f $old_data $CHECKBOX_DATA
- fi
-fi
-
-python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
=== removed file 'bin/checkbox-gtk'
--- bin/checkbox-gtk 2013-08-05 14:33:05 +0000
+++ bin/checkbox-gtk 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
-export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
-export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
-export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
-export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
-
-if [ $CHECKBOX_DATA != '.' ]
-then
- old_data=$HOME/.checkbox
- if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
- then
- mv -f $old_data $CHECKBOX_DATA
- fi
-fi
-
-python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
=== removed file 'bin/checkbox-ocp'
--- bin/checkbox-ocp 2013-08-30 22:57:50 +0000
+++ bin/checkbox-ocp 1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
-export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
-export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
-export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
-export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
-
-if [ ! -s /etc/checkbox.d/configs ]
-then ln -s /usr/share/checkbox/examples /etc/checkbox.d/configs
-fi
-
-if [ $CHECKBOX_DATA != '.' ]
-then
- old_data=$HOME/.checkbox
- if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
- then
- mv -f $old_data $CHECKBOX_DATA
- fi
-fi
-
-python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
=== added file 'bin/checkbox-ocp-cli'
--- bin/checkbox-ocp-cli 1970-01-01 00:00:00 +0000
+++ bin/checkbox-ocp-cli 2013-09-24 03:15:31 +0000
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
+export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
+export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
+export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
+export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
+
+if [ ! -s /etc/checkbox.d/configs ]
+then ln -s /usr/share/checkbox/examples /etc/checkbox.d/configs
+fi
+
+if [ $CHECKBOX_DATA != '.' ]
+then
+ old_data=$HOME/.checkbox
+ if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
+ then
+ mv -f $old_data $CHECKBOX_DATA
+ fi
+fi
+
+python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
=== added file 'bin/checkbox-ocp-gtk'
--- bin/checkbox-ocp-gtk 1970-01-01 00:00:00 +0000
+++ bin/checkbox-ocp-gtk 2013-09-24 03:15:31 +0000
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
+export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
+export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
+export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
+export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
+
+if [ $CHECKBOX_DATA != '.' ]
+then
+ old_data=$HOME/.checkbox
+ if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
+ then
+ mv -f $old_data $CHECKBOX_DATA
+ fi
+fi
+
+python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
=== added file 'bin/checkbox-ocp-qt'
--- bin/checkbox-ocp-qt 1970-01-01 00:00:00 +0000
+++ bin/checkbox-ocp-qt 2013-09-24 03:15:31 +0000
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -e
+
+export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
+export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
+export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
+export CHECKBOX_FRONTEND=${CHECKBOX_FRONTEND:-$CHECKBOX_SHARE/qt/frontend}
+export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
+export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
+
+if [ $CHECKBOX_DATA != '.' ]
+then
+ old_data=$HOME/.checkbox
+ if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
+ then
+ mv -f $old_data $CHECKBOX_DATA
+ fi
+fi
+
+if [ -e $CHECKBOX_FRONTEND ]
+then
+ (cd $CHECKBOX_FRONTEND; qmake; make; ./checkbox-qt-service &)
+fi
+
+python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
=== added file 'bin/checkbox-ocp-urwid'
--- bin/checkbox-ocp-urwid 1970-01-01 00:00:00 +0000
+++ bin/checkbox-ocp-urwid 2013-09-24 03:15:31 +0000
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
+export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
+export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
+export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
+export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
+
+if [ $CHECKBOX_DATA != '.' ]
+then
+ old_data=$HOME/.checkbox
+ if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
+ then
+ mv -f $old_data $CHECKBOX_DATA
+ fi
+fi
+
+python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
=== removed file 'bin/checkbox-qt'
--- bin/checkbox-qt 2013-08-05 14:33:05 +0000
+++ bin/checkbox-qt 1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
-export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
-export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
-export CHECKBOX_FRONTEND=${CHECKBOX_FRONTEND:-$CHECKBOX_SHARE/qt/frontend}
-export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
-export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
-
-if [ $CHECKBOX_DATA != '.' ]
-then
- old_data=$HOME/.checkbox
- if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
- then
- mv -f $old_data $CHECKBOX_DATA
- fi
-fi
-
-if [ -e $CHECKBOX_FRONTEND ]
-then
- (cd $CHECKBOX_FRONTEND; qmake; make; ./checkbox-qt-service &)
-fi
-
-python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
=== removed file 'bin/checkbox-urwid'
--- bin/checkbox-urwid 2013-08-05 14:33:05 +0000
+++ bin/checkbox-urwid 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
-export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
-export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
-export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
-export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
-
-if [ $CHECKBOX_DATA != '.' ]
-then
- old_data=$HOME/.checkbox
- if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
- then
- mv -f $old_data $CHECKBOX_DATA
- fi
-fi
-
-python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
=== removed file 'debian/checkbox-cli.install'
--- debian/checkbox-cli.install 2013-07-05 16:43:48 +0000
+++ debian/checkbox-cli.install 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-usr/bin/checkbox-cli
-usr/lib/python*/*-packages/checkbox_cli/*
-usr/share/checkbox/examples/checkbox-cli.ini
=== removed file 'debian/checkbox-cli.links'
--- debian/checkbox-cli.links 2009-09-16 19:49:25 +0000
+++ debian/checkbox-cli.links 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-cli.1.gz
=== removed file 'debian/checkbox-cli.postinst'
--- debian/checkbox-cli.postinst 2011-11-29 20:22:12 +0000
+++ debian/checkbox-cli.postinst 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#! /bin/sh -e
-
-base_package="checkbox"
-. /usr/share/debconf/confmodule
-. /usr/share/checkbox/install/postinst
-
-#DEBHELPER#
=== removed file 'debian/checkbox-gtk.install'
--- debian/checkbox-gtk.install 2013-07-05 16:43:48 +0000
+++ debian/checkbox-gtk.install 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-usr/bin/checkbox-gtk
-usr/lib/python*/*-packages/checkbox_gtk/*
-usr/share/checkbox/examples/checkbox-gtk.ini
-usr/share/checkbox/gtk/*
=== removed file 'debian/checkbox-gtk.links'
--- debian/checkbox-gtk.links 2009-09-16 19:49:25 +0000
+++ debian/checkbox-gtk.links 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-gtk.1.gz
=== removed file 'debian/checkbox-gtk.postinst'
--- debian/checkbox-gtk.postinst 2011-11-29 20:22:12 +0000
+++ debian/checkbox-gtk.postinst 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#! /bin/sh -e
-
-base_package="checkbox"
-. /usr/share/debconf/confmodule
-. /usr/share/checkbox/install/postinst
-
-#DEBHELPER#
=== added file 'debian/checkbox-ocp-cli.install'
--- debian/checkbox-ocp-cli.install 1970-01-01 00:00:00 +0000
+++ debian/checkbox-ocp-cli.install 2013-09-24 03:15:31 +0000
@@ -0,0 +1,3 @@
+usr/bin/checkbox-ocp-cli
+usr/lib/python*/*-packages/checkbox_cli/*
+usr/share/checkbox/examples/checkbox-ocp-cli.ini
=== added file 'debian/checkbox-ocp-cli.links'
--- debian/checkbox-ocp-cli.links 1970-01-01 00:00:00 +0000
+++ debian/checkbox-ocp-cli.links 2013-09-24 03:15:31 +0000
@@ -0,0 +1,1 @@
+usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-cli.1.gz
=== added file 'debian/checkbox-ocp-cli.postinst'
--- debian/checkbox-ocp-cli.postinst 1970-01-01 00:00:00 +0000
+++ debian/checkbox-ocp-cli.postinst 2013-09-24 03:15:31 +0000
@@ -0,0 +1,7 @@
+#! /bin/sh -e
+
+base_package="checkbox"
+. /usr/share/debconf/confmodule
+. /usr/share/checkbox/install/postinst
+
+#DEBHELPER#
=== added file 'debian/checkbox-ocp-gtk.install'
--- debian/checkbox-ocp-gtk.install 1970-01-01 00:00:00 +0000
+++ debian/checkbox-ocp-gtk.install 2013-09-24 03:15:31 +0000
@@ -0,0 +1,4 @@
+usr/bin/checkbox-ocp-gtk
+usr/lib/python*/*-packages/checkbox_gtk/*
+usr/share/checkbox/examples/checkbox-ocp-gtk.ini
+usr/share/checkbox/gtk/*
=== added file 'debian/checkbox-ocp-gtk.links'
--- debian/checkbox-ocp-gtk.links 1970-01-01 00:00:00 +0000
+++ debian/checkbox-ocp-gtk.links 2013-09-24 03:15:31 +0000
@@ -0,0 +1,1 @@
+usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-gtk.1.gz
=== added file 'debian/checkbox-ocp-gtk.postinst'
--- debian/checkbox-ocp-gtk.postinst 1970-01-01 00:00:00 +0000
+++ debian/checkbox-ocp-gtk.postinst 2013-09-24 03:15:31 +0000
@@ -0,0 +1,7 @@
+#! /bin/sh -e
+
+base_package="checkbox"
+. /usr/share/debconf/confmodule
+. /usr/share/checkbox/install/postinst
+
+#DEBHELPER#
=== added file 'debian/checkbox-ocp-qt.install'
--- debian/checkbox-ocp-qt.install 1970-01-01 00:00:00 +0000
+++ debian/checkbox-ocp-qt.install 2013-09-24 03:15:31 +0000
@@ -0,0 +1,6 @@
+usr/bin/checkbox-ocp-qt
+usr/lib/checkbox/qt/*
+usr/lib/python*/*-packages/checkbox_qt/*
+usr/share/applications/checkbox-qt.desktop
+usr/share/checkbox/examples/checkbox-ocp-qt.ini
+usr/share/dbus-1/services/*
=== added file 'debian/checkbox-ocp-qt.links'
--- debian/checkbox-ocp-qt.links 1970-01-01 00:00:00 +0000
+++ debian/checkbox-ocp-qt.links 2013-09-24 03:15:31 +0000
@@ -0,0 +1,1 @@
+usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-qt.1.gz
=== added file 'debian/checkbox-ocp-qt.postinst'
--- debian/checkbox-ocp-qt.postinst 1970-01-01 00:00:00 +0000
+++ debian/checkbox-ocp-qt.postinst 2013-09-24 03:15:31 +0000
@@ -0,0 +1,7 @@
+#! /bin/sh -e
+
+base_package="checkbox"
+. /usr/share/debconf/confmodule
+. /usr/share/checkbox/install/postinst
+
+#DEBHELPER#
=== added file 'debian/checkbox-ocp-urwid.install'
--- debian/checkbox-ocp-urwid.install 1970-01-01 00:00:00 +0000
+++ debian/checkbox-ocp-urwid.install 2013-09-24 03:15:31 +0000
@@ -0,0 +1,3 @@
+usr/bin/checkbox-ocp-urwid
+usr/lib/python*/*-packages/checkbox_urwid/*
+usr/share/checkbox/examples/checkbox-ocp-urwid.ini
=== added file 'debian/checkbox-ocp-urwid.links'
--- debian/checkbox-ocp-urwid.links 1970-01-01 00:00:00 +0000
+++ debian/checkbox-ocp-urwid.links 2013-09-24 03:15:31 +0000
@@ -0,0 +1,1 @@
+usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-urwid.1.gz
=== added file 'debian/checkbox-ocp-urwid.postinst'
--- debian/checkbox-ocp-urwid.postinst 1970-01-01 00:00:00 +0000
+++ debian/checkbox-ocp-urwid.postinst 2013-09-24 03:15:31 +0000
@@ -0,0 +1,7 @@
+#! /bin/sh -e
+
+base_package="checkbox"
+. /usr/share/debconf/confmodule
+. /usr/share/checkbox/install/postinst
+
+#DEBHELPER#
=== removed file 'debian/checkbox-ocp.install'
--- debian/checkbox-ocp.install 2013-08-21 16:19:46 +0000
+++ debian/checkbox-ocp.install 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-usr/bin/checkbox-ocp
-usr/lib/python*/*-packages/checkbox_ocp/*
-usr/share/checkbox/examples/checkbox-ocp.ini
=== removed file 'debian/checkbox-ocp.links'
--- debian/checkbox-ocp.links 2013-08-21 16:19:46 +0000
+++ debian/checkbox-ocp.links 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-ocp.1.gz
=== removed file 'debian/checkbox-ocp.postinst'
--- debian/checkbox-ocp.postinst 2013-08-21 16:19:46 +0000
+++ debian/checkbox-ocp.postinst 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#! /bin/sh -e
-
-base_package="checkbox"
-. /usr/share/debconf/confmodule
-. /usr/share/checkbox/install/postinst
-
-#DEBHELPER#
=== removed file 'debian/checkbox-qt.install'
--- debian/checkbox-qt.install 2013-07-05 16:43:48 +0000
+++ debian/checkbox-qt.install 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-usr/bin/checkbox-qt
-usr/lib/checkbox/qt/*
-usr/lib/python*/*-packages/checkbox_qt/*
-usr/share/applications/checkbox-qt.desktop
-usr/share/checkbox/examples/checkbox-qt.ini
-usr/share/dbus-1/services/*
=== removed file 'debian/checkbox-qt.links'
--- debian/checkbox-qt.links 2012-02-07 22:33:29 +0000
+++ debian/checkbox-qt.links 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-qt.1.gz
=== removed file 'debian/checkbox-qt.postinst'
--- debian/checkbox-qt.postinst 2011-12-05 15:25:22 +0000
+++ debian/checkbox-qt.postinst 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#! /bin/sh -e
-
-base_package="checkbox"
-. /usr/share/debconf/confmodule
-. /usr/share/checkbox/install/postinst
-
-#DEBHELPER#
=== removed file 'debian/checkbox-urwid.install'
--- debian/checkbox-urwid.install 2013-07-05 16:43:48 +0000
+++ debian/checkbox-urwid.install 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-usr/bin/checkbox-urwid
-usr/lib/python*/*-packages/checkbox_urwid/*
-usr/share/checkbox/examples/checkbox-urwid.ini
=== removed file 'debian/checkbox-urwid.links'
--- debian/checkbox-urwid.links 2010-05-20 09:00:22 +0000
+++ debian/checkbox-urwid.links 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-urwid.1.gz
=== removed file 'debian/checkbox-urwid.postinst'
--- debian/checkbox-urwid.postinst 2011-11-29 20:22:12 +0000
+++ debian/checkbox-urwid.postinst 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#! /bin/sh -e
-
-base_package="checkbox"
-. /usr/share/debconf/confmodule
-. /usr/share/checkbox/install/postinst
-
-#DEBHELPER#
=== modified file 'debian/control'
--- debian/control 2013-08-21 16:16:17 +0000
+++ debian/control 2013-09-24 03:15:31 +0000
@@ -47,7 +47,7 @@
python3-gi
Suggests: bonnie++,
bootchart,
- checkbox-cli | checkbox-ocp, checkbox-gtk,
+ checkbox-ocp-cli | checkbox-ocp-gtk,
curl,
ethtool,
fwts,
@@ -71,16 +71,7 @@
This project provides an extensible interface for system testing. The
results can then be sent to Launchpad.
-Package: checkbox-cli
-Architecture: all
-Depends: checkbox (>= ${source:Version}), ${misc:Depends}
-Description: Command line interface for checkbox
- This project provides an extensible interface for system testing. The
- results can then be sent to Launchpad.
- .
- This package provides a command line interface for answering tests.
-
-Package: checkbox-ocp
+Package: checkbox-ocp-cli
Architecture: all
Depends: checkbox (>= ${source:Version}), ${misc:Depends}
Description: Command line interface of checkbox for the Open Compute Project
@@ -89,17 +80,17 @@
.
This package provides a command line interface for answering tests.
-Package: checkbox-urwid
+Package: checkbox-ocp-urwid
Architecture: all
Depends: checkbox (>= ${source:Version}), python3-urwid, ${misc:Depends}
-Description: Urwid interface for checkbox
+Description: Urwid interface for checkbox-ocp
This project provides an extensible interface for system testing. The
results can then be sent to Launchpad.
.
This package provides a command line interface (urwid version) for
answering tests.
-Package: checkbox-gtk
+Package: checkbox-ocp-gtk
Section: gnome
Architecture: all
Depends: checkbox (>= ${source:Version}),
@@ -107,13 +98,13 @@
python3-gi,
python3-gi-cairo,
${misc:Depends}
-Description: GTK interface for checkbox
+Description: GTK interface for checkbox-ocp
This project provides an extensible interface for system testing. The
results can then be sent to Launchpad.
.
This package provides a GTK interface for answering tests.
-Package: checkbox-qt
+Package: checkbox-ocp-qt
Architecture: any
Depends: checkbox (>= ${source:Version}),
libqt4-dbus,
@@ -121,7 +112,7 @@
python3-dbus,
${misc:Depends},
${shlibs:Depends}
-Description: QT4 interface for checkbox
+Description: QT4 interface for checkbox-ocp
This project provides an extensible interface for system testing. The
results can then be sent to Launchpad.
.
=== modified file 'debian/rules'
--- debian/rules 2013-08-21 16:16:17 +0000
+++ debian/rules 2013-09-24 03:15:31 +0000
@@ -24,26 +24,25 @@
endif
override_dh_installdeb:
- cp debian/checkbox.postrm debian/checkbox-cli.postrm
- cp debian/checkbox.postrm debian/checkbox-ocp.postrm
- cp debian/checkbox.postrm debian/checkbox-urwid.postrm
- cp debian/checkbox.postrm debian/checkbox-gtk.postrm
- cp debian/checkbox.postrm debian/checkbox-qt.postrm
+ cp debian/checkbox.postrm debian/checkbox-ocp-cli.postrm
+ cp debian/checkbox.postrm debian/.postrm
+ cp debian/checkbox.postrm debian/checkbox-ocp-urwid.postrm
+ cp debian/checkbox.postrm debian/checkbox-ocp-gtk.postrm
+ cp debian/checkbox.postrm debian/checkbox-ocp-qt.postrm
cp debian/checkbox.postrm debian/checkbox-hw-collection.postrm
dh_installdeb
override_dh_installdocs:
dh_installdocs -pcheckbox ./README
- dh_installdocs -pcheckbox-cli ./README
- dh_installdocs -pcheckbox-ocp ./README
- dh_installdocs -pcheckbox-urwid ./README
- dh_installdocs -pcheckbox-gtk ./README
- dh_installdocs -pcheckbox-qt ./README
+ dh_installdocs -pcheckbox-ocp-cli ./README
+ dh_installdocs -pcheckbox-ocp-urwid ./README
+ dh_installdocs -pcheckbox-ocp-gtk ./README
+ dh_installdocs -pcheckbox-ocp-qt ./README
dh_installdocs -pcheckbox-hw-collection ./README
dh_installdocs
override_dh_clean:
-find . -name \*.mo -exec rm {} \;
- -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
+ -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
debconf-updatepo
dh_clean
=== removed file 'examples/checkbox-cli.ini'
--- examples/checkbox-cli.ini 2013-05-06 14:42:42 +0000
+++ examples/checkbox-cli.ini 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-[DEFAULT]
-
-# Space separated list of files to include as a dependency for the
-# CLI interface.
-includes = %(checkbox_share)s/configs/checkbox.ini
-
-[checkbox/plugins/user_interface]
-
-# Module where the user interface implementation is defined.
-interface_module = checkbox_cli.cli_interface
-
-# Class implementing the UserInterface interface.
-interface_class = CLIInterface
-
-[checkbox/plugins]
-
-blacklist = hexr_prompt hexr_transport
=== removed file 'examples/checkbox-gtk.ini'
--- examples/checkbox-gtk.ini 2009-02-15 15:40:07 +0000
+++ examples/checkbox-gtk.ini 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-[DEFAULT]
-
-# Space separated list of files to include as a dependency for the
-# GTK interface.
-includes = %(checkbox_share)s/configs/checkbox.ini
-
-[checkbox/plugins/user_interface]
-
-# Module where the user interface implementation is defined.
-interface_module = checkbox_gtk.gtk_interface
-
-# Class implementing the UserInterface interface.
-interface_class = GTKInterface
-
-# Path where GTK files are stored.
-data_path = %(checkbox_share)s/gtk
=== added file 'examples/checkbox-ocp-cli.ini'
--- examples/checkbox-ocp-cli.ini 1970-01-01 00:00:00 +0000
+++ examples/checkbox-ocp-cli.ini 2013-09-24 03:15:31 +0000
@@ -0,0 +1,17 @@
+[DEFAULT]
+
+# Space separated list of files to include as a dependency for the
+# CLI interface.
+includes = %(checkbox_share)s/configs/checkbox.ini
+
+[checkbox/plugins/user_interface]
+
+# Module where the user interface implementation is defined.
+interface_module = checkbox_cli.cli_interface
+
+# Class implementing the UserInterface interface.
+interface_class = CLIInterface
+
+[checkbox/plugins]
+
+blacklist = hexr_prompt hexr_transport
=== added file 'examples/checkbox-ocp-gtk.ini'
--- examples/checkbox-ocp-gtk.ini 1970-01-01 00:00:00 +0000
+++ examples/checkbox-ocp-gtk.ini 2013-09-24 03:15:31 +0000
@@ -0,0 +1,16 @@
+[DEFAULT]
+
+# Space separated list of files to include as a dependency for the
+# GTK interface.
+includes = %(checkbox_share)s/configs/checkbox.ini
+
+[checkbox/plugins/user_interface]
+
+# Module where the user interface implementation is defined.
+interface_module = checkbox_gtk.gtk_interface
+
+# Class implementing the UserInterface interface.
+interface_class = GTKInterface
+
+# Path where GTK files are stored.
+data_path = %(checkbox_share)s/gtk
=== added file 'examples/checkbox-ocp-qt.ini'
--- examples/checkbox-ocp-qt.ini 1970-01-01 00:00:00 +0000
+++ examples/checkbox-ocp-qt.ini 2013-09-24 03:15:31 +0000
@@ -0,0 +1,20 @@
+[DEFAULT]
+
+# Space separated list of files to include as a dependency for the
+# GTK interface.
+includes = %(checkbox_share)s/configs/checkbox.ini
+
+[checkbox/plugins/user_interface]
+
+# Module where the user interface implementation is defined.
+interface_module = checkbox_qt.qt_interface
+
+# Class implementing the UserInterface interface.
+interface_class = QTInterface
+
+# Path where qt files are stored.
+data_path = %(checkbox_share)s/qt
+
+[checkbox/plugins]
+
+blacklist = hexr_prompt hexr_transport
=== added file 'examples/checkbox-ocp-urwid.ini'
--- examples/checkbox-ocp-urwid.ini 1970-01-01 00:00:00 +0000
+++ examples/checkbox-ocp-urwid.ini 2013-09-24 03:15:31 +0000
@@ -0,0 +1,17 @@
+[DEFAULT]
+
+# Space separated list of files to include as a dependency for the
+# CLI interface.
+includes = %(checkbox_share)s/configs/checkbox.ini
+
+[checkbox/plugins/user_interface]
+
+# Module where the user interface implementation is defined.
+interface_module = checkbox_urwid.urwid_interface
+
+# Class implementing the UserInterface interface.
+interface_class = UrwidInterface
+
+[checkbox/plugins]
+
+blacklist = hexr_prompt hexr_transport
=== removed file 'examples/checkbox-ocp.ini'
--- examples/checkbox-ocp.ini 2013-08-21 16:42:53 +0000
+++ examples/checkbox-ocp.ini 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-[DEFAULT]
-
-# Space separated list of files to include as a dependency for the
-# CLI interface.
-includes = %(checkbox_share)s/configs/checkbox.ini
-
-[checkbox/plugins/user_interface]
-
-# Module where the user interface implementation is defined.
-interface_module = checkbox_ocp.cli_interface
-
-# Class implementing the UserInterface interface.
-interface_class = CLIInterface
-
-[checkbox/plugins]
-
-blacklist = hexr_prompt hexr_transport
=== removed file 'examples/checkbox-qt.ini'
--- examples/checkbox-qt.ini 2013-05-06 14:42:42 +0000
+++ examples/checkbox-qt.ini 1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-[DEFAULT]
-
-# Space separated list of files to include as a dependency for the
-# GTK interface.
-includes = %(checkbox_share)s/configs/checkbox.ini
-
-[checkbox/plugins/user_interface]
-
-# Module where the user interface implementation is defined.
-interface_module = checkbox_qt.qt_interface
-
-# Class implementing the UserInterface interface.
-interface_class = QTInterface
-
-# Path where qt files are stored.
-data_path = %(checkbox_share)s/qt
-
-[checkbox/plugins]
-
-blacklist = hexr_prompt hexr_transport
=== removed file 'examples/checkbox-urwid.ini'
--- examples/checkbox-urwid.ini 2013-05-06 14:42:42 +0000
+++ examples/checkbox-urwid.ini 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-[DEFAULT]
-
-# Space separated list of files to include as a dependency for the
-# CLI interface.
-includes = %(checkbox_share)s/configs/checkbox.ini
-
-[checkbox/plugins/user_interface]
-
-# Module where the user interface implementation is defined.
-interface_module = checkbox_urwid.urwid_interface
-
-# Class implementing the UserInterface interface.
-interface_class = UrwidInterface
-
-[checkbox/plugins]
-
-blacklist = hexr_prompt hexr_transport
=== modified file 'setup.py'
--- setup.py 2013-09-08 04:07:31 +0000
+++ setup.py 2013-09-24 03:15:31 +0000
@@ -267,8 +267,8 @@
],
},
scripts=[
- "bin/checkbox-cli", "bin/checkbox-ocp", "bin/checkbox-gtk",
- "bin/checkbox-urwid", "bin/checkbox-qt", "bin/checkbox-hw-collection"],
+ "bin/checkbox-ocp-cli", "bin/checkbox-ocp-gtk",
+ "bin/checkbox-ocp-urwid", "bin/checkbox-ocp-qt", "bin/checkbox-hw-collection"],
packages=find_packages(),
package_data={
"": ["cputable"]},
Follow ups
