Merge lp:~zyga/checkbox/checkbox-packaging-release into lp:~checkbox-dev/checkbox/checkbox-packaging-release

[Zygmunt Krynicki]

Builds for me

[lp:~zyga/checkbox/checkbox-packaging-release]

25. By Zygmunt Krynicki on 2013-11-19

Copy some *.install files from checkbox-packaging rev40 to fix build issues

[Brendan Donegan (brendan-donegan)]

+1

=== added file 'debian/canonical-certification-server.install'
--- debian/canonical-certification-server.install	1970-01-01 00:00:00 +0000
+++ debian/canonical-certification-server.install	2013-11-19 20:47:11 +0000
@@ -0,0 +1,3 @@
+usr/bin/canonical-certification-server
+debian/extras/canonical-certification-config/canonical-certification.conf /etc/xdg
+checkbox-ng/contrib/canonical-certification-server.conf etc/init

=== modified file 'debian/changelog'
--- debian/changelog	2013-11-01 15:57:13 +0000
+++ debian/changelog	2013-11-19 20:47:11 +0000
@@ -1,4 +1,33 @@
-checkbox (0.16.14) UNRELEASED; urgency=low
+checkbox (0.17) UNRELEASED; urgency=low
+
+  * Incremented changelog
+  * Make plainbox-service a transitional package that depends on
+    checkbox-ng-service. 
+
+ -- Zygmunt Krynicki <[e-mail]>  Sat, 16 Nov 2013 11:32:14 +0100
+
+checkbox (0.16.15) precise; urgency=low
+
+  [ Brendan Donegan ]
+  * scripts/brightness_test - Update get_best_interface function to use
+    heuristic prescribed by the kernel for selecting the backlight
+    interface to use (LP: #1250437)
+
+  [ Daniel Manrique ]
+  * jobs/stress.txt: Refer the stress log checking jobs to a single test file,
+    rather than using wildcards, which causes strange results (LP: #1161718)
+  * scripts/virtualization: Removed stray space in -net parameters causing
+    test failures (LP: #1250568)
+  * data/whitelists: Updated whitelists that require the new rtc resource
+    (LP: #1251781)
+
+  * Drop dependency from plainbox to checkbox, as it is not really required
+    and used to be there so that plainbox would see all of the jobs. Now with
+    fine-grained job providers this is no longer needed. 
+
+ -- Zygmunt Krynicki <[e-mail]>  Wed, 06 Nov 2013 14:00:42 +0100
+
+checkbox (0.16.14) saucy; urgency=low
 
     [ Chris Gregan ]
   * jobs/suspend.txt.in - added tests for running iperf tests before and after 
@@ -16,6 +45,9 @@
     that it actually tests the RTC instead of just checking for its presence.
     Also create a resource job to allow other jobs to determine if an RTC is
     present. (LP: #1184733)
+  * jobs/ethernet.txt.in, jobs/wireless.txt.in, scripts/network - added tests
+    to stress the connection and monitor for dropped/delayed packets and 
+    implemented the logic for them in the network script.
 
   [ Daniel Manrique ]
   * jobs/ethernet.txt.in, jobs/wireless.txt.in: Added user-verify jobs to test
@@ -23,7 +55,7 @@
   * scripts/network: Minor fixes and tweaks for nicer output and handling of
     Kb/s and Gb/s.
 
- -- Sylvain Pineau <[e-mail]>  Fri, 18 Oct 2013 15:36:53 -0400
+ -- Brendan Donegan <[e-mail]>  Fri, 01 Nov 2013 15:29:13 +0000
 
 checkbox (0.16.13) saucy; urgency=low
 
@@ -127,6 +159,7 @@
 
 checkbox (0.16.10) saucy; urgency=low
 
+  [ Jeff Lane ]
   * scripts/memory_compare: output now displays kB properly, not bytes labled
     as kB. (LP: #1217506)
   * scripts/storage_test: script now ensures there is enough free disk space
@@ -149,7 +182,6 @@
   * scripts/pm_test, scripts/fwts_test: Removed dmesg_common that's no longer
     present in fwts and added specific version dependency to checkbox
     (LP: #1206016)
-
   [ Sylvain Pineau ]
   * checkbox-old/scripts/fwts_test: Added the following new tests:
     method, msr, aspm, klog, oops and uefirtvariable (LP: #1202493)
@@ -258,7 +290,7 @@
   * scripts/audio_test: Changed the test frequency to 5040 Hz and increased
     the sampling time to 5 seconds, to improve reliability (LP: #1070776)
   * scripts/pm_test: Added support for invoking through pkexec (LP: #1201769)
-
+  [ Brendan Donegan ]
   [ Sylvain Pineau ]
   * checkbox-old/scripts/meminfo_resource, cpuinfo_resource: sort items for a
     deterministic output. Meant to be used with after_suspend jobs.
@@ -311,6 +343,17 @@
     to match fwts_test output and not break sleep_time_check (LP: #1188221)
 
   [ Brendan Donegan ]
+  * jobs/optical.txt.in - Added VERIFICATION section for cdrom-write job so that
+    the Qt UI doesn't barf when it finds there is no such section (LP: #1185759)
+  * qt/frontend/treemodel.cpp: Deselect a parent node only if all of its
+    child nodes are actually unselected rather than partially selected as
+    before. (LP: #1180342)
+  * qt/frontend/qtfront.cpp, qtfront.h, checkbox_qt/qt_interface.py: Select
+    appropriate radio button in showTest if the test already has a result set
+    rather than just defaulting to skip always (LP: #1181952)
+  * jobs/touchpad.txt.in - Remove the requires line for touch_mode in
+    touchpad/horizontal and touchpad/vertical so that those tests will
+    at least run on those systems where they are supposed to (LP: #1184882)
   * checkbox_qt/qt_interface.py - Order the list of items to be displayed
     alphabetically, so the order is consistent (LP: #1177647)
   * debian/rules - Add checkbox-hw-collection so that it's treated in the same
@@ -318,12 +361,10 @@
   * scripts/xml_sanitizer, jobs/info.txt.in - pipe output from udevadm
     through new xml_sanitizer script which removes characters which are
     invalid in XML, so that it doesn't cause trouble (LP: #1192093)
-
   [ Daniel Manrique ]
   * jobs/stress.txt.in: fixed a few inconsistent invocations of sleep_test.
   * checkbox/tests/test_message_files.py: Added a test to verify jobs contain
     required fields (LP: #1187216).
-
   [ Sylvain Pineau ]
   * jobs/resource.txt.in: updated version of the package resource job command
     supporting both precise and newer releases (LP: #1184197)
@@ -334,6 +375,14 @@
     (LP: #169425)
   * scripts/gst_pipeline_test: Use the logging module and the same config as
     audio_settings.
+    supporting both precise and newer releases (LP: #1184197)
+  * scripts/audio_settings: Use the new pactl parser to guess the right profile
+    to select for HDMI / DisplayPort tests.
+  * setup.py: Use setuptools find_packages(), more future proof.
+  * checkbox/scripts/audio_settings.py: Save active profiles for all alsa cards
+    (LP: #169425)
+  * scripts/gst_pipeline_test: Use the logging module and the same config as
+    audio_settings.
 
  -- Brendan Donegan <[e-mail]>  Fri, 31 May 2013 16:04:42 +0100
 
@@ -430,7 +479,7 @@
 
  -- Brendan Donegan <[e-mail]>  Tue, 07 May 2013 19:20:49 +0100
 
-checkbox (0.16) raring; urgency=low
+checkbox (0.16) saucy; urgency=low
 
   [ Brendan Donegan ]
   * Add hidden 'Submit to HEXR' checkbox on submission screen, so that it can

=== added file 'debian/checkbox-autostart-desktop.install'
--- debian/checkbox-autostart-desktop.install	1970-01-01 00:00:00 +0000
+++ debian/checkbox-autostart-desktop.install	2013-11-19 20:47:11 +0000
@@ -0,0 +1,1 @@
+checkbox-ng/contrib/checkbox-sru.desktop etc/xdg/autostart

=== added file 'debian/checkbox-autostart-server.install'
--- debian/checkbox-autostart-server.install	1970-01-01 00:00:00 +0000
+++ debian/checkbox-autostart-server.install	2013-11-19 20:47:11 +0000
@@ -0,0 +1,1 @@
+checkbox-ng/contrib/checkbox-sru.conf etc/init

=== added file 'debian/checkbox-ci-mailer.install'
--- debian/checkbox-ci-mailer.install	1970-01-01 00:00:00 +0000
+++ debian/checkbox-ci-mailer.install	2013-11-19 20:47:11 +0000
@@ -0,0 +1,1 @@
+checkbox-ng/contrib/checkbox-ci-mailer.conf etc/init

=== added file 'debian/checkbox-ng-service.install'
--- debian/checkbox-ng-service.install	1970-01-01 00:00:00 +0000
+++ debian/checkbox-ng-service.install	2013-11-19 20:47:11 +0000
@@ -0,0 +1,2 @@
+checkbox-ng/contrib/com.canonical.certification.PlainBox1.service usr/share/dbus-1/services/
+

=== added file 'debian/checkbox-ng.install'
--- debian/checkbox-ng.install	1970-01-01 00:00:00 +0000
+++ debian/checkbox-ng.install	2013-11-19 20:47:11 +0000
@@ -0,0 +1,1 @@
+usr/bin/checkbox

=== 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/checkbox.install'
--- debian/checkbox.install	2013-07-05 19:59:47 +0000
+++ debian/checkbox.install	2013-11-19 20:47:11 +0000
@@ -1,5 +1,4 @@
 usr/lib/checkbox/bin/*
-usr/lib/python*/*-packages/checkbox/*
 usr/share/apport/general-hooks/checkbox.py
 usr/share/apport/package-hooks/source_checkbox.py
 usr/share/checkbox/backend

=== modified file 'debian/control'
--- debian/control	2013-10-21 11:45:06 +0000
+++ debian/control	2013-11-19 20:47:11 +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,21 +12,41 @@
                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
 Depends: debconf,
          gir1.2-gudev-1.0,
          policykit-1,
+         python3-checkbox (>= 0.16.13+bzr2469),
          python3-lxml,
          udev,
          udisks2 | udisks,
@@ -67,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.
@@ -88,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
@@ -112,12 +133,14 @@
          udisks2 | udisks,
          ${misc:Depends},
          ${python3:Depends}
+Replaces: checkbox (<< 0.16.13+bzr2469)
+Breaks: checkbox (<< 0.16.13+bzr2469)
 Description: CheckBox python3 library
  This package contains the CheckBox python3 library needed by some jobs.
 
 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.
@@ -133,7 +156,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,
@@ -165,7 +188,6 @@
           sysstat,
           wmctrl,
           python (>= 2.7),
-          ${python:Depends}
 Description: CheckBox jobs
  This package provides the CheckBox jobs collection.
 
@@ -189,3 +211,158 @@
 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: 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: python3-checkbox-ng
+Architecture: all
+Depends: python3-plainbox (>= 0.3+bzr2359),
+         python3-requests ( >= 1.0),
+         ${misc:Depends},
+         ${python3:Depends}
+Description: Simple replacement for CheckBox
+ This package contains the checkbox-ng python3 library
+
+Package: checkbox-ng
+Architecture: all
+Depends: python3-checkbox-ng
+         ${misc:Depends},
+         ${python3:Depends}
+Description: Simple replacement for CheckBox
+ CheckBox command line tool
+
+Package: plainbox-service
+Priority: extra
+Section: oldlibs
+Architecture: all
+Depends: checkbox-ng-service 
+Description: PlainBox D-Bus service (transitional package)
+ Transitional package that can be safely removed
+
+Package: checkbox-ng-service
+Architecture: all
+Depends: checkbox-ng, python3-gi, python3-dbus
+Description: CheckBox D-Bus service
+ File(s) needed for auto-starting CheckBox D-Bus service on demand.
+
+Package: plainbox-autostart-desktop
+Architecture: all
+Priority: extra
+Section: oldlibs
+Depends: checkbox-autostart-desktop 
+Description: PlainBox autostart for desktop install
+ Transitional package that can be safely removed
+
+Package: plainbox-autostart-server
+Architecture: all
+Priority: extra
+Section: oldlibs
+Depends: checkbox-autostart-server 
+Description: PlainBox autostart for server install
+ Transitional package that can be safely removed
+
+Package: checkbox-autostart-desktop
+Architecture: all
+Depends: checkbox-ng, plainbox-insecure-policy
+Description: CheckBox autostart for desktop install
+ Installing this package will automatically invoke 'checkbox sru' after the
+ desktop session is started. This package should be only installed in automated
+ testing environment.
+
+Package: checkbox-autostart-server
+Architecture: all
+Depends: checkbox-ng, plainbox-insecure-policy
+Description: CheckBox autostart for server install
+ Installing this package will automatically invoke 'checkbox sru' after a
+ server installation finishes booting. This package should be only installed in
+ automated testing environment.
+
+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
+Priority: extra
+Section: oldlibs
+Depends: checkbox-ci-mailer 
+Description: PlainBox CI mailer
+ Transitional package that can be safely removed
+
+Package: checkbox-ci-mailer
+Architecture: all
+Depends: curl, checkbox-autostart-server | checkbox-autostart-desktop
+Description: CheckBox CI mailer
+ Helper that e-mails CheckBox 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
+
+Package: canonical-certification-server
+Architecture: all
+Depends: plainbox-provider-certification-server,
+         python3-checkbox-ng,
+         ${misc:Depends},
+         ${python3:Depends}
+Provides: checkbox-certification-server
+Conflicts: checkbox-certification-server
+Replaces: checkbox-certification-server
+Description: Canonical Certification Server.
+ checkbox-certification-server

=== added directory 'debian/extras'
=== added directory 'debian/extras/canonical-certification-config'
=== added file 'debian/extras/canonical-certification-config/canonical-certification.conf'
--- debian/extras/canonical-certification-config/canonical-certification.conf	1970-01-01 00:00:00 +0000
+++ debian/extras/canonical-certification-config/canonical-certification.conf	2013-11-19 20:47:11 +0000
@@ -0,0 +1,8 @@
+[common]
+welcome_text = Welcome to System Certification!
+
+ This application will gather information from your system. Then you will be asked manual tests to confirm that the system is working properly. Finally, you will be asked for the Secure ID of the computer to submit the information to the certification.canonical.com database.
+
+ To learn how to create or locate the Secure ID, please see here:
+
+ https://certification.canonical.com/home/ubuntu-certified

=== 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-11-19 20:47:11 +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 directory 'debian/patches'
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2013-11-19 20:47:11 +0000
@@ -0,0 +1,1 @@
+vendorized_packages_removal.patch

=== added file 'debian/patches/vendorized_packages_removal.patch'
--- debian/patches/vendorized_packages_removal.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/vendorized_packages_removal.patch	2013-11-19 20:47:11 +0000
@@ -0,0 +1,22 @@
+Description: Remove the vendorized funcsigs module
+Author: Sylvain Pineau <[e-mail]>
+Origin: upstream
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/checkbox-ng/checkbox_ng/service.py
++++ b/checkbox-ng/checkbox_ng/service.py
+@@ -28,13 +28,7 @@ import functools
+ import itertools
+ import logging
+ 
+-try:
+-    from inspect import Signature
+-except ImportError:
+-    try:
+-        from plainbox.vendor.funcsigs import Signature
+-    except ImportError:
+-        raise SystemExit("DBus parts require 'funcsigs' from pypi.")
++from inspect import Signature
+ from plainbox.abc import IJobResult
+ from plainbox.impl.job import JobDefinition
+ from plainbox.impl.result import MemoryJobResult

=== 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-11-19 20:47:11 +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-11-19 20:47:11 +0000
@@ -0,0 +1,1 @@
+plainbox/contrib/policykit_yes/org.freedesktop.policykit.pkexec.policy usr/share/polkit-1/actions/

=== added file 'debian/plainbox-provider-certification-client.install'
--- debian/plainbox-provider-certification-client.install	1970-01-01 00:00:00 +0000
+++ debian/plainbox-provider-certification-client.install	2013-11-19 20:47:11 +0000
@@ -0,0 +1,3 @@
+usr/lib/plainbox-providers-1/certification/whitelists/client-cert.whitelist usr/lib/plainbox-providers-1/certification-client/whitelists/
+usr/lib/plainbox-providers-1/certification/whitelists/client-selftest.whitelist usr/lib/plainbox-providers-1/certification-client/whitelists/
+usr/share/plainbox-providers-1/certification-client.provider /usr/share/plainbox-providers-1

=== removed file 'debian/plainbox-provider-certification-client.install'
--- debian/plainbox-provider-certification-client.install	2013-10-21 11:45:06 +0000
+++ debian/plainbox-provider-certification-client.install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-usr/lib/plainbox-providers-1/certification/whitelists/client-cert.whitelist usr/lib/plainbox-providers-1/certification-client/whitelists/
-usr/lib/plainbox-providers-1/certification/whitelists/client-selftest.whitelist usr/lib/plainbox-providers-1/certification-client/whitelists/
-usr/share/plainbox-providers-1/certification-client.provider /usr/share/plainbox-providers-1

=== added file 'debian/plainbox-provider-certification-server-soc.install'
--- debian/plainbox-provider-certification-server-soc.install	1970-01-01 00:00:00 +0000
+++ debian/plainbox-provider-certification-server-soc.install	2013-11-19 20:47:11 +0000
@@ -0,0 +1,3 @@
+usr/lib/plainbox-providers-1/certification/whitelists/server-soc-cert.whitelist usr/lib/plainbox-providers-1/certification-server-soc/whitelists/
+usr/lib/plainbox-providers-1/certification/whitelists/server-soc-selftest.whitelist usr/lib/plainbox-providers-1/certification-server-soc/whitelists/
+usr/share/plainbox-providers-1/certification-server-soc.provider /usr/share/plainbox-providers-1

=== removed file 'debian/plainbox-provider-certification-server-soc.install'
--- debian/plainbox-provider-certification-server-soc.install	2013-10-21 11:45:06 +0000
+++ debian/plainbox-provider-certification-server-soc.install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-usr/lib/plainbox-providers-1/certification/whitelists/server-soc-cert.whitelist usr/lib/plainbox-providers-1/certification-server-soc/whitelists/
-usr/lib/plainbox-providers-1/certification/whitelists/server-soc-selftest.whitelist usr/lib/plainbox-providers-1/certification-server-soc/whitelists/
-usr/share/plainbox-providers-1/certification-server-soc.provider /usr/share/plainbox-providers-1

=== added file 'debian/plainbox-provider-certification-server.install'
--- debian/plainbox-provider-certification-server.install	1970-01-01 00:00:00 +0000
+++ debian/plainbox-provider-certification-server.install	2013-11-19 20:47:11 +0000
@@ -0,0 +1,3 @@
+usr/lib/plainbox-providers-1/certification/whitelists/server-cert.whitelist usr/lib/plainbox-providers-1/certification-server/whitelists/
+usr/lib/plainbox-providers-1/certification/whitelists/server-selftest.whitelist usr/lib/plainbox-providers-1/certification-server/whitelists/
+usr/share/plainbox-providers-1/certification-server.provider /usr/share/plainbox-providers-1

=== removed file 'debian/plainbox-provider-certification-server.install'
--- debian/plainbox-provider-certification-server.install	2013-10-21 11:45:06 +0000
+++ debian/plainbox-provider-certification-server.install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-usr/lib/plainbox-providers-1/certification/whitelists/server-cert.whitelist usr/lib/plainbox-providers-1/certification-server/whitelists/
-usr/lib/plainbox-providers-1/certification/whitelists/server-selftest.whitelist usr/lib/plainbox-providers-1/certification-server/whitelists/
-usr/share/plainbox-providers-1/certification-server.provider /usr/share/plainbox-providers-1

=== added file 'debian/plainbox-provider-checkbox.install'
--- debian/plainbox-provider-checkbox.install	1970-01-01 00:00:00 +0000
+++ debian/plainbox-provider-checkbox.install	2013-11-19 20:47:11 +0000
@@ -0,0 +1,5 @@
+usr/lib/plainbox-providers-1/checkbox/bin/*
+usr/lib/plainbox-providers-1/checkbox/jobs/*
+usr/lib/plainbox-providers-1/checkbox/data/*
+usr/lib/plainbox-providers-1/checkbox/whitelists/*
+usr/share/plainbox-providers-1/checkbox.provider /usr/share/plainbox-providers-1

=== removed file 'debian/plainbox-provider-checkbox.install'
--- debian/plainbox-provider-checkbox.install	2013-10-21 11:45:06 +0000
+++ debian/plainbox-provider-checkbox.install	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-usr/lib/plainbox-providers-1/checkbox/bin/*
-usr/lib/plainbox-providers-1/checkbox/jobs/*
-usr/lib/plainbox-providers-1/checkbox/data/*
-usr/lib/plainbox-providers-1/checkbox/whitelists/*
-usr/share/plainbox-providers-1/checkbox.provider /usr/share/plainbox-providers-1

=== added file 'debian/plainbox-provider-checkbox.lintian-overrides'
--- debian/plainbox-provider-checkbox.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/plainbox-provider-checkbox.lintian-overrides	2013-11-19 20:47:11 +0000
@@ -0,0 +1,5 @@
+# jar files are very specific to the application, they don't belong in /usr/share
+plainbox-provider-checkbox binary: jar-not-in-usr-share
+
+# image files are very specific to the application, they don't belong in /usr/share
+plainbox-provider-checkbox binary: image-file-in-usr-lib

=== removed file 'debian/plainbox-provider-checkbox.lintian-overrides'
--- debian/plainbox-provider-checkbox.lintian-overrides	2013-10-21 11:45:06 +0000
+++ debian/plainbox-provider-checkbox.lintian-overrides	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-# jar files are very specific to the application, they don't belong in /usr/share
-plainbox-provider-checkbox binary: jar-not-in-usr-share
-
-# image files are very specific to the application, they don't belong in /usr/share
-plainbox-provider-checkbox binary: image-file-in-usr-lib

=== added file 'debian/plainbox-provider-resource-generic.install'
--- debian/plainbox-provider-resource-generic.install	1970-01-01 00:00:00 +0000
+++ debian/plainbox-provider-resource-generic.install	2013-11-19 20:47:11 +0000
@@ -0,0 +1,3 @@
+usr/lib/plainbox-providers-1/plainbox-resources/bin/*
+usr/lib/plainbox-providers-1/plainbox-resources/jobs/*
+usr/share/plainbox-providers-1/plainbox-resources.provider /usr/share/plainbox-providers-1

=== removed file 'debian/plainbox-provider-resource-generic.install'
--- debian/plainbox-provider-resource-generic.install	2013-10-21 11:45:06 +0000
+++ debian/plainbox-provider-resource-generic.install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-usr/lib/plainbox-providers-1/plainbox-resources/bin/*
-usr/lib/plainbox-providers-1/plainbox-resources/jobs/*
-usr/share/plainbox-providers-1/plainbox-resources.provider /usr/share/plainbox-providers-1

=== 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-11-19 20:47:11 +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.install'
--- debian/plainbox.install	1970-01-01 00:00:00 +0000
+++ debian/plainbox.install	2013-11-19 20:47:11 +0000
@@ -0,0 +1,1 @@
+usr/bin/plainbox

=== modified file 'debian/po/ast.po'
--- debian/po/ast.po	2013-06-01 14:18:12 +0000
+++ debian/po/ast.po	2013-11-19 20:47:11 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-25 04:42+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-10-18 05:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/cs.po'
--- debian/po/cs.po	2013-06-01 14:18:12 +0000
+++ debian/po/cs.po	2013-11-19 20:47:11 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-25 04:42+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-10-18 05:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/de.po'
--- debian/po/de.po	2013-06-01 14:18:12 +0000
+++ debian/po/de.po	2013-11-19 20:47:11 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-25 04:42+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-10-18 05:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/en_AU.po'
--- debian/po/en_AU.po	2013-06-01 14:18:12 +0000
+++ debian/po/en_AU.po	2013-11-19 20:47:11 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: checkbox\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-09-21 11:25-0400\n"
-"PO-Revision-Date: 2011-07-21 02:39+0000\n"
-"Last-Translator: Jared Norris <[e-mail]>\n"
+"PO-Revision-Date: 2013-06-18 23:25+0000\n"
+"Last-Translator: Jackson Doak <[e-mail]>\n"
 "Language-Team: English (Australia) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-25 04:42+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-10-18 05:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #. Type: string
 #. Description
@@ -93,118 +93,118 @@
 #. Description
 #: ../checkbox.templates:7001
 msgid "Routers:"
-msgstr ""
+msgstr "Routers:"
 
 #. Type: select
 #. Description
 #: ../checkbox.templates:7001
 msgid "Whether there is a single router or multiple routers."
-msgstr ""
+msgstr "Whether there is a single router or multiple routers."
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:8001
 msgid "Router SSID:"
-msgstr ""
+msgstr "Router SSID:"
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:8001
 msgid "The SSID of the single wireless router."
-msgstr ""
+msgstr "The SSID of the single wireless router."
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:9001
 msgid "Router PSK:"
-msgstr ""
+msgstr "Router PSK:"
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:9001
 msgid "The PSK of the single wireless router."
-msgstr ""
+msgstr "The PSK of the single wireless router."
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:10001
 msgid "WPA BG SSID:"
-msgstr ""
+msgstr "WPA BG SSID:"
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:10001
 msgid "The SSID of the 802.11b/g router with WPA security."
-msgstr ""
+msgstr "The SSID of the 802.11b/g router with WPA security."
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:11001
 msgid "WPA BG PSK:"
-msgstr ""
+msgstr "WPA BG PSK:"
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:11001
 msgid "The PSK of the 802.11b/g router with WPA security."
-msgstr ""
+msgstr "The PSK of the 802.11b/g router with WPA security."
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:12001
 msgid "WPA N SSID:"
-msgstr ""
+msgstr "WPA N SSID:"
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:12001
 msgid "The SSID of the 802.11n router with WPA security."
-msgstr ""
+msgstr "The SSID of the 802.11n router with WPA security."
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:13001
 msgid "WPA N PSK:"
-msgstr ""
+msgstr "WPA N PSK:"
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:13001
 msgid "The PSK of the 802.11n router with WPA security."
-msgstr ""
+msgstr "The PSK of the 802.11n router with WPA security."
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:14001
 msgid "Open BG SSID:"
-msgstr ""
+msgstr "Open BG SSID:"
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:14001
 msgid "The SSID of the 802.11b/g router with open security."
-msgstr ""
+msgstr "The SSID of the 802.11b/g router with open security."
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:15001
 msgid "Open N SSID:"
-msgstr ""
+msgstr "Open N SSID:"
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:15001
 msgid "The SSID of the 802.11n router with open security."
-msgstr ""
+msgstr "The SSID of the 802.11n router with open security."
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:16001
 msgid "Bluetooth Device Address:"
-msgstr ""
+msgstr "Bluetooth Device Address:"
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:16001
 msgid "The Bluetooth Device Address of the Bluetooth target."
-msgstr ""
+msgstr "The Bluetooth Device Address of the Bluetooth target."

=== modified file 'debian/po/en_GB.po'
--- debian/po/en_GB.po	2013-06-01 14:18:12 +0000
+++ debian/po/en_GB.po	2013-11-19 20:47:11 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-25 04:42+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-10-18 05:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/es.po'
--- debian/po/es.po	2013-06-01 14:18:12 +0000
+++ debian/po/es.po	2013-11-19 20:47:11 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-25 04:42+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-10-18 05:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/fr.po'
--- debian/po/fr.po	2013-06-01 14:18:12 +0000
+++ debian/po/fr.po	2013-11-19 20:47:11 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-25 04:42+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-10-18 05:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/gl.po'
--- debian/po/gl.po	2013-06-01 14:18:12 +0000
+++ debian/po/gl.po	2013-11-19 20:47:11 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-25 04:42+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-10-18 05:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/he.po'
--- debian/po/he.po	2013-06-01 14:18:12 +0000
+++ debian/po/he.po	2013-11-19 20:47:11 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-25 04:42+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-10-18 05:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/hu.po'
--- debian/po/hu.po	2013-06-01 14:18:12 +0000
+++ debian/po/hu.po	2013-11-19 20:47:11 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-25 04:42+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-10-18 05:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/id.po'
--- debian/po/id.po	2013-06-01 14:18:12 +0000
+++ debian/po/id.po	2013-11-19 20:47:11 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-25 04:42+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-10-18 05:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/it.po'
--- debian/po/it.po	2013-06-01 14:18:12 +0000
+++ debian/po/it.po	2013-11-19 20:47:11 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-25 04:42+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-10-18 05:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/ja.po'
--- debian/po/ja.po	2013-06-01 14:18:12 +0000
+++ debian/po/ja.po	2013-11-19 20:47:11 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-25 04:42+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-10-18 05:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/nl.po'
--- debian/po/nl.po	2013-06-01 14:18:12 +0000
+++ debian/po/nl.po	2013-11-19 20:47:11 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-25 04:42+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-10-18 05:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/oc.po'
--- debian/po/oc.po	2013-06-01 14:18:12 +0000
+++ debian/po/oc.po	2013-11-19 20:47:11 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-25 04:42+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-10-18 05:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/pl.po'
--- debian/po/pl.po	2013-06-01 14:18:12 +0000
+++ debian/po/pl.po	2013-11-19 20:47:11 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-25 04:42+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-10-18 05:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/pt_BR.po'
--- debian/po/pt_BR.po	2013-06-01 14:18:12 +0000
+++ debian/po/pt_BR.po	2013-11-19 20:47:11 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-25 04:42+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-10-18 05:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/ro.po'
--- debian/po/ro.po	2013-06-01 14:18:12 +0000
+++ debian/po/ro.po	2013-11-19 20:47:11 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-25 04:42+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-10-18 05:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/ru.po'
--- debian/po/ru.po	2013-06-01 14:18:12 +0000
+++ debian/po/ru.po	2013-11-19 20:47:11 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-25 04:42+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-10-18 05:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/tr.po'
--- debian/po/tr.po	2013-06-01 14:18:12 +0000
+++ debian/po/tr.po	2013-11-19 20:47:11 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-25 04:42+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-10-18 05:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/uk.po'
--- debian/po/uk.po	2013-06-01 14:18:12 +0000
+++ debian/po/uk.po	2013-11-19 20:47:11 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-25 04:42+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-10-18 05:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/zh_CN.po'
--- debian/po/zh_CN.po	2013-06-01 14:18:12 +0000
+++ debian/po/zh_CN.po	2013-11-19 20:47:11 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-25 04:42+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-10-18 05:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/zh_TW.po'
--- debian/po/zh_TW.po	2013-06-01 14:18:12 +0000
+++ debian/po/zh_TW.po	2013-11-19 20:47:11 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-25 04:42+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-10-18 05:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #. Type: string
 #. Description

=== added file 'debian/python3-checkbox-ng.install'
--- debian/python3-checkbox-ng.install	1970-01-01 00:00:00 +0000
+++ debian/python3-checkbox-ng.install	2013-11-19 20:47:11 +0000
@@ -0,0 +1,2 @@
+usr/lib/python3/dist-packages/checkbox_ng/*
+usr/lib/python3/dist-packages/checkbox_ng-*.egg-info/*

=== added file 'debian/python3-checkbox.install'
--- debian/python3-checkbox.install	1970-01-01 00:00:00 +0000
+++ debian/python3-checkbox.install	2013-11-19 20:47:11 +0000
@@ -0,0 +1,2 @@
+usr/lib/python3/dist-packages/checkbox/*
+usr/lib/python3/dist-packages/checkbox-*.egg-info/*

=== removed file 'debian/python3-checkbox.install'
--- debian/python3-checkbox.install	2013-10-21 11:45:06 +0000
+++ debian/python3-checkbox.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/python*/*-packages/checkbox/*

=== added file 'debian/python3-plainbox.install'
--- debian/python3-plainbox.install	1970-01-01 00:00:00 +0000
+++ debian/python3-plainbox.install	2013-11-19 20:47:11 +0000
@@ -0,0 +1,3 @@
+usr/lib/python3/dist-packages/plainbox/*
+usr/lib/python3/dist-packages/plainbox-*.egg-info/*
+usr/bin/plainbox-trusted-launcher-1

=== added file 'debian/python3-plainbox.links'
--- debian/python3-plainbox.links	1970-01-01 00:00:00 +0000
+++ debian/python3-plainbox.links	2013-11-19 20:47:11 +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-11-19 20:47:11 +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-11-19 20:47:11 +0000
@@ -0,0 +1,2 @@
+README.md
+plainbox*.egg-info/SOURCES.txt

=== modified file 'debian/rules'
--- debian/rules	2013-10-22 07:20:37 +0000
+++ debian/rules	2013-11-19 20:47:11 +0000
@@ -1,25 +1,68 @@
 #!/usr/bin/make -f
 
+export DH_VERBOSE=1
+
+# Prevent setuptools/distribute from accessing the internet.
+export http_proxy=http://127.0.9.1:9
+
+RELEASE_GTE_RARING	:= $(shell expr `lsb_release -rs` \>= 13.04)
+
 %:
-	dh "$@" --with python3,translations
+	dh "$@" --with python3,sphinxdoc,translations
+
+override_dh_auto_clean:
+	rm -rf $(CURDIR)/plainbox/build
+	rm -rf $(CURDIR)/plainbox/*.egg-info
+	rm -rf $(CURDIR)/checkbox/build
+	rm -rf $(CURDIR)/checkbox/*.egg-info
+	rm -rf $(CURDIR)/checkbox-ng/build
+	rm -rf $(CURDIR)/checkbox-ng/*.egg-info
+	rm -rf $(CURDIR)/checkbox-ng/*.egg-link
+	-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;
+ifeq (1,$(RELEASE_GTE_RARING))
+	# funcsigs.Signature (the backport) is part of the Python standard library,
+	# available as inspect.Signature in Python 3.3 onwards.
+	rm -rf $(CURDIR)/plainbox/plainbox/vendor/funcsigs
+	# mock is now part of the Python standard library, available as
+	# unittest.mock in Python 3.3 onwards.
+	echo "from unittest.mock import *" > $(CURDIR)/plainbox/plainbox/vendor/mock.py
+	dh_quilt_patch
+endif
+	cd $(CURDIR)/plainbox && ./setup.py build
+	cd $(CURDIR)/checkbox-old && ./setup.py build
+	cd $(CURDIR)/checkbox-ng && ./setup.py 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
+	# checkbox-ng requires plainbox to be installed, let's just use the develop
+	# mode and create an egg-link to the plainbox source
+	cd $(CURDIR)/plainbox && PYTHONPATH=$(CURDIR)/checkbox-ng ./setup.py develop -d $(CURDIR)/checkbox-ng
+	cd $(CURDIR)/checkbox-ng && ./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;
+	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
+	cd $(CURDIR)/checkbox-ng && ./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
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/
 	# Certification providers
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/certification/whitelists
-	mv $(CURDIR)/debian/tmp/usr/share/checkbox/data/whitelists/certification/* $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/certification/whitelists
-	rm -rf $(CURDIR)/debian/tmp/usr/share/checkbox/data/whitelists/certification
+	mv $(CURDIR)/debian/tmp/usr/share/checkbox/data/whitelists/*-cert.* $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/certification/whitelists
+	mv $(CURDIR)/debian/tmp/usr/share/checkbox/data/whitelists/*-selftest.* $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/certification/whitelists
+	mv $(CURDIR)/debian/tmp/usr/share/checkbox/data/whitelists/virt.* $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/certification/whitelists
 	# Resources provider files
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/plainbox-resources
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/plainbox-resources/bin/
@@ -35,30 +78,27 @@
 	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_install
+
+override_dh_installdocs:
+	# This is tricky, 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
+	dh_python3
 
 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
 	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-11-19 20:47:11 +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-11-19 20:47:11 +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"