Merge ~pwlars/checkbox-provider-phoronix/+git/packaging:vulkan-utils-tools-transition into checkbox-provider-phoronix:master

[Paul Larson]

Not sure if this is the right way to proceed - it looks like in focal, vulkan-utils is a transitional package, which installs vulkan-tools. After that, it's just vulkan-tools (at least in hirsute) and vulkan-utils is no longer available.

So if we ever need to rebuild on anything before focal, this might break things. In which case I guess we'll need to maintain series-specific branches of this.

Unmerged commits

ddc9565... by Paul Larson on 2021-04-14

Use vulkan-tools as the dep instead of vulkan-utils for future builds

3d8ef83... by PMR <pmr@pmr-lander> on 2020-06-09

change version to 0.7.0-1
"new upstream version"

00b66ea... by PMR <pmr@pmr-lander> on 2020-06-09

record new upstream branch created by importing checkbox-provider-phoronix_0.7.0.orig.tar.gz and merge it

87c6e54... by PMR <pmr@pmr-lander> on 2020-06-09

Import checkbox-provider-phoronix_0.7.0.orig.tar.gz

1be12c2... by PMR <pmr@pmr-lander> on 2020-06-05

change version to 0.7.0~rc2-1
"new upstream version"

7a0d610... by PMR <pmr@pmr-lander> on 2020-06-05

record new upstream branch created by importing checkbox-provider-phoronix_0.7.0~rc2.orig.tar.gz and merge it

b0c31f2... by PMR <pmr@pmr-lander> on 2020-06-05

Import checkbox-provider-phoronix_0.7.0~rc2.orig.tar.gz

91744fc... by PMR <pmr@pmr-lander> on 2020-05-28

change version to 0.7.0~rc1-1
"new upstream version"

8c66248... by PMR <pmr@pmr-lander> on 2020-05-28

Import checkbox-provider-phoronix_0.7.0~rc1.orig.tar.gz

91be9c4... by PMR <pmr@pmr-lander> on 2020-05-28

record new upstream branch created by importing checkbox-provider-phoronix_0.7.0~rc1.orig.tar.gz and merge it

diff --git a/debian/.git-dpm b/debian/.git-dpm
new file mode 100644
index 0000000..62bf048
--- /dev/null
+++ b/debian/.git-dpm
@@ -0,0 +1,8 @@
+# see git-dpm(1) from git-dpm package
+87c6e54078df963b05905f10a5fd3e67457aad5c
+87c6e54078df963b05905f10a5fd3e67457aad5c
+87c6e54078df963b05905f10a5fd3e67457aad5c
+87c6e54078df963b05905f10a5fd3e67457aad5c
+checkbox-provider-phoronix_0.7.0.orig.tar.gz
+56b7cc308bf31044bb8cfbde8849d59617ace41b
+932131
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..ea6a8fb
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,45 @@
+checkbox-provider-phoronix (0.7.0-1) UNRELEASED; urgency=medium
+
+  [ Sylvain Pineau ]
+  * "new upstream version"
+
+  [ Jenkins ]
+  * "new upstream version"
+  * "new upstream version"
+  * "new upstream version"
+  * "new upstream version"
+  * "new upstream version"
+  * "new upstream version"
+  * "new upstream version"
+  * "new upstream version"
+  * "new upstream version"
+  * "new upstream version"
+  * "new upstream version"
+  * "new upstream version"
+  * "new upstream version"
+
+ -- Jenkins <[e-mail]>  Tue, 09 Jun 2020 13:52:37 +0000
+
+checkbox-provider-phoronix (0.1.3) bionic; urgency=medium
+
+  * removed opencl tests
+
+ -- kissiel <kissiel@jupo>  Sat, 24 Aug 2019 18:50:41 +0200
+
+checkbox-provider-phoronix (0.1.2) bionic; urgency=medium
+
+  * Added missing dependencies (based on SRU provider)
+
+ -- root <[e-mail]>  Tue, 20 Aug 2019 16:58:04 +0000
+
+checkbox-provider-phoronix (0.1.1) bionic; urgency=medium
+
+  * Added missing python3-checkbox-ng dependency
+
+ -- root <[e-mail]>  Tue, 20 Aug 2019 15:59:00 +0000
+
+checkbox-provider-phoronix (0.1) bionic; urgency=medium
+
+  * Initial release. (Closes: #XXXXXX)
+
+ -- Maciej Kisielewski <[e-mail]>  Mon, 19 Aug 2019 10:44:05 +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..eec0959
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,43 @@
+Source: checkbox-provider-phoronix
+Section: utils
+Priority: optional
+Maintainer: Checkbox Developers <[e-mail]>
+Uploaders: Maciej Kisielewski <[e-mail]>
+Build-Depends: autoconf,
+               automake,
+               debhelper (>= 9),
+               intltool,
+               libnl-3-dev,
+               libnl-genl-3-dev,
+               pkg-config,
+               plainbox-provider-checkbox (>= 0.31),
+               python3,
+               python3-checkbox-ng,
+               python3-debian
+Standards-Version: 3.9.6
+Homepage: https://launchpad.net/checkbox-provider-phoronix
+
+Package: checkbox-provider-phoronix
+Architecture: amd64
+Depends: apt-file,
+         autoconf,
+         build-essential,
+         cmake,
+         cmake-data,
+         curl,
+         git-core,
+         libcurl4-openssl-dev,
+         libgmp3-dev,
+         libssl-dev,
+         libvulkan-dev,
+         mesa-utils,
+         ocl-icd-libopencl1,
+         opencl-headers,
+         python3,
+         unzip,
+         vulkan-tools,
+         xorg-dev
+         ${misc:Depends},
+         ${plainbox:Depends}
+X-Plainbox-Provider: yes
+Description: Checkbox provider with tests from Phoronix Test Suite
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..0824bcf
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,20 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: checkbox-provider-phoronix
+Source: https://launchpad.net/checkbox-provider-phoronix
+
+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/rules b/debian/rules
new file mode 100755
index 0000000..cfe4208
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,23 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@
+
+override_dh_auto_clean:
+	python3 manage.py clean
+
+override_dh_auto_build:
+	python3 manage.py build
+	python3 manage.py i18n --dont-update-pot --dont-merge-po
+
+override_dh_auto_test:
+	python3 manage.py validate --loose --legacy
+
+override_dh_auto_install:
+	python3 manage.py install \
+		--prefix=/usr --layout=unix \
+		--root=$(CURDIR)/debian/checkbox-provider-phoronix/
+
+override_dh_gencontrol:
+	python3 manage.py packaging
+	dh_gencontrol
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/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..f031478
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+# https://bugs.launchpad.net/plainbox-provider-checkbox/+bug/1303919 
+plainbox-provider-checkbox source: source-is-missing
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..90eb450
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,119 @@
+-----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-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: SKS 1.1.5
+
+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
+FHU=
+=UsyP
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/manage.py b/manage.py
index 6875342..fc60f8b 100755
--- a/manage.py
+++ b/manage.py
@@ -16,7 +16,11 @@ from plainbox.provider_manager import setup, N_
 setup(
     name='checkbox-provider-phoronix',
     namespace='com.canonical.certification',
+<<<<<<< manage.py
     version="0.8.0.dev0",
+=======
+    version="0.7.0",
+>>>>>>> manage.py
     description=N_("Checkbox provider with Phoronix Test Suite"),
     gettext_domain="checkbox-provider-phoronix",
 )