Merge ~mwhudson/ubiquity:grub-recommends into ubiquity:master

[Michael Hudson-Doyle]

[Steve Langasek (vorlon)]

review: Approve

[Adam Conrad (adconrad)]

LGTM, go ahead and commit and upload.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 355c99a..5fe4827 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ubiquity (20.04.2) UNRELEASED; urgency=medium
+
+  * d/control: Recommend grub-efi-amd64 or grub-efi-ia32, not the transitional
+    grub-efi which is no longer installed by default. (LP: #1848880)
+
+ -- Michael Hudson-Doyle <[e-mail]>  Wed, 27 Nov 2019 13:19:45 +1300
+
 ubiquity (20.04.1) focal; urgency=medium
 
   * zfs:
diff --git a/debian/control b/debian/control
index 5a84682..aa9b7a9 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Vcs-Browser: https://code.launchpad.net/~ubuntu-installer/ubiquity/+git/ubiquity
 Package: ubiquity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-debconf, ubiquity-frontend-${mangled-version}, ubiquity-artwork-${mangled-version}, laptop-detect, lsb-release, ubiquity-casper, python3-apt (>= 0.7.100.3~), ${console-setup-depends}, iso-codes, passwd, adduser, os-prober, rdate, ntfs-3g (>= 1:2011.1.15AR.4+2011.4.12-1) [any-alpha any-amd64 any-i386 any-arm64], cryptsetup, policykit-1, python3-icu (>= 1.0), python3-pam, language-selector-common (>= 0.4.16), archdetect-deb, dpkg-repack, apt-clone, wget, grub-common [any-amd64 any-i386 arm64], dbus-x11, sbsigntool [amd64]
-Recommends: grub-pc [any-amd64 any-i386] | grub [any-amd64 any-i386] | grub-efi [any-amd64 any-i386] | grub-efi-arm64 [arm64], dmraid, btrfs-progs, ubuntu-drivers-common (>= 0.6.3), lvm2
+Recommends: grub-pc [any-amd64 any-i386] | grub [any-amd64 any-i386] | grub-efi-amd64 [any-amd64] | grub-efi-arm64 [arm64] | grub-efi-ia32 [any-i386], dmraid, btrfs-progs, ubuntu-drivers-common (>= 0.6.3), lvm2
 Description: Ubuntu live CD installer
  This is a simple live CD installer designed to integrate well with Debian-
  and Ubuntu-based systems, and to reuse code from d-i for ease of