Tweak the binary package setup a lot

 * We're now building for 3 arches
 * Depend on the right grub-efi-$arch-bin package Gfor each arch
 * Depend on the right shim-helpers-$arch-signed package for each
   arch
 * Remove the old Replaces: and Breaks:, as we don't clash with files
   from the shim binary package any more.

diff --git a/debian/control b/debian/control
index cf27f5ed5764cc6ca90f3e454118c60ac44d3f5b..3a50fd2956517a35619d0371866c2ed8f8a71546 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -13,10 +13,16 @@ Build-Depends: debhelper (>= 9),
 Standards-Version: 3.9.4
 
 Package: shim-signed
-Architecture: amd64
-Depends: ${misc:Depends}, grub-efi-amd64-bin, grub2-common (>= 2.02~beta2-36ubuntu12), mokutil
-Replaces: shim (= ${shim:Version})
-Breaks: shim (<= ${shim:Version})
+Architecture: amd64 i386 arm64
+Depends: ${misc:Depends},
+ grub-efi-amd64-bin [amd64],
+ shim-helpers-amd64-signed (>= 1+15+1533136590.3beb971+5) [amd64],
+ grub-efi-ia32-bin [i386],
+ shim-helpers-i386-signed (>= 1+15+1533136590.3beb971+5) [i386],
+ grub-efi-arm64-bin [arm64],
+ shim-helpers-arm64-signed (>= 1+15+1533136590.3beb971+5) [arm64],
+ grub2-common (>= 2.02+dfsg1-16),
+ mokutil
 Recommends: secureboot-db
 Built-Using: shim (= ${shim:Version})
 Description: Secure Boot chain-loading bootloader (Microsoft-signed binary)