Merge lp:~sylvain-pineau/checkbox/all-in-one into lp:~checkbox-dev/checkbox/checkbox-packaging

[Sylvain Pineau]

The goal of this MR is to have only one packaging branch to build all our checkbox/plainbox binaries.

The tricky part is the versioning of plainbox packages coming from plainbox-packaging because they followed
the versions of the plainbox changelog.
To work around this issue, we override dh_installchangelogs to provide the original plainbox changelog.
But this changelog must not contains the plainbox package name to avoid a conflict with the source package name, so every occurences of plainbox have been replaced by checkbox but at least the versioning works as expected.

[Zygmunt Krynicki (zyga)]

Thanks, immense work! There are some conflicts but I'll review this proposal first thing tomorrow. Ping me on IRC when you prepare another respin of this patchset.

[Sylvain Pineau (sylvain-pineau)]

ok, just rebased to avoid the conflicts in debian/rules. Ready for review now.

[lp:~sylvain-pineau/checkbox/all-in-one]

23. By Sylvain Pineau on 2013-10-23

remove unused checkbox-urwid.postinst

24. By Sylvain Pineau on 2013-10-23

Updated changelog

25. By Sylvain Pineau on 2013-10-23

Added .install and .links files from plainbox-packaging

26. By Sylvain Pineau on 2013-10-23

Added autopkgtest test directory from plainbox-packaging

27. By Sylvain Pineau on 2013-10-23

Added python3-pyremove from plainbox-packaging

28. By Sylvain Pineau on 2013-10-23

Added extras/ihv-demo-config/plainbox.conf from plainbox-packaging

29. By Sylvain Pineau on 2013-10-23

Added the plainbox changelog (as plainbox.changelog)

But renamed to plainbox.changelog to not conflict with the checkbox one.
To be used by dh_installchangelogs, all plainbox entries must be renamed
to checkbox in order to avoid the following error:

dpkg-gencontrol: error: source package has two conflicting values -
checkbox and plainbox

30. By Sylvain Pineau on 2013-10-23

debian:control: Update source package definition with plainbox requirements

31. By Sylvain Pineau on 2013-10-23

debian:control: Put python3-plainbox-doc before the rest of binaries

dh_installdirs installs stuff to the first package in debian/control,
ensure that's the -doc package.

32. By Sylvain Pineau on 2013-10-23

debian:control: Added all the plainbox* binaries from plainbox-packaging

33. By Sylvain Pineau on 2013-10-23

debian:control: clean up python related dependencies

- Removes unused ${python:Depends}
- Adds ${python3:Depends} to checkbox-cli and checkbox-qt
- Adds python3 (>= 3.2) to plainbox providers instead of ${python3:Depends}
  as dh_python3 does not replace this variable for packages not installing
  python modules/scripts in standard locations.

34. By Sylvain Pineau on 2013-10-23

Added lintian overrides for python3-plainbox

35. By Sylvain Pineau on 2013-10-23

debian:rules: merge plainbox-packaging settings

36. By Sylvain Pineau on 2013-10-23

debian:rules: Merge plainbox-packaging override_dh_auto_test

Note: both checkbox and plainbox "./setup.py test" are run with -vv.

37. By Sylvain Pineau on 2013-10-23

debian:rules: merge plainbox-packaging override_dh_auto_build

38. By Sylvain Pineau on 2013-10-23

debian:rules: merge plainbox-packaging override_dh_auto_install

39. By Sylvain Pineau on 2013-10-23

debian:rules: merge plainbox-packaging override_dh_installdocs

40. By Sylvain Pineau on 2013-10-23

debian:rules: override_dh_python3 to include the plainbox binary package

Run dh_python3 with --ignore-shebangs and --no-shebang-rewrite all other
packages to avoid warnings about bash shebang of provider scripts.

41. By Sylvain Pineau on 2013-10-24

debian:rules: Keep plainbox changelog

First make a copy of plainbox.changelog per packages coming from the
plainbox-packaging branch making them non native packages.

Then clean the native ones from all changelog.Debian.gz to avoid a lintian
error.

42. By Sylvain Pineau on 2013-10-24

debian rules: Only keep one build rule for python3

43. By Sylvain Pineau on 2013-10-24

debian:rules: Reorder dh overrides the way they are executed

[Sylvain Pineau (sylvain-pineau)]

Resubmitted with a better solution for keeping the plainbox changelog without the need of calling dh_installchangelogs. Copying the plainbox.changelog for every binaries from plainbox-packaging is enough.
But we need in that case to remove all changelog.Debian.gz from the build tree of all binaries coming from checkbox-packaging as those are considered native.

Important lines are:

find $(CURDIR)/debian -path "*usr/share/doc/*checkbox*" -iname "changelog*.gz" -exec rename "s/Debian\.gz/gz/" {} \;
find $(CURDIR)/debian -path "*usr/share/doc/plainbox-provider*" -iname "changelog*.gz" -exec rename "s/Debian\.gz/gz/" {} \;

And only keep one build rule for python3.

review: Needs Resubmitting

[Zygmunt Krynicki (zyga)]

+1, great work :-)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-18 20:40:55 +0000
+++ debian/changelog	2013-10-24 15:36:40 +0000
@@ -1,7 +1,19 @@
-checkbox (0.16.13) UNRELEASED; urgency=low
+checkbox (0.16.14) UNRELEASED; urgency=low
+
+    [ Chris Gregan ]
+  * jobs/wireless.txt.in - added tests for checking 80211 modules loaded and a
+    script to scripts to execute that check named wireless_ext.
+    Test added to run iwconfig query against all devices found on the system.
+
+  * jobs/ethernet.txt.in - added test for running ethtool queries against all
+    devices found on the system.
+
+ -- Sylvain Pineau <[e-mail]>  Fri, 18 Oct 2013 15:36:53 -0400
+
+checkbox (0.16.13) saucy; urgency=low
 
   [ Po-Hsu Lin ]
-  * jobs/keys.txt.in - adde keys/microphone-mute to test the mute key for 
+  * jobs/keys.txt.in - added keys/microphone-mute to test the mute key for
     microphone.
 
   [ Brendan Donegan ]

=== removed file 'debian/checkbox-urwid.postinst'
--- debian/checkbox-urwid.postinst	2013-06-01 14:18: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-10-21 13:38:57 +0000
+++ debian/control	2013-10-24 15:36:40 +0000
@@ -4,6 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Standards-Version: 3.9.3
 X-Python3-Version: >= 3.2
+XS-Testsuite: autopkgtest
 Build-Depends: debhelper (>= 9.2),
                dh-translations,
                libqt4-dev,
@@ -11,15 +12,34 @@
                python,
                python-distutils-extra,
                python-setuptools,
-               python3-all,
+               python3-all (>= 3.2),
+               python3-dbus,
                python3-distutils-extra,
                python3-gi,
                python3-lxml,
                python3-pkg-resources,
+               python3-requests ( >= 1.0),
                python3-setuptools,
+               python3-sphinx,
                qt4-qmake
 Vcs-Bzr: https://code.launchpad.net/~checkbox-dev/checkbox/checkbox-packaging
 
+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: checkbox
 Section: python
 Architecture: any
@@ -68,14 +88,13 @@
           wmctrl,
           wodim,
           python (>= 2.7),
-          ${python:Depends}
 Description: System testing application
  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}
+Depends: checkbox (>= ${source:Version}), ${misc:Depends}, ${python3:Depends}
 Description: Command line interface for checkbox
  This project provides an extensible interface for system testing. The
  results can then be sent to Launchpad.
@@ -89,6 +108,7 @@
          libqtgui4,
          python3-dbus,
          ${misc:Depends},
+         ${python3:Depends},
          ${shlibs:Depends}
 Description: QT4 interface for checkbox
  This project provides an extensible interface for system testing. The
@@ -118,7 +138,7 @@
 
 Package: plainbox-provider-resource-generic
 Architecture: all
-Depends: python3-checkbox, ${misc:Depends}, ${python3:Depends}
+Depends: python3-checkbox, ${misc:Depends}, python3 (>= 3.2)
 Recommends: dmidecode, dpkg (>= 1.13), lsb-release, wodim
 Description: CheckBox generic resource jobs provider
  This package provides the generic resource jobs.
@@ -134,7 +154,7 @@
 Architecture: any
 Depends: plainbox-provider-resource-generic,
          ${misc:Depends},
-         ${python3:Depends},
+         python3 (>= 3.2),
          ${shlibs:Depends}
 Recommends: gir1.2-gst-plugins-base-1.0,
             gir1.2-gstreamer-1.0,
@@ -166,7 +186,6 @@
           sysstat,
           wmctrl,
           python (>= 2.7),
-          ${python:Depends}
 Description: CheckBox jobs
  This package provides the CheckBox jobs collection.
 
@@ -190,3 +209,96 @@
 Recommends: apache2, bind9, cups, dnsutils, ipmitool, iperf, libapache2-mod-php5, mysql-server, php5-mysql, samba, ssh, tomcat6, winbind, cpu-checker, qemu-kvm, qemu-utils
 Description: SoC Certification
  This package provides the Server SoC Certification whitelists.
+
+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 (>= 0.3+bzr2359),
+         ${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 (>= 0.3+bzr2359), python3-gi, python3-dbus
+Description: PlainBox D-Bus service
+ File(s) needed for auto-starting PlainBox D-Bus service on demand.
+
+Package: plainbox-autostart-desktop
+Architecture: all
+Depends: plainbox, plainbox-insecure-policy
+Description: PlainBox autostart for desktop install
+ 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: PlainBox autostart for server install
+ File(s) needed for starting PlainBox automatically after boot on a server
+ install.
+
+Package: plainbox-secure-policy
+Architecture: all
+Provides: plainbox-policy
+Description: Secure PolicyKit action file for PlainBox
+ 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: Insecure PolicyKit action file for PlainBox
+ 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: PlainBox CI mailer
+ Helper that e-mails PlainBox output from autostart packages when run is
+ finished.
+
+Package: plainbox-ihv-demo-config
+Architecture: all
+Provides: plainbox-demo-config
+Conflicts: plainbox-demo-config
+Replaces: plainbox-demo-config
+Description: Configuration file that selects the 'ihv' provider by default.
+ You do not want to install this package outside of special circumstances
+ such as showing a demonstration of plainbox technology in a canned
+ environment. Normally the configuration file shipped by this package should
+ not be packaged

=== added directory 'debian/extras'
=== added directory 'debian/extras/ihv-demo-config'
=== added file 'debian/extras/ihv-demo-config/plainbox.conf'
--- debian/extras/ihv-demo-config/plainbox.conf	1970-01-01 00:00:00 +0000
+++ debian/extras/ihv-demo-config/plainbox.conf	2013-10-24 15:36:40 +0000
@@ -0,0 +1,8 @@
+; This configuration file is coming from the
+; plainbox-ihv-demo-config package.
+; 
+; Do not edit it, it is not a conffile, it WILL
+; be automatically upgraded without asking.
+; You have been warned.
+[common]
+default_provider=ihv

=== 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-10-24 15:36:40 +0000
@@ -0,0 +1,1 @@
+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-10-24 15:36:40 +0000
@@ -0,0 +1,1 @@
+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-10-24 15:36:40 +0000
@@ -0,0 +1,1 @@
+plainbox/plainbox/data/plainbox-ci-mailer.conf etc/init

=== added file 'debian/plainbox-ihv-demo-config.install'
--- debian/plainbox-ihv-demo-config.install	1970-01-01 00:00:00 +0000
+++ debian/plainbox-ihv-demo-config.install	2013-10-24 15:36:40 +0000
@@ -0,0 +1,1 @@
+debian/extras/ihv-demo-config/plainbox.conf /etc/xdg

=== 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-10-24 15:36:40 +0000
@@ -0,0 +1,1 @@
+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-10-24 15:36:40 +0000
@@ -0,0 +1,1 @@
+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-10-24 15:36:40 +0000
@@ -0,0 +1,2 @@
+plainbox/contrib/com.canonical.certification.PlainBox1.service usr/share/dbus-1/services/
+

=== added file 'debian/plainbox.changelog'
--- debian/plainbox.changelog	1970-01-01 00:00:00 +0000
+++ debian/plainbox.changelog	2013-10-24 15:36:40 +0000
@@ -0,0 +1,86 @@
+checkbox (0.3-2) precise; urgency=low
+
+  * Add plainbox-ihv-demo-config package that ships a configuration file
+    (/etc/xdg/plainbox.conf) suitable for doing IHV demos
+
+ -- Zygmunt Krynicki <[e-mail]>  Mon, 09 Sep 2013 16:48:56 +0200
+
+checkbox (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
+
+checkbox (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
+
+checkbox (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
+
+checkbox (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
+
+checkbox (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
+
+checkbox (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
+
+checkbox (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
+
+checkbox (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
+
+checkbox (0.1-1) quantal; urgency=low
+
+  * Initial release
+
+ -- Zygmunt Krynicki <[e-mail]>  Wed, 14 Nov 2012 19:36:19 +0000
+

=== added file 'debian/plainbox.install'
--- debian/plainbox.install	1970-01-01 00:00:00 +0000
+++ debian/plainbox.install	2013-10-24 15:36:40 +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-10-24 15:36:40 +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-10-24 15:36:40 +0000
@@ -0,0 +1,1 @@
+usr/share/doc/python3-plainbox/html/_sources usr/share/doc/python3-plainbox/rst

=== added file 'debian/python3-plainbox.lintian-overrides'
--- debian/python3-plainbox.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/python3-plainbox.lintian-overrides	2013-10-24 15:36:40 +0000
@@ -0,0 +1,8 @@
+# image files are very specific to the application, they don't belong in /usr/share
+python3-plainbox binary: image-file-in-usr-lib
+
+# PlainBox has to keep a copy of vendorized library licenses
+python3-plainbox binary: extra-license-file
+
+# trusted launchers are very specific to the application, see plainbox doc instead
+python3-plainbox binary: binary-without-manpage

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

=== modified file 'debian/rules'
--- debian/rules	2013-10-22 07:16:59 +0000
+++ debian/rules	2013-10-24 15:36:40 +0000
@@ -1,17 +1,60 @@
 #!/usr/bin/make -f
 
+# Prevent setuptools/distribute from accessing the internet.
+export http_proxy=http://127.0.9.1:9
+
 %:
-	dh "$@" --with python3,translations
+	dh "$@" --with python3,sphinxdoc,translations
+
+override_dh_clean:
+	dh_auto_clean
+	-rm -f $(CURDIR)/debian/plainbox-autostart-desktop.changelog
+	-rm -f $(CURDIR)/debian/plainbox-autostart-server.changelog
+	-rm -f $(CURDIR)/debian/plainbox-ci-mailer.changelog
+	-rm -f $(CURDIR)/debian/plainbox-ihv-demo-config.changelog
+	-rm -f $(CURDIR)/debian/plainbox-insecure-policy.changelog
+	-rm -f $(CURDIR)/debian/plainbox-secure-policy.changelog
+	-rm -f $(CURDIR)/debian/plainbox-service.changelog
+	-rm -f $(CURDIR)/debian/python3-plainbox.changelog
+	-rm -f $(CURDIR)/debian/python3-plainbox-doc.changelog
+	rm -rf $(CURDIR)/plainbox/build
+	rm -rf $(CURDIR)/plainbox/*.egg-info
+	-find . -name \*.mo -exec rm {} \;
+	-rm -f debian/checkbox-cli.postrm debian/checkbox-qt.postrm debian/checkbox-hw-collection.postrm
+	debconf-updatepo
+	dh_clean
 
 override_dh_auto_build:
-	set -ex; for python in $(shell py3versions -r); do \
-		( cd checkbox-old && $$python setup.py build; ) \
-	done;
+	cd $(CURDIR)/plainbox && ./setup.py build
+	cd $(CURDIR)/checkbox-old && ./setup.py build
+	dh_auto_build
+
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+override_dh_auto_test:
+	# drop LD_PRELOAD to avoid running under fakeroot; drop TMPDIR to work
+	# around LP#972324 (set by autopkgtest)
+	cd $(CURDIR)/checkbox-old && env -u LD_PRELOAD -u TMPDIR CHECKBOX_PACKAGING=1 ./setup.py test -vv
+	rm -rf  $(CURDIR)/checkbox-old/scripts/__pycache__
+	cd $(CURDIR)/plainbox && ./setup.py test -vv
+endif
 
 override_dh_auto_install:
-	set -ex; for python in $(shell py3versions -r); do \
-		( cd checkbox-old && $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; ) \
-	done;
+	# This is tricky, but plainbox versioning has to be different from
+	# checkbox as it used to be built separately.
+	# But to work correctly, plainbox.changelog has to mention checkbox instead
+	# of plainbox to have a match with the source package name and avoid:
+	# dpkg-gencontrol: error: source package has two conflicting values - checkbox and plainbox
+	cp $(CURDIR)/debian/plainbox.changelog $(CURDIR)/debian/plainbox-autostart-desktop.changelog
+	cp $(CURDIR)/debian/plainbox.changelog $(CURDIR)/debian/plainbox-autostart-server.changelog
+	cp $(CURDIR)/debian/plainbox.changelog $(CURDIR)/debian/plainbox-ci-mailer.changelog
+	cp $(CURDIR)/debian/plainbox.changelog $(CURDIR)/debian/plainbox-ihv-demo-config.changelog
+	cp $(CURDIR)/debian/plainbox.changelog $(CURDIR)/debian/plainbox-insecure-policy.changelog
+	cp $(CURDIR)/debian/plainbox.changelog $(CURDIR)/debian/plainbox-secure-policy.changelog
+	cp $(CURDIR)/debian/plainbox.changelog $(CURDIR)/debian/plainbox-service.changelog
+	cp $(CURDIR)/debian/plainbox.changelog $(CURDIR)/debian/python3-plainbox-doc.changelog
+	cp $(CURDIR)/debian/plainbox.changelog $(CURDIR)/debian/python3-plainbox.changelog
+	cd $(CURDIR)/plainbox && ./setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
+	cd $(CURDIR)/checkbox-old && ./setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/checkbox/bin/
 	cp -R $(CURDIR)/debian/tmp/usr/share/checkbox/scripts/* $(CURDIR)/debian/tmp/usr/lib/checkbox/bin/
 	# Move the providers files to a new location
@@ -35,30 +78,31 @@
 	find $(CURDIR)/debian/tmp/usr/share/checkbox/jobs -type f -not -iname  "resource.txt*" -execdir cp {} $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/checkbox/jobs/ \;
 	cp -R $(CURDIR)/debian/tmp/usr/share/checkbox/data $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/checkbox/
 	mv $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/checkbox/data/whitelists $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/checkbox
-
-override_dh_auto_test:
-ifeq (, $(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-	# drop LD_PRELOAD to avoid running under fakeroot; drop TMPDIR to work
-	# around LP#972324 (set by autopkgtest)
-	( cd checkbox-old && env -u LD_PRELOAD -u TMPDIR CHECKBOX_PACKAGING=1 ./setup.py test )
-	rm -rf checkbox-old/scripts/__pycache__
-endif
+	dh_auto_install
+
+override_dh_installdocs:
+	# This is tricky (again), dh_installdirs installs stuff to the first
+	# package in debian/control, ensure that's the -doc package.
+	cd $(CURDIR)/plainbox && ./setup.py build_sphinx
+	dh_installdocs $(CURDIR)/plainbox/build/sphinx/html/
+	dh_installdocs -pcheckbox ./checkbox-old/README
+	dh_installdocs -pcheckbox-cli ./checkbox-old/README
+	dh_installdocs -pcheckbox-qt ./checkbox-old/README
+	dh_installdocs -pcheckbox-hw-collection ./checkbox-old/README
+	dh_installdocs
+
+override_dh_python3:
+	# dh_python3 runs automatically on packages with the python3- prefix
+	# let's not forget plainbox
+	dh_python3 --package=plainbox
+	# Provider packages not only ship python scripts but bash as well.
+	dh_python3 --ignore-shebangs --no-shebang-rewrite
 
 override_dh_installdeb:
 	cp debian/checkbox.postrm debian/checkbox-cli.postrm
 	cp debian/checkbox.postrm debian/checkbox-qt.postrm
 	cp debian/checkbox.postrm debian/checkbox-hw-collection.postrm
+	# Keep original checkbox packages native
+	find $(CURDIR)/debian -path "*usr/share/doc/*checkbox*" -iname "changelog*.gz" -exec rename "s/Debian\.gz/gz/" {} \;
+	find $(CURDIR)/debian -path "*usr/share/doc/plainbox-provider*" -iname "changelog*.gz" -exec rename "s/Debian\.gz/gz/" {} \;
 	dh_installdeb
-
-override_dh_installdocs:
-	dh_installdocs -pcheckbox checkbox-old/README
-	dh_installdocs -pcheckbox-cli checkbox-old/README
-	dh_installdocs -pcheckbox-qt checkbox-old/README
-	dh_installdocs -pcheckbox-hw-collection checkbox-old/README
-	dh_installdocs
-
-override_dh_clean:
-	-find . -name \*.mo -exec rm {} \;
-	-rm -f debian/checkbox-cli.postrm debian/checkbox-qt.postrm debian/checkbox-hw-collection.postrm
-	debconf-updatepo
-	dh_clean

=== added directory 'debian/tests'
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2013-10-24 15:36:40 +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-10-24 15:36:40 +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"