Merge lp:~roadmr/checkbox/packaging-sync-with-checkbox into lp:~checkbox-dev/checkbox/checkbox-packaging

[Daniel Manrique]

This brings the packaging branch in sync with checkbox's debian directory. I (hopefully) applied all the checkbox-old changes correctly and packages do build, though I don't guarantee they make sense once installed :)

This brings the packaging branch in sync with checkbox's debian directory. I (hopefully) applied all the checkbox-old changes correctly and packages do build, though I don't guarantee they make sense once installed :)

[lp:~roadmr/checkbox/packaging-sync-with-checkbox]

20. By Daniel Manrique on 2013-10-18

Brought packaging branch up to date with checkbox's debian/ directory

[Zygmunt Krynicki (zyga)]

+1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-27 08:50:16 +0000
+++ debian/changelog	2013-10-18 20:41:35 +0000
@@ -1,6 +1,73 @@
-checkbox (0.16.12) UNRELEASED; urgency=low
-
-  * Incremented changelog
+checkbox (0.16.13) UNRELEASED; urgency=low
+
+  [ Po-Hsu Lin ]
+  * jobs/keys.txt.in - adde keys/microphone-mute to test the mute key for 
+    microphone.
+
+  [ Brendan Donegan ]
+  * jobs/resource.txt.in, jobs/virtualization.txt.in - added kvm resource job
+    which states whether the hardware supports KVM. Remove kvm_ok job and
+    use the kvm resource job to determine if kvm_check_vm should run
+    (LP: #1236776)
+  * jobs/keys.txt.in - added keys/keyboard-backlight job to test keyboard
+    backlight toggle key.
+
+  [ Daniel Manrique ]
+  * jobs/virtualization.txt.in: Set the kvm_check_vm test to run as root, to
+    ensure we're running under kvm and not tcg. Modified tests for environment
+    variables accordingly since we need to account for presence of proxy
+    variables.
+  * scripts/gpu_test: Revamped way of launching and stopping glxgears
+    windows/threads, to make 100% sure that we find and close them all,
+    avoiding leftover threads that cause the script not to exit.
+    (LP: #1237199)
+  * plugins/backend_info: Resolve and use full path to the backend script to
+    ensure it runs when invoked via pkexec which is unhappy with relative
+    paths (LP: #1240245)
+
+  [ Jeff Marcom ]
+  * scripts/network - added iperf test benchmark testing capabilities. 
+
+  [ Yung Shen ]
+  * jobs/keys.txt.in - added keys/hibernate job to test hibernate key
+    and keys/keyboard-overhead-light job to test the key.
+
+  [ Taihsiang Ho ]
+  * checkbox-old/jobs/keys.txt.in - added keys/lock-screen job to test
+    lock screen key.
+  * checkbox-old/scripts/lock_screen_watcher - the script for keys/lock-screen job
+
+  [ Zygmunt Krynicki ]
+  * Remove the GTK+ and Urwid interfaces
+
+  [ Sylvain Pineau]
+  * jobs/resource.txt.in, scripts/wifi_interface_mode_resource: new resource
+    job to detect the wifi chip supported interface modes.
+  * codecs.txt.in, info.txt.in, install.txt.in, networking.txt.in and
+    server-services.txt.in: Fixed "requires" expresions using the "and" 
+    operator.
+
+  [ Jeff Lane ]
+  * Renamed networking.txt.in to ethernet.txt.in. Renamed all jobs and
+    references to jobs with 'networking' in them to 'ethernet'
+
+ -- Taihsiang Ho <[e-mail]>  Mon, 14 Oct 2013 17:35:23 -0400
+
+checkbox (0.16.12) saucy; urgency=low
+
+  [ Daniel Manrique ]
+  * scripts/gpu_test: Better validation that glxgears windows were found, to
+    avoid manipulation of nonexisting windows which causes threads to crash
+    and the entire program to stall. (LP: #1232232)
+  * parsers/udevadm: Added additional heuristics for mediatek bluetooth
+    controllers (LP: #1210405)
+
+  [ Brendan Donegan ] 
+  * scripts/virtualization - change kvm command to qemu-system-x86_64 as the 
+    former is deprecated (LP: #1224854)
+  * scripts/memory_test - use per-process memory limit if arch is ARM, except
+    for arm64 (LP: #1184688)
+  * scripts/virtualization - run qemu-system-arm on ARM platform (LP: #1184765)
 
  -- Brendan Donegan <[e-mail]>  Fri, 20 Sep 2013 16:10:13 +0100
 
@@ -24,8 +91,6 @@
   [ Brendan Donegan ]
   * scripts/fwts_test: Removed dmi_decode and smbios tests that are no longer present
     in fwts and change version dependency to latest version (LP: #1218993)
-  * scripts/virtualization - change kvm command to qemu-system-x86_64 as the 
-    former is deprecated (LP: #1224854)
   * jobs/virtualization.txt.in - remove virtualization-check test and the 
     virt_check script (LP: #1227071)
 

=== modified file 'debian/compat'
--- debian/compat	2013-06-01 14:18:12 +0000
+++ debian/compat	2013-10-18 20:41:35 +0000
@@ -1,1 +1,1 @@
-7
\ No newline at end of file
+9

=== modified file 'debian/control'
--- debian/control	2013-09-13 17:35:00 +0000
+++ debian/control	2013-10-18 20:41:35 +0000
@@ -15,7 +15,6 @@
                python3-distutils-extra,
                python3-gi,
                python3-lxml,
-               python3-mock,
                python3-pkg-resources,
                python3-setuptools,
                qt4-qmake
@@ -47,7 +46,7 @@
             python3-gi
 Suggests: bonnie++,
           bootchart,
-          checkbox-cli | checkbox-gtk,
+          checkbox-cli,
           curl,
           ethtool,
           fwts (>=13.09.00-0ubuntu1),
@@ -66,7 +65,9 @@
           stress,
           sysstat,
           wmctrl,
-          wodim
+          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.
@@ -80,30 +81,6 @@
  .
  This package provides a command line interface for answering tests.
 
-Package: checkbox-urwid
-Architecture: all
-Depends: checkbox (>= ${source:Version}), python3-urwid, ${misc:Depends}
-Description: Urwid interface for checkbox
- This project provides an extensible interface for system testing. The
- results can then be sent to Launchpad.
- .
- This package provides a command line interface (urwid version) for
- answering tests.
-
-Package: checkbox-gtk
-Section: gnome
-Architecture: all
-Depends: checkbox (>= ${source:Version}),
-         gir1.2-gtk-3.0,
-         python3-gi,
-         python3-gi-cairo,
-         ${misc:Depends}
-Description: GTK interface for checkbox
- This project provides an extensible interface for system testing. The
- results can then be sent to Launchpad.
- .
- This package provides a GTK interface for answering tests.
-
 Package: checkbox-qt
 Architecture: any
 Depends: checkbox (>= ${source:Version}),
@@ -125,3 +102,90 @@
  .
  This package provides a tool for collecting hardware information from
  a system and sending it to the HEXR hardware database.
+
+Package: python3-checkbox
+Section: python
+Architecture: all
+Depends: gir1.2-gudev-1.0,
+         python3-lxml,
+         udev,
+         udisks2 | udisks,
+         ${misc:Depends},
+         ${python3:Depends}
+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}
+Recommends: dmidecode, dpkg (>= 1.13), lsb-release, wodim
+Description: CheckBox generic resource jobs provider
+ This package provides the generic resource jobs.
+
+Package: plainbox-provider-resource-desktop
+Architecture: all
+Depends: plainbox-provider-resource-generic
+Recommends: gconf2, x11-xserver-utils, xinput
+Description: CheckBox desktop resource jobs provider
+ This metapackage provides the desktop resource jobs.
+
+Package: plainbox-provider-checkbox
+Architecture: any
+Depends: plainbox-provider-resource-generic,
+         ${misc:Depends},
+         ${python3:Depends},
+         ${shlibs:Depends}
+Recommends: gir1.2-gst-plugins-base-1.0,
+            gir1.2-gstreamer-1.0,
+            gstreamer1.0-plugins-good,
+            gstreamer1.0-pulseaudio,
+            libgstreamer1.0-0,
+            pm-utils,
+            python3-apt,
+            python3-dbus,
+            python3-gi
+Suggests: bonnie++,
+          bootchart,
+          curl,
+          ethtool,
+          fwts (>=13.09.00-0ubuntu1),
+          git-core,
+          glmark2,
+          glmark2-es2,
+          hdparm,
+          lshw,
+          mesa-utils,
+          nmap,
+          obexd-client,
+          obexftp,
+          render-bench,
+          smartmontools,
+          sox,
+          stress,
+          sysstat,
+          wmctrl,
+          python (>= 2.7),
+          ${python:Depends}
+Description: CheckBox jobs
+ This package provides the CheckBox jobs collection.
+
+Package: plainbox-provider-certification-client
+Architecture: all
+Depends: plainbox-provider-checkbox
+Recommends: curl, fswebcam, gtkperf, imagemagick, obexftp
+Description: Client Certification
+ This package provides the Client Certification whitelists.
+
+Package: plainbox-provider-certification-server
+Architecture: all
+Depends: plainbox-provider-checkbox
+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: Server Certification
+ This package provides the Server Certification whitelists.
+
+Package: plainbox-provider-certification-server-soc
+Architecture: all
+Depends: plainbox-provider-checkbox
+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.

=== 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-10-18 20:41:35 +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

=== 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-10-18 20:41:35 +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

=== 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-10-18 20:41:35 +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

=== 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-10-18 20:41:35 +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

=== 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-10-18 20:41:35 +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

=== 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-10-18 20:41:35 +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

=== modified file 'debian/po/ast.po'
--- debian/po/ast.po	2013-06-01 14:18:12 +0000
+++ debian/po/ast.po	2013-10-18 20:41:35 +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-10-18 20:41:35 +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-10-18 20:41:35 +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-10-18 20:41:35 +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-10-18 20:41:35 +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-10-18 20:41:35 +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-10-18 20:41:35 +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-10-18 20:41:35 +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-10-18 20:41:35 +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-10-18 20:41:35 +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-10-18 20:41:35 +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-10-18 20:41:35 +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-10-18 20:41:35 +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-10-18 20:41:35 +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-10-18 20:41:35 +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-10-18 20:41:35 +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-10-18 20:41:35 +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-10-18 20:41:35 +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-10-18 20:41:35 +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-10-18 20:41:35 +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-10-18 20:41:35 +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-10-18 20:41:35 +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-10-18 20:41:35 +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.install'
--- debian/python3-checkbox.install	1970-01-01 00:00:00 +0000
+++ debian/python3-checkbox.install	2013-10-18 20:41:35 +0000
@@ -0,0 +1,1 @@
+usr/lib/python*/*-packages/checkbox/*

=== modified file 'debian/rules'
--- debian/rules	2013-07-04 13:27:31 +0000
+++ debian/rules	2013-10-18 20:41:35 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh "$@" --with python2,python3,translations
+	dh "$@" --with python3,translations
 
 override_dh_auto_build:
 	set -ex; for python in $(shell py3versions -r); do \
@@ -12,8 +12,29 @@
 	set -ex; for python in $(shell py3versions -r); do \
 		( cd checkbox-old && $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; ) \
 	done;
-	mkdir -p $(CURDIR)/debian/tmp/usr/lib/checkbox
-	mv  $(CURDIR)/debian/tmp/usr/share/checkbox/scripts  $(CURDIR)/debian/tmp/usr/lib/checkbox/bin
+	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
+	# 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/
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/plainbox-resources/jobs/
+	cp $(CURDIR)/debian/tmp/usr/share/checkbox/scripts/*_resource $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/plainbox-resources/bin/
+	cp $(CURDIR)/debian/tmp/usr/share/checkbox/jobs/resource.txt* $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/plainbox-resources/jobs/
+	# Job provider files
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/checkbox
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/checkbox/bin/
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/checkbox/jobs/
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/checkbox/data/
+	find $(CURDIR)/debian/tmp/usr/share/checkbox/scripts -type f -not -iname  "*_resource" -execdir cp {} $(CURDIR)/debian/tmp/usr/lib/plainbox-providers-1/checkbox/bin/ \;
+	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)))
@@ -21,12 +42,10 @@
 	# 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	
+endif
 
 override_dh_installdeb:
 	cp debian/checkbox.postrm debian/checkbox-cli.postrm
-	cp debian/checkbox.postrm debian/checkbox-urwid.postrm
-	cp debian/checkbox.postrm debian/checkbox-gtk.postrm
 	cp debian/checkbox.postrm debian/checkbox-qt.postrm
 	cp debian/checkbox.postrm debian/checkbox-hw-collection.postrm
 	dh_installdeb
@@ -34,14 +53,12 @@
 override_dh_installdocs:
 	dh_installdocs -pcheckbox checkbox-old/README 
 	dh_installdocs -pcheckbox-cli checkbox-old/README 
-	dh_installdocs -pcheckbox-urwid checkbox-old/README 
-	dh_installdocs -pcheckbox-gtk 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-urwid.postrm debian/checkbox-gtk.postrm debian/checkbox-qt.postrm debian/checkbox-hw-collection.postrm
+	-rm -f debian/checkbox-cli.postrm debian/checkbox-qt.postrm debian/checkbox-hw-collection.postrm
 	debconf-updatepo
 	dh_clean