Merge lp:~roadmr/checkbox/plainbox-packaging-dbus-service into lp:checkbox

[Daniel Manrique]

This adds a plainbox-service package containing only the service file and declaring the dependencies on python3-dbus and python3-gi (as well as plainbox itself).

This adds a plainbox-service package containing only the service file and declaring the dependencies on python3-dbus and python3-gi (as well as plainbox itself).

Unmerged revisions

14. By Daniel Manrique on 2013-07-16

Added plainbox-service package to auto-start on demand for dbus requests

13. By Daniel Manrique on 2013-07-16

"[r=zkrynicki][bug=][author=roadmr] Recent plainbox builds are failing, ostensibly because during testing, plainbox/impl/service.py wants to include dbus, which is not declared as a dependency and thus not installed.

While it's strictly a Build-Depends, I also added it as a Depends since this will eventually be one of the main ways to use plainbox.

Let me know if it would be preferrable to remove the runtime dependency on dbus (not the build one), and instead add that dependency in i.e. GUI clients that communicate through dbus."

12. By Zygmunt Krynicki on 2013-05-16

"[r=zkrynicki][bug=][author=zkrynicki] automatic merge by tarmac"

11. By Sylvain Pineau on 2013-05-10

"[r=sylvain-pineau][bug=][author=sylvain-pineau] Adds the checkbox-trusted-launcher in /usr/bin and provides the virtual policy packages"

10. By Daniel Manrique on 2013-04-23

"[r=zkrynicki][bug=][author=roadmr] Adds a plainbox-ci-mailer package to install the upstart job from plainbox source."

9. By Brendan Donegan on 2013-04-11

"[r=brendan-donegan][bug=][author=brendan-donegan] automatic merge by tarmac"

8. By Daniel Manrique on 2013-04-05

dumb, dumb typo in depends string

7. By Daniel Manrique on 2013-04-05

Added python3-requests as a build-depends

6. By Daniel Manrique on 2013-04-05

"[r=zkrynicki][bug=][author=roadmr] automatic merge by tarmac"

5. By Zygmunt Krynicki on 2013-03-25

Add missing dependency on python3-lxml for python3-plainbox and
build-depends

=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2013-07-16 16:58:24 +0000
@@ -0,0 +1,79 @@
+plainbox (0.3-1) raring; urgency=low
+
+  * Added plainbox-service package to ensure dbus dependencies and
+    install service auto-start file.
+
+ -- Daniel Manrique <[e-mail]>  Tue, 16 Jul 2013 11:27:13 -0400
+
+plainbox (0.2-7) raring; urgency=low
+
+  [ Zygmunt Krynicki ]
+  * Add missing dependency on python3-lxml for python3-plainbox and
+    build-depends
+
+  [ Brendan Donegan ]
+  * Add binary package plainbox-autostart which installs files necessary to
+    have plainbox run automatically when the system starts up.
+
+  [ Daniel Manrique ]
+  * Add binary package: plainbox-ci-mailer which installs an upstart job
+    which posts the log files to an e-mailer CGI when the plainbox
+    jobs report they are finished.
+
+  [ Sylvain Pineau]
+  * Adds the checkbox-trusted-launcher in /usr/bin and provides the virtual
+    policy packages.
+
+ -- Sylvain Pineau <[e-mail]>  Fri, 10 May 2013 14:54:24 +0200
+
+plainbox (0.2-6) raring; urgency=low
+
+  * Add missing dependency on python3-pkg-resources to python3-plainbox 
+
+ -- Zygmunt Krynicki <[e-mail]>  Mon, 11 Mar 2013 11:05:57 +0100
+
+plainbox (0.2-5) raring; urgency=low
+
+  * Re-did packaging from scratch.
+  * Added python3-plainbox-doc package with sphinx docs
+  * Added python3-plainbox package
+
+ -- Zygmunt Krynicki <[e-mail]>  Fri, 08 Mar 2013 22:05:16 +0100
+
+plainbox (0.2-4) quantal; urgency=low
+
+  * Rename debian/test to debian/tests, makes autopkgtests work again
+
+ -- Zygmunt Krynicki <[e-mail]>  Wed, 05 Dec 2012 12:23:53 +0100
+
+plainbox (0.2-3) quantal; urgency=low
+
+  * Add dependency on python3-pkg-resources to plainbox
+  * Use python3 as plainbox interpreter (replacing python3.2)
+  * Don't build plainbox for multiple python3 versions
+  * Use autopkgtests to run unit tests
+
+ -- Zygmunt Krynicki <[e-mail]>  Wed, 05 Dec 2012 12:05:55 +0100
+
+plainbox (0.2-2) quantal; urgency=low
+
+  * Split the package into plainbox and python3-plainbox
+  * Move the plainbox package to the utils section
+  * Update debian/copyright to refer to common-licenses
+
+ -- Zygmunt Krynicki <[e-mail]>  Tue, 04 Dec 2012 14:26:49 +0100
+
+plainbox (0.2-1) quantal; urgency=low
+
+  * Remove useless whitespace
+  * Imported Upstream version 0.2
+  * Ship README.md as docs
+
+ -- Zygmunt Krynicki <[e-mail]>  Tue, 04 Dec 2012 10:20:05 +0100
+
+plainbox (0.1-1) quantal; urgency=low
+
+  * Initial release
+
+ -- Zygmunt Krynicki <[e-mail]>  Wed, 14 Nov 2012 19:36:19 +0000
+

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2013-07-16 16:58:24 +0000
@@ -0,0 +1,1 @@
+9

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2013-07-16 16:58:24 +0000
@@ -0,0 +1,104 @@
+Source: plainbox
+Section: utils
+Priority: extra
+Maintainer: Zygmunt Krynicki <[e-mail]>
+Build-Depends: checkbox,
+               debhelper (>= 8.0.0),
+               python3-all,
+               python3-dbus,
+               python3-gi,
+               python3-lxml,
+               python3-mock,
+               python3-pkg-resources,
+               python3-requests ( >= 1.0),
+               python3-setuptools,
+               python3-sphinx
+Standards-Version: 3.9.3
+X-Python3-Version: >= 3.2
+XS-Testsuite: autopkgtest
+Homepage: http://pypi.python.org/pypi/plainbox
+
+Package: python3-plainbox-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Description: Simple replacement for CheckBox
+ PlainBox is a hardware testing tool useful for certifying laptops, desktops
+ and servers with Ubuntu. It is a replacement for the current certification
+ tool, CheckBox.
+ .
+ PlainBox complements CheckBox. It uses all the hardware test definitions,
+ scripts and libraries from CheckBox. PlainBox is currently in alpha stages,
+ having mostly but not entirely complete core and a developer-centric command
+ line interface.
+ .
+ This package contains the documentation for the plainbox python3 library
+
+Package: python3-plainbox
+Architecture: all
+Section: python
+Depends: plainbox-policy,
+         python3-lxml,
+         python3-pkg-resources,
+         python3-requests (>= 1.0),
+         ${misc:Depends},
+         ${python3:Depends}
+Suggests: python3-plainbox-doc
+Description: Simple replacement for CheckBox
+ PlainBox is a hardware testing tool useful for certifying laptops, desktops
+ and servers with Ubuntu. It is a replacement for the current certification
+ tool, CheckBox.
+ .
+ PlainBox complements CheckBox. It uses all the hardware test definitions,
+ scripts and libraries from CheckBox. PlainBox is currently in alpha stages,
+ having mostly but not entirely complete core and a developer-centric command
+ line interface.
+ .
+ This package contains the plainbox python3 library
+
+Package: plainbox
+Architecture: all
+Depends: checkbox, python3-plainbox, ${misc:Depends}, ${python3:Depends}
+Description: Simple replacement for CheckBox
+ PlainBox is a hardware testing tool useful for certifying laptops, desktops
+ and servers with Ubuntu. It is a replacement for the current certification
+ tool, CheckBox.
+ .
+ PlainBox complements CheckBox. It uses all the hardware test definitions,
+ scripts and libraries from CheckBox. PlainBox is currently in alpha stages,
+ having mostly but not entirely complete core and a developer-centric command
+ line interface.
+ .
+ This package contains the plainbox executable
+
+Package: plainbox-service
+Architecture: all
+Depends: plainbox, python3-gi, python3-dbus 
+Description: File(s) needed for auto-starting PlainBox D-Bus service on demand.
+
+Package: plainbox-autostart-desktop
+Architecture: all
+Depends: plainbox, plainbox-insecure-policy
+Description: File(s) needed for starting PlainBox automatically after login on a desktop install.
+
+Package: plainbox-autostart-server
+Architecture: all
+Depends: plainbox, plainbox-insecure-policy
+Description: File(s) needed for starting PlainBox automatically after boot on a server install.
+
+Package: plainbox-secure-policy
+Architecture: all
+Provides: plainbox-policy
+Description: PolicyKit action file needed by PlainBox for prompting the password once.
+
+Package: plainbox-insecure-policy
+Architecture: all
+Provides: plainbox-policy
+Conflicts: plainbox-policy
+Replaces: plainbox-policy
+Description: PolicyKit action file needed by PlainBox for running in headless mode without authentication.
+
+Package: plainbox-ci-mailer
+Architecture: all
+Depends: curl, plainbox-autostart-server | plainbox-autostart-desktop
+Description: Helper that e-mails PlainBox output from autostart packages when run is finished.

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2013-07-16 16:58:24 +0000
@@ -0,0 +1,22 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: plainbox
+Source: https://launchpad.net/checkbox
+
+Files: *
+Copyright: Copyright 2012-2013 Canonical Ltd.
+License: GPL-3
+ This package is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'.

=== added file 'debian/plainbox-autostart-desktop.install'
--- debian/plainbox-autostart-desktop.install	1970-01-01 00:00:00 +0000
+++ debian/plainbox-autostart-desktop.install	2013-07-16 16:58:24 +0000
@@ -0,0 +1,1 @@
+checkbox/plainbox/plainbox/data/plainbox.desktop etc/xdg/autostart

=== added file 'debian/plainbox-autostart-server.install'
--- debian/plainbox-autostart-server.install	1970-01-01 00:00:00 +0000
+++ debian/plainbox-autostart-server.install	2013-07-16 16:58:24 +0000
@@ -0,0 +1,1 @@
+checkbox/plainbox/plainbox/data/plainbox.conf etc/init

=== added file 'debian/plainbox-ci-mailer.install'
--- debian/plainbox-ci-mailer.install	1970-01-01 00:00:00 +0000
+++ debian/plainbox-ci-mailer.install	2013-07-16 16:58:24 +0000
@@ -0,0 +1,1 @@
+checkbox/plainbox/plainbox/data/plainbox-ci-mailer.conf etc/init

=== added file 'debian/plainbox-insecure-policy.install'
--- debian/plainbox-insecure-policy.install	1970-01-01 00:00:00 +0000
+++ debian/plainbox-insecure-policy.install	2013-07-16 16:58:24 +0000
@@ -0,0 +1,1 @@
+checkbox/plainbox/contrib/policykit_yes/org.freedesktop.policykit.pkexec.policy usr/share/polkit-1/actions/

=== added file 'debian/plainbox-secure-policy.install'
--- debian/plainbox-secure-policy.install	1970-01-01 00:00:00 +0000
+++ debian/plainbox-secure-policy.install	2013-07-16 16:58:24 +0000
@@ -0,0 +1,1 @@
+checkbox/plainbox/contrib/policykit_auth_admin_keep/org.freedesktop.policykit.pkexec.policy usr/share/polkit-1/actions/

=== added file 'debian/plainbox-service.install'
--- debian/plainbox-service.install	1970-01-01 00:00:00 +0000
+++ debian/plainbox-service.install	2013-07-16 16:58:24 +0000
@@ -0,0 +1,2 @@
+checkbox/plainbox/contrib/com.canonical.certificaation.PlainBox1.service usr/share/dbus-1/services/
+

=== added file 'debian/plainbox.install'
--- debian/plainbox.install	1970-01-01 00:00:00 +0000
+++ debian/plainbox.install	2013-07-16 16:58:24 +0000
@@ -0,0 +1,1 @@
+usr/bin/plainbox

=== added file 'debian/python3-plainbox.install'
--- debian/python3-plainbox.install	1970-01-01 00:00:00 +0000
+++ debian/python3-plainbox.install	2013-07-16 16:58:24 +0000
@@ -0,0 +1,2 @@
+usr/lib/python3
+usr/bin/checkbox-trusted-launcher

=== added file 'debian/python3-plainbox.links'
--- debian/python3-plainbox.links	1970-01-01 00:00:00 +0000
+++ debian/python3-plainbox.links	2013-07-16 16:58:24 +0000
@@ -0,0 +1,1 @@
+usr/share/doc/python3-plainbox/html/_sources usr/share/doc/python3-plainbox/rst

=== added file 'debian/python3-pyremove'
--- debian/python3-pyremove	1970-01-01 00:00:00 +0000
+++ debian/python3-pyremove	2013-07-16 16:58:24 +0000
@@ -0,0 +1,2 @@
+README.md
+plainbox*.egg-info/SOURCES.txt

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2013-07-16 16:58:24 +0000
@@ -0,0 +1,41 @@
+#!/usr/bin/make -f
+
+#DH_VERBOSE=1
+
+PYTHON3=$(shell py3versions -vr)
+
+# Prevent setuptools/distribute from accessing the internet.
+export http_proxy=http://127.0.9.1:9
+
+%:
+	dh $@  --with python3,sphinxdoc
+
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+test-python%:
+	cd $(CURDIR)/checkbox/plainbox && python$* setup.py test -vv
+
+override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
+endif
+
+build-python%:
+	cd $(CURDIR)/checkbox/plainbox && python$* setup.py build
+
+override_dh_auto_build: $(PYTHON3:%=build-python%)
+	dh_auto_build
+
+install-python%:
+	cd $(CURDIR)/checkbox/plainbox && python$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
+
+override_dh_auto_install: $(PYTHON3:%=install-python%)
+	dh_auto_install
+
+# This is tricky, dh_installdirs installs stuff to the first package in
+# debian/control, ensure that's the -doc package.
+override_dh_installdocs:
+	cd $(CURDIR)/checkbox/plainbox && python3 setup.py build_sphinx
+	dh_installdocs $(CURDIR)/checkbox/plainbox/build/sphinx/html/
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf $(CURDIR)/checkbox/plainbox/build
+	rm -rf $(CURDIR)/checkbox/plainbox/*.egg-info

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2013-07-16 16:58:24 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)

=== added directory 'debian/tests'
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2013-07-16 16:58:24 +0000
@@ -0,0 +1,2 @@
+Tests: unit-tests
+Depends: @

=== added file 'debian/tests/unit-tests'
--- debian/tests/unit-tests	1970-01-01 00:00:00 +0000
+++ debian/tests/unit-tests	2013-07-16 16:58:24 +0000
@@ -0,0 +1,15 @@
+#!/bin/sh
+# autopkgtest check: Run the unit tests against the installed copy of plainbox
+# (C) 2012 Canonical Ltd.
+# Author: Zygmunt Krynicki <[e-mail]>
+#
+# Because each test program is executed inside unpacked source package and
+# python search path is likely to pick up the plainbox module directly from the
+# source we should relocate somewhere else. The intent of autopkgtest is to
+# verify the _installed_ software.
+
+set -e
+WORKDIR=$(mktemp -d)
+trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
+cd $WORKDIR
+python3 -m unittest --quiet plainbox.tests.test_suite 2>/dev/null && echo "unit-test: OK"