Merge lp:~roadmr/checkbox/ppppcc-glmark2-es2 into lp:~checkbox-dev/checkbox/ppa-packaging-plainbox-provider-canonical-certification

[Daniel Manrique]

Depend/install glmark2-es2 via an architecture-specific metapackage.

The architecture-specific restriction only applies to arch-specific packages,
while plainbox-provider-certification-client is Architecture: all. In order to
avoid making it Architecture: any, it was made to recommend a metapackage.

The tiny metapackage *is* arch-specific and itself depends selectively on
glmark2-es2; so on the designated architectures the metapackage will install
glmark2-es2, while on the other architectures it will have no dependencies
and just be installed by itself.

I also snuck in a couple minor debian/control syntax fixes.

OOps... the previous merge failed because an arch: all package can't have arch-specific dependencies. See the build log:

dpkg-gencontrol: error: the Recommends field contains an arch-specific dependency but the package is architecture all

https://launchpadlibrarian.net/182893179/buildlog_ubuntu-trusty-i386.plainbox-provider-canonical-certification_0.6%2Bbzr3209%2Bpkg29~ubuntu14.04.1_FAILEDTOBUILD.txt.gz

The fix I'm proposing is to depend/install glmark2-es2 via an architecture-specific metapackage.

The architecture-specific restriction only applies to arch-specific packages,
while plainbox-provider-certification-client is Architecture: all. In order to
avoid making it Architecture: any, it was made to recommend a metapackage.

The tiny metapackage *is* arch-specific and itself depends selectively on
glmark2-es2; so on the designated architectures the metapackage will install
glmark2-es2, while on the other architectures it will have no dependencies
and just be installed by itself.

I also snuck in a couple minor debian/control syntax fixes.

[Daniel Manrique (roadmr)]

I tested that this builds correctly, and it does. On my test system, it spit out an amd64-specific package for the metapackage:

 Package: plainbox-glmark2-es2-meta
 Source: plainbox-provider-canonical-certification
 Version: 0.6
 Architecture: amd64
 Maintainer: Ubuntu Developers <email address hidden>
 Installed-Size: 27
 Section: utils
 Priority: optional

Here you can see it doesn't depend on anything, so it will not try to pull glmark2-es2 on amd64.

I can't do an arm* build, but I imagine it'd have a Depends: field in that case.

And this is why an arch:all package can't have this restriction: the way the arch-specific dependency works is by "mangling" the control data accordingly to account for the selective dependency. This is explained in detail here: https://www.debian.org/doc/debian-policy/ch-relationships.html (maybe I could have avoided the earlier build problem if I'd read this carefully).

[Zygmunt Krynicki (zyga)]

+1 great fix

As mentioned I'd like to get some feedback from mvo about how this works and if that's something he wants to change in apt later on but it in the meantime let's merge it in

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-08-21 15:08:01 +0000
+++ debian/control	2014-08-21 18:57:59 +0000
@@ -29,16 +29,16 @@
 
 Package: plainbox-provider-certification-client
 Architecture: all
-Depends: checkbox-ng-service (>0.4~dev),
+Depends: checkbox-ng-service (>>0.4~dev),
          plainbox-provider-checkbox (>=0.5~dev),
-         plainbox-provider-resource-generic (>0.4~dev),
+         plainbox-provider-resource-generic (>>0.4~dev),
          python3-plainbox (>=0.6~dev)
 Recommends: bootchart,
             ethtool,
             fswebcam,
             fwts (>=14.03.00-0ubuntu1~),
             glmark2,
-            glmark2-es2 [arm64 armhf],
+            plainbox-glmark2-es2-meta,
             gtkperf,
             hdparm,
             imagemagick,
@@ -55,6 +55,16 @@
 Description: Client Certification
  This package provides the Client Certification whitelists.
 
+Package: plainbox-glmark2-es2-meta
+Architecture: any
+Depends: glmark2-es2 [arm64 armhf]
+Description: metapackage 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.
+
 Package: plainbox-provider-certification-server
 Architecture: all
 Depends: plainbox-provider-checkbox