Merge ~pieq/plainbox-provider-certification-client/+git/packaging:master into plainbox-provider-certification-client:master

[Pierre Equoy]

Remove unnecessary dependencies.

In order to test, the best way is to create a package locally (or, as I did, using a personal PPA such as [1] and building on Launchpad using a recipe such as [2]), then install this package somewhere and make sure the usual test plans (certification client, OEM test plans, etc.) can run without regressions or problems.

[1] https://launchpad.net/~pierre-equoy/+archive/ubuntu/ppa
[2] https://code.launchpad.net/~pierre-equoy/+recipe/plainbox-provider-certification-client

Unmerged commits

29fc6bd... by Pierre Equoy on 2016-08-09

Remove useless dependencies in Debian control file

737f731... by Pierre Equoy on 2016-06-02

change version to 0.27-1
new upstream version

64bedb8... by Pierre Equoy on 2016-06-02

record new upstream branch created by importing plainbox-provider-certification-client_0.27.orig.tar.gz and merge it

2af4cf7... by Pierre Equoy on 2016-06-02

Import plainbox-provider-certification-client_0.27.orig.tar.gz

aa8c09f... by Sylvain Pineau on 2016-05-31

Remove old client manpages

2bbb31d... by Sylvain Pineau on 2016-05-31

Remove the checkbox-gui launcher

The -client launcher is using checkbox-converged now

53a310c... by Sylvain Pineau on 2016-05-10

debian:control: Add plainbox-provider-tpm2 dependency

750c499... by Pierre Equoy on 2016-04-12

change version to 0.26-2
new upstream version

2f5ee37... by Pierre Equoy on 2016-04-12

Import plainbox-provider-certification-client_0.26.orig.tar.gz

bf21868... by Pierre Equoy on 2016-04-12

record new upstream branch created by importing plainbox-provider-certification-client_0.26.orig.tar.gz and merge it

diff --git a/debian/.git-dpm b/debian/.git-dpm
new file mode 100644
index 0000000..e4a387b
--- /dev/null
+++ b/debian/.git-dpm
@@ -0,0 +1,8 @@
+# see git-dpm(1) from git-dpm package
+2af4cf7fb8b0b5f3ebed4ab95123f7a14a6f49a8
+2af4cf7fb8b0b5f3ebed4ab95123f7a14a6f49a8
+2af4cf7fb8b0b5f3ebed4ab95123f7a14a6f49a8
+2af4cf7fb8b0b5f3ebed4ab95123f7a14a6f49a8
+plainbox-provider-certification-client_0.27.orig.tar.gz
+cdfa466eacce7bd1b0bbbf41422bfc07e61a73b3
+35242
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..0a48be9
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,17 @@
+To build this package against the testing PPA
+
+sbuild -d precise \
+    --chroot-setup-commands="apt-key adv --keyserver keyserver.ubuntu.com --recv-key 1B4B6B2D2BBDF2BD" \
+    --extra-repository="deb http://archive.ubuntu.com/ubuntu precise universe"  \
+    --extra-repository="deb http://ppa.launchpad.net/checkbox-dev/testing/ubuntu precise main"
+
+To build this package against the daily PPA
+
+sbuild -d precise \
+    --chroot-setup-commands="apt-key adv --keyserver keyserver.ubuntu.com --recv-key 1B4B6B2D2BBDF2BD" \
+    --extra-repository="deb http://archive.ubuntu.com/ubuntu precise universe"  \
+    --extra-repository="deb http://ppa.launchpad.net/checkbox-dev/ppa/ubuntu precise main"
+
+The precise universe component is optional. It is needed if you created a
+vanilla precise schroot. If you already modified it have universe enabled then
+nothing more is required.
diff --git a/debian/canonical-certification-cli.rst b/debian/canonical-certification-cli.rst
new file mode 100644
index 0000000..8607087
--- /dev/null
+++ b/debian/canonical-certification-cli.rst
@@ -0,0 +1,37 @@
+=============================
+ canonical-certification-cli
+=============================
+
+--------------------------------------------------------------------------------------------------------
+performs interactive system testing in console mode and sends results to Canonical Certification Website
+--------------------------------------------------------------------------------------------------------
+
+:Manual section: 1
+:Author: Zygmunt Krynicki, 2015
+
+SYNOPSIS
+========
+  canonical-certification-cli
+
+OPTIONS
+=======
+
+This program doesn't support any command line options.
+
+DESCRIPTION
+===========
+
+This program is meant for use with systems participating in the Canonical
+hardware certification process. To use this tool the device under test must
+have a valid *Secure-ID* number.  To learn how to create or locate the Secure
+ID, please see here: https://certification.canonical.com/
+
+This program 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.
+
+TEST PLAN SELECTION
+===================
+
+This program will allow you to select test any test plan.
diff --git a/debian/canonical-certification-client.install b/debian/canonical-certification-client.install
new file mode 100644
index 0000000..f99e796
--- /dev/null
+++ b/debian/canonical-certification-client.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/bin/canonical-certification-cli /usr/bin
+debian/tmp/usr/bin/canonical-certification-client /usr/bin
+debian/tmp/usr/share/applications/canonical-certification-client.desktop /usr/share/applications/
diff --git a/debian/canonical-certification-client.lintian-overrides b/debian/canonical-certification-client.lintian-overrides
new file mode 100644
index 0000000..824fa4a
--- /dev/null
+++ b/debian/canonical-certification-client.lintian-overrides
@@ -0,0 +1,6 @@
+# This is not a package for Debian.
+canonical-certification-client: new-package-should-close-itp-bug
+# Those are the desired (custom) interpreters
+canonical-certification-client: unusual-interpreter usr/bin/canonical-certification-cli #!checkbox-launcher
+canonical-certification-client: unusual-interpreter usr/bin/canonical-certification-client #!/usr/bin/checkbox-gui
+canonical-certification-client: unusual-interpreter usr/bin/canonical-certification-gui #!/usr/bin/checkbox-gui
diff --git a/debian/canonical-certification-client.manpages b/debian/canonical-certification-client.manpages
new file mode 100644
index 0000000..f5b3f8e
--- /dev/null
+++ b/debian/canonical-certification-client.manpages
@@ -0,0 +1,2 @@
+debian/canonical-certification-cli.1
+debian/canonical-certification-client.1
diff --git a/debian/canonical-certification-client.rst b/debian/canonical-certification-client.rst
new file mode 100644
index 0000000..13e9a5f
--- /dev/null
+++ b/debian/canonical-certification-client.rst
@@ -0,0 +1,37 @@
+================================
+ canonical-certification-client
+================================
+
+----------------------------------------------------------------------------------------------------------
+performs interactive system testing in graphical mode and sends results to Canonical Certification Website
+----------------------------------------------------------------------------------------------------------
+
+:Manual section: 1
+:Author: Zygmunt Krynicki, 2015
+
+SYNOPSIS
+========
+  canonical-certification-client
+
+OPTIONS
+=======
+
+This program doesn't support any command line options.
+
+DESCRIPTION
+===========
+
+This program is meant for use with systems participating in the Canonical
+hardware certification process. To use this tool the device under test must
+have a valid *Secure-ID* number.  To learn how to create or locate the Secure
+ID, please see here: https://certification.canonical.com/
+
+This program 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.
+
+TEST PLAN SELECTION
+===================
+
+This program will allow you to select test any test plan.
diff --git a/debian/canonical-certification-submit.install b/debian/canonical-certification-submit.install
new file mode 100644
index 0000000..c09b86c
--- /dev/null
+++ b/debian/canonical-certification-submit.install
@@ -0,0 +1 @@
+debian/extras/canonical-certification-submit/canonical-certification-submit /usr/bin
diff --git a/debian/canonical-certification-submit.lintian-overrides b/debian/canonical-certification-submit.lintian-overrides
new file mode 100644
index 0000000..8ee8201
--- /dev/null
+++ b/debian/canonical-certification-submit.lintian-overrides
@@ -0,0 +1,2 @@
+# This is not a package for Debian.
+canonical-certification-submit: new-package-should-close-itp-bug
diff --git a/debian/canonical-certification-submit.manpages b/debian/canonical-certification-submit.manpages
new file mode 100644
index 0000000..c30d8a7
--- /dev/null
+++ b/debian/canonical-certification-submit.manpages
@@ -0,0 +1 @@
+debian/canonical-certification-submit.1
diff --git a/debian/canonical-certification-submit.rst b/debian/canonical-certification-submit.rst
new file mode 100644
index 0000000..096dbd0
--- /dev/null
+++ b/debian/canonical-certification-submit.rst
@@ -0,0 +1,26 @@
+================================
+ canonical-certification-submit
+================================
+
+----------------------------------------------------------------
+sends a single submission to the Canonical Certification Website
+----------------------------------------------------------------
+
+:Manual section: 1
+:Author: Zygmunt Krynicki, 2015
+
+SYNOPSIS
+========
+  canonical-certification-submit <SUBMISSION>
+
+OPTIONS
+=======
+
+--secure_id SECURE-ID	associate submission with a machine using this SECURE-ID
+
+DESCRIPTION
+===========
+
+This program is a small convenience wrapper around the ``checkbox sumbit``
+command.  It can be use to send a given submission file, typically an XML file
+called ``submission.xml``, to the Canonical Certification Website.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..b57fdec
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,82 @@
+plainbox-provider-certification-client (0.27-1) precise; urgency=medium
+
+  * new upstream version
+
+ -- Pierre Equoy <[e-mail]>  Thu, 02 Jun 2016 17:13:29 +0800
+
+plainbox-provider-certification-client (0.26-2) precise; urgency=medium
+
+  * new upstream version
+
+ -- Pierre Equoy <[e-mail]>  Tue, 12 Apr 2016 10:29:36 +0800
+
+plainbox-provider-certification-client (0.26-1) precise; urgency=medium
+
+  * new upstream version
+
+ -- Pierre Equoy <[e-mail]>  Wed, 06 Apr 2016 15:07:03 +0800
+
+plainbox-provider-certification-client (0.26-1) UNRELEASED; urgency=medium
+
+  * Update dependencies minimum version to avoid issues in Xenial (Fix lp:1563763)
+
+ -- Pierre Equoy <[e-mail]>  Thu, 31 Mar 2016 17:03:50 +0800
+
+plainbox-provider-certification-client (0.23-1) precise; urgency=medium
+
+  * new upstream version
+
+ -- Sylvain Pineau <[e-mail]>  Thu, 17 Mar 2016 23:36:18 +0100
+
+plainbox-provider-certification-client (0.22-2) precise; urgency=medium
+
+  * Remove the module-init-tools dependency (the checkbox provider already
+    depends on kmod)
+  * Remove the checkbox-ng-service dependency (obsolete)
+
+ -- Sylvain Pineau <[e-mail]>  Thu, 10 Mar 2016 12:44:23 +0100
+
+plainbox-provider-certification-client (0.22-1) precise; urgency=medium
+
+  * new upstream version
+
+ -- Sylvain Pineau <[e-mail]>  Tue, 08 Mar 2016 12:59:45 +0100
+
+plainbox-provider-certification-client (0.21-1) precise; urgency=medium
+
+  * new upstream version
+
+ -- Pierre Equoy <[e-mail]>  Wed, 02 Dec 2015 10:40:23 +0800
+
+plainbox-provider-certification-client (0.20.1-2) precise; urgency=medium
+
+  * new upstream version
+
+ -- Sylvain Pineau <[e-mail]>  Tue, 17 Nov 2015 14:30:52 +0100
+
+plainbox-provider-certification-client (0.20-3) precise; urgency=medium
+
+  * new upstream version
+  * Fix broken client-selftest.pxu
+
+ -- Sylvain Pineau <[e-mail]>  Tue, 03 Nov 2015 03:05:52 +0100
+
+plainbox-provider-certification-client (0.20-1) precise; urgency=medium
+
+  [ Po-Hsu Lin ]
+  * debian/control: added iw into the recommended list of certification-client (LP:1399555)
+  * new upstream version
+
+ -- Sylvain Pineau <[e-mail]>  Tue, 03 Nov 2015 02:21:14 +0100
+
+plainbox-provider-certification-client (0.19-1) precise; urgency=medium
+
+  * new upstream version
+
+ -- Sylvain Pineau <[e-mail]>  Mon, 14 Sep 2015 14:40:12 +0200
+
+plainbox-provider-certification-client (0.18-1) precise; urgency=medium
+
+  * Initial release from upstream tarball
+
+ -- Zygmunt Krynicki <[e-mail]>  Mon, 13 Jul 2015 14:33:01 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..1d51005
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,79 @@
+Source: plainbox-provider-certification-client
+Section: utils
+Priority: optional
+Maintainer: Checkbox Developers <[e-mail]>
+Uploaders: Zygmunt Krynicki <[e-mail]>
+Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9.2),
+               intltool,
+               plainbox (>= 0.27~),
+               plainbox-provider-resource-generic (>= 0.25~),
+               python,
+               python-distutils-extra,
+               python-docutils,
+               python-setuptools,
+               python3-all (>= 3.2),
+               python3-distutils-extra,
+               python3-pkg-resources,
+               python3-setuptools
+
+Package: plainbox-provider-certification-client
+Architecture: all
+Depends: plainbox-provider-checkbox (>= 0.27~),
+         plainbox-provider-resource-generic (>= 0.25~),
+         plainbox-provider-tpm2,
+         python3-plainbox (>= 0.27~),
+         ${misc:Depends}
+Recommends: ethtool,
+            fswebcam,
+            fwts (>= 16.02.00-0ubuntu1~),
+            glmark2,
+            gtkperf,
+            hdapsd,
+            hdparm,
+            imagemagick,
+            iw,
+            mesa-utils,
+            obexftp,
+            qmlscene,
+            render-bench,
+            shutter,
+            stress,
+            wmctrl
+Description: Client Certification provider for Plainbox
+ This package provides a test set of test plans that are used by Canonical
+ for the testing and certification of "client" devices. Client devices include
+ laptops, desktops and all-in-one machines.
+ .
+ The actual tests (also known as plainbox jobs) are sourced from checkbox and
+ plainbox resource providers. This package only contains the test plans
+ themselves.
+
+Package: canonical-certification-client
+Architecture: all
+Depends: checkbox-converged (>= 1.2),
+         checkbox-ng (>= 0.25~),
+         plainbox-provider-certification-client (= ${source:Version}),
+         ${misc:Depends}
+Description: Client Certification Launcher
+ This package provides the Client Certification Launcher. The launcher is an
+ executable application that can be started by a test operator to perform the
+ testing process associated with certification of client devices at Canonical.
+
+Package: canonical-certification-submit
+Architecture: all
+Depends: checkbox-ng (>= 0.25~), ${misc:Depends}
+Description: Tool for sending test results to Canonical Certification Website
+ This package provides a simple command line tool for sending a "submission"
+ file to the Canonical Certification Website. It is useful for sending test
+ results that were collected in an off-line environment.
+
+Package: plainbox-glmark2-es2-meta
+Architecture: any
+Depends: glmark2-es2 [arm64 armhf], ${misc:Depends}
+Description: Meta-package to selectively install glmark2-es2
+ The objective of this metapackage is not introducing architecture specificity
+ in plainbox-provider-certification-client. This metapackage will cause
+ installation of glmark2-es2 on arm architectures, while just being a dummy
+ package on others. Arch-independent packages can depend on this one to (maybe)
+ install glmark2-es2.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..34f6d7b
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,23 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: plainbox-provider-certification-client
+Source: https://launchpad.net/checkbox
+
+Files: *
+Copyright: Copyright 2007-2015 Canonical Ltd.
+License: GPL-3
+
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 3,
+ as published by the Free Software Foundation.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian-based systems the full text of the GPL, version 3, can be found at
+ /usr/share/common-licenses/GPL-3.
diff --git a/debian/extras/canonical-certification-config/canonical-certification.conf b/debian/extras/canonical-certification-config/canonical-certification.conf
new file mode 100644
index 0000000..53b6e51
--- /dev/null
+++ b/debian/extras/canonical-certification-config/canonical-certification.conf
@@ -0,0 +1,37 @@
+[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.
+
+ Please be sure you have edited /etc/xdg/canonical-certification.conf as necessary to set your Secure ID, and network and virtualization test parameters.
+
+ To learn how to create or locate the Secure ID, please see here:
+
+ https://certification.canonical.com/home/ubuntu-certified
+
+# If you have a secure_id, uncomment the next two lines and set your
+# 15- or 18-character secure_id here for automatic submission. If
+# unsure, it's safe to leave this commented out.
+#[sru]
+#secure_id =
+
+[environment]
+# For virtualization testing:
+#
+# KVM_TIMEOUT sets the timeout to wait for the cloudimg to boot before exiting
+# test. It is an integer in seconds (the default is 3000 seconds)
+# KVM_IMAGE is the path to the local copy of the cloud image to use for
+# testing.  This is necessary if you are in a disconnected environment and have
+# a copy of the cloudimg file on your SUT's local filesystem.  This should be a
+# full path.
+#
+# UNCOMMENT THE FOLLOWING 2 LINES and set the proper parameters as necessary:
+#KVM_TIMEOUT = 300
+#KVM_IMAGE = /path/to/cloudimage-filename.img
+
+# For network testing:
+#
+# TEST_TARGET_IPERF is the IP/Hostname of the iperf server for network testing.
+#
+# UNCOMMENT THE FOLLOWING LINE and set the proper parameters as necessary:
+#TEST_TARGET_IPERF =  your-iperf-server.example.com
diff --git a/debian/extras/canonical-certification-submit/canonical-certification-submit b/debian/extras/canonical-certification-submit/canonical-certification-submit
new file mode 100755
index 0000000..02ed2e7
--- /dev/null
+++ b/debian/extras/canonical-certification-submit/canonical-certification-submit
@@ -0,0 +1,23 @@
+#!/bin/sh
+# This file is part of Checkbox.
+#
+# Copyright 2014 Canonical Ltd.
+# Written by:
+#   Zygmunt Krynicki <[e-mail]>
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3,
+# as published by the Free Software Foundation.
+#
+# Checkbox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+# This script simply invokes checkbox submit with a hardcoded URL of the
+# Canonical certifiation website.
+exec checkbox submit \
+    --url=https://certification.canonical.com/submissions/submit/ \
+    "$@"
\ No newline at end of file
diff --git a/debian/plainbox-glmark2-es2-meta.lintian-overrides b/debian/plainbox-glmark2-es2-meta.lintian-overrides
new file mode 100644
index 0000000..28e08d6
--- /dev/null
+++ b/debian/plainbox-glmark2-es2-meta.lintian-overrides
@@ -0,0 +1,2 @@
+# This is not a package for Debian.
+plainbox-glmark2-es2-meta: new-package-should-close-itp-bug
diff --git a/debian/plainbox-provider-certification-client.install b/debian/plainbox-provider-certification-client.install
new file mode 100644
index 0000000..ec0cfa5
--- /dev/null
+++ b/debian/plainbox-provider-certification-client.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/plainbox-provider-certification-client/*
+debian/tmp/usr/share/plainbox-providers-1/*.provider
diff --git a/debian/plainbox-provider-certification-client.lintian-overrides b/debian/plainbox-provider-certification-client.lintian-overrides
new file mode 100644
index 0000000..66a7706
--- /dev/null
+++ b/debian/plainbox-provider-certification-client.lintian-overrides
@@ -0,0 +1,2 @@
+# This is not a package for Debian.
+plainbox-provider-certification-client: new-package-should-close-itp-bug
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..b1d3d8c
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,39 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@
+
+override_dh_auto_clean:
+	python3 manage.py clean
+	rm -f debian/*.1
+
+override_dh_auto_build:
+	mkdir -p debian/tmp
+	python3 manage.py build
+	python3 manage.py i18n --dont-update-pot --dont-merge-po
+	rst2man debian/canonical-certification-cli.rst debian/canonical-certification-cli.1
+	rst2man debian/canonical-certification-client.rst debian/canonical-certification-client.1
+	rst2man debian/canonical-certification-submit.rst debian/canonical-certification-submit.1
+
+override_dh_auto_test:
+	python3 manage.py validate
+
+pkg_name=plainbox-provider-certification-client
+verbose_id=certification-client
+terse_id=$(pkg_name)
+
+override_dh_auto_install:
+	python3 manage.py install \
+		--prefix=/usr --layout=unix \
+		--root=$(CURDIR)/debian/tmp/
+	# Rename provider directory to avoid having colon in the PATH
+	mv debian/tmp/usr/share/$(verbose_id) debian/tmp/usr/share/$(terse_id)
+	# Rename the .provider file, mind the mangling of : done by manage.py install!
+	mv debian/tmp/usr/share/plainbox-providers-1/$(subst :,.,$(verbose_id)).provider \
+		debian/tmp/usr/share/plainbox-providers-1/$(terse_id).provider
+	# Reflect changes in the .provider meta-data
+	sed -i -e 's!$(verbose_id)!$(terse_id)!g' \
+		debian/tmp/usr/share/plainbox-providers-1/$(terse_id).provider
+	# But don't modify the name, it has to be exactly as before
+	sed -i -e 's!name = $(terse_id)!name = $(verbose_id)!g' \
+		debian/tmp/usr/share/plainbox-providers-1/$(terse_id).provider
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..50dc44b
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,72 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+xxGS57/Nmfbij8UuxgkLtw==
+=4Jty
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQENBEvipr4BCADJdK7pAu7fEFyNCLdMULze97sVWWJ1bWkA/lMot14911EbyFr7
+pvi5uril4QT55d1AKfMXJ6HNtHtIHe/CF1ehEc5c7oA2c0IdeSR4F6JEbFSneORT
+OZtYAK3VdG53ywpyCqP2tzB/YrRhVO9qsc5fYEr0EpeqRkvB5ower2MUFvvM5PBZ
+a+0owzW9OnlSOqbrVPj9Wp1bn857j/WpJCrMbcJlPPWGyo4ambAQI4Rky+apeQM0
+L4QTjPMXIoHDQao/2XsSL75OBx5Bi81j1KoU56PvM9b4oWMOqDDolPHwZGJtCewl
+LJqfy1Oa68vN4MxDXFmGp7bFTCt8ZOup1AjlABEBAAG0LVN5bHZhaW4gUGluZWF1
+IDxzeWx2YWluLnBpbmVhdUBjYW5vbmljYWwuY29tPokBOAQTAQIAIgUCS+KmvgIb
+AwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQdNV1zH7XLNGSgAgApgU9VUlp
+Rblw7WH7q8BueI4G5CRiIDt6PA866IhbtuKPHMhv8LUQCVavAtKWVlwx/wGS/+2y
+CKqTCRXFu52MomE+kSfEFnELMW8vwz3KG6NgUVIv8dFesf1Finc8Y9YQkUX/xWYV
+MYREz3rgDgGMgpWlMVq5/olqYMg1jc4yIKrbQGoFDvlgijzGwibh/V5NVPcuYrMK
+DvhnWGIEX4whP/hW/o7vPKC5qYznrGqRroLqsq1viGgeS7nK37vcgX+vYv5pzIDM
+73CqpAnISAyBpU5n/YHG4AmundrVHwdscY7u8l9Fn5XFEGhu6FxWQL2mAY/gvGPS
+fgxeZUWpB21WNrkBDQRL4qa+AQgAtAiq2zDF0hl2KnB/a16O5SyjDR5XJUcWJ9F/
+tFw0i3EXEYeYdCFHaTdFfDmdX+SyBPh4lJIJZCpFZZ7Akeb3qLDS/4oAAo4EcoeS
+pp47Mr1/eCahI9Pkwg073jqHSUAKQp6oPP/bvBzAqhl4ZkUyZQpjdy0/d5FO4OEa
+R91SCxNqBQOA+Z2rKL6gBwJYpMGMKC1bhfOCvD8eH7dN3PDMNnHoYSjJSy5di/Zu
+snrVR4MO63FpmSZ4r5eGjIaiBFxYXsitn2ilPOt2e0/Vo8QOJsOl+6bOkdn5jiNL
+n1fCvzadUXuEDTjj9+6UkCCLYRODeTrMM9XpNeAZZBSGVzuCgQARAQABiQEfBBgB
+AgAJBQJL4qa+AhsMAAoJEHTVdcx+1yzRcpEH/iZMQPFnnCj3LthOvCAVM/raO17h
+KshdrOMS53uI5NzeBnr+/0zGMehnYcpzLmrvHXM86lsUVSzfr/px/Ve3+8SR6qxy
+p5+PFsxbqh+DSkxnTfbIqHVBY4f7/nOQavI1rhj4JQzKiYLCvIhDMVQm/2ZKnsNB
+043MaDPi0SBLJmqZqFyH3CUE3B8JNi4i+nv7Vj37V4sL1yHwN+rmyDhZUUelO5Iw
+vrysE7eNqmhTtuV+tl5Oq2EEzYau+7u+/Kuo1JpFsamJ8xVIR2j9i/3m3LqOaVPo
+ExFTDCQAPTaRyLAvTFylsIUffsdIAsM8wJQnuO5EzlxbkId3aVOrJ/cb5to=
+=cQg/
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..eee87ac
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+version=3
+opts=pgpsigurlmangle=s/$/.asc/ \
+    http://launchpad.net/plainbox-provider-canonical-certification/+download/ \
+    https://launchpad\.net/plainbox-provider-canonical-certification/.*/.*/\+download/2013\.com\.canonical\.certification\.certification-client-(0.*).tar.gz
diff --git a/units/client-cert-16-04.pxu b/units/client-cert-16-04.pxu
index 7bfa8d6..eb32a80 100644
--- a/units/client-cert-16-04.pxu
+++ b/units/client-cert-16-04.pxu
@@ -44,6 +44,10 @@ include:
     # See Monitor / Graphic test section for hybrid-graphic monitor audio tests
     bluetooth/detect-output                                certification-status=blocker
     bluetooth/audio-a2dp                                   certification-status=blocker
+<<<<<<< units/client-cert-16-04.pxu
+=======
+    bluetooth/audio                                        certification-status=blocker
+>>>>>>> units/client-cert-16-04.pxu
     bluetooth/browse-files                                 certification-status=blocker
     bluetooth/file-transfer                                certification-status=blocker
     bluetooth/HID
@@ -101,7 +105,11 @@ include:
     graphics/1_video_.*                                    certification-status=blocker
     graphics/1_minimum_resolution_.*
     graphics/1_cycle_resolution_.*                         certification-status=non-blocker
+<<<<<<< units/client-cert-16-04.pxu
     graphics/2_switch_card_.*_xenial                       certification-status=blocker
+=======
+    graphics/2_switch_card_.*                              certification-status=blocker
+>>>>>>> units/client-cert-16-04.pxu
     graphics/2_maximum_resolution_.*                       certification-status=blocker
     graphics/2_glxgears_.*                                 certification-status=blocker
     graphics/2_driver_version_.*                           certification-status=blocker
@@ -240,6 +248,7 @@ include:
     suspend/bluetooth_obex_get_before_suspend              certification-status=blocker
     # Test card 2 first, if present, since it's the one we will be using
     # after coming back from suspend if the system has hybrid graphics.
+<<<<<<< units/client-cert-16-04.pxu
     suspend/2_resolution_before_suspend_.*_xenial          certification-status=blocker
     suspend/2_suspend_after_switch_to_card_.*_xenial       certification-status=blocker
     suspend/2_suspend-time-check_.*_xenial                 certification-status=non-blocker
@@ -252,10 +261,25 @@ include:
     suspend/2_video_after_suspend_.*_xenial                certification-status=blocker
     suspend/2_cycle_resolutions_after_suspend_.*_xenial    certification-status=non-blocker
     suspend/2_xrandr_screens_after_suspend_.*.tar.gz_xenial
+=======
+    suspend/2_resolution_before_suspend_.*                 certification-status=blocker
+    suspend/2_suspend_after_switch_to_card_.*              certification-status=blocker
+    suspend/2_suspend-time-check_.*                        certification-status=non-blocker
+    suspend/2_suspend-single-log-attach_.*
+    suspend/2_compiz_check_after_suspend_.*                certification-status=blocker
+    suspend/2_driver_version_after_suspend_.*              certification-status=blocker
+    suspend/2_resolution_after_suspend_.*                  certification-status=blocker
+    suspend/2_display_after_suspend_.*                     certification-status=blocker
+    suspend/2_glxgears_after_suspend_.*                    certification-status=blocker
+    suspend/2_video_after_suspend_.*                       certification-status=blocker
+    suspend/2_cycle_resolutions_after_suspend_.*           certification-status=non-blocker
+    suspend/2_xrandr_screens_after_suspend_.*.tar.gz
+>>>>>>> units/client-cert-16-04.pxu
     power-management/2_hibernate_advanced_.*               certification-status=non-blocker
     power-management/2_hibernate-single-log-attach_.*
     # Now we ask to switch to the first graphics card. This requires a restart
     # of checkbox.
+<<<<<<< units/client-cert-16-04.pxu
     graphics/1_switch_card_.*_xenial                       certification-status=blocker
     suspend/1_resolution_before_suspend_.*_xenial          certification-status=blocker
     suspend/suspend_advanced                               certification-status=blocker
@@ -272,6 +296,24 @@ include:
     suspend/1_video_after_suspend_.*_xenial                certification-status=blocker
     suspend/1_cycle_resolutions_after_suspend_.*_xenial    certification-status=non-blocker
     suspend/1_xrandr_screens_after_suspend.tar.gz_xenial
+=======
+    graphics/1_switch_card_.*                              certification-status=blocker
+    suspend/resolution_before_suspend                      certification-status=blocker
+    suspend/suspend_advanced                               certification-status=blocker
+    suspend/suspend-time-check                             certification-status=non-blocker
+    suspend/suspend-single-log-attach
+    power-management/lid                                   certification-status=blocker
+    power-management/lid_close                             certification-status=blocker
+    power-management/lid_open                              certification-status=blocker
+    suspend/compiz_check_after_suspend                     certification-status=blocker
+    suspend/driver_version_after_suspend                   certification-status=blocker
+    suspend/resolution_after_suspend                       certification-status=blocker
+    suspend/display_after_suspend                          certification-status=blocker
+    suspend/glxgears_after_suspend                         certification-status=blocker
+    suspend/video_after_suspend                            certification-status=blocker
+    suspend/cycle_resolutions_after_suspend                certification-status=non-blocker
+    suspend/xrandr_screens_after_suspend.tar.gz
+>>>>>>> units/client-cert-16-04.pxu
     keys/sleep                                             certification-status=blocker
     led/power-blink-suspend                                certification-status=blocker
     led/suspend                                            certification-status=blocker