Use policy-compliant architecture wildcards

Although dpkg-architecture supports wildcards with up to four
components, Debian Policy only specifies "any", "<os>-any", and
"any-<cpu>", and Lintian checks that.  Fix the libefiboot-dev and
libefivar-dev build-dependencies to match this.

diff --git a/debian/changelog b/debian/changelog
index bc97c19abb62f6e8e857e172e8116d038006e309..1f3a52d9aebc15a6169ff390e519c66122653abb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ grub2 (2.04-4) UNRELEASED; urgency=medium
     DPKG_MAINTSCRIPT_PACKAGE when calling grub-pc.postinst manually (closes:
     #943387).
 
+  [ Colin Watson ]
+  * Use policy-compliant architecture wildcards in libefiboot-dev and
+    libefivar-dev build-dependencies.
+
  -- Colin Watson <cjwatson@debian.org>  Sat, 31 Aug 2019 22:34:14 +0100
 
 grub2 (2.04-3) unstable; urgency=medium

diff --git a/debian/control b/debian/control
index 826ca6a1f2fde9b8bf083a124cf7818134530a10..56d8b216f5142ced9c870dffd47c67f02419f522 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -32,8 +32,8 @@ Build-Depends: debhelper-compat (= 10),
  libparted-dev [any-powerpc any-ppc64 any-ppc64el],
  pkg-config,
  bash-completion,
- libefiboot-dev [any-linux-i386 any-linux-amd64 any-linux-ia64 any-linux-arm any-linux-arm64],
- libefivar-dev [any-linux-i386 any-linux-amd64 any-linux-ia64 any-linux-arm any-linux-arm64],
+ libefiboot-dev [linux-i386 linux-amd64 linux-ia64 linux-arm linux-arm64],
+ libefivar-dev [linux-i386 linux-amd64 linux-ia64 linux-arm linux-arm64],
 Build-Conflicts: autoconf2.13, libzfs-dev, libnvpair-dev
 Standards-Version: 3.9.6
 Homepage: https://www.gnu.org/software/grub/