I suggest redoing the diff to fwupd-efi 1.6. It "basically" is the same as 1.5 but drops all the debian patches that were upstreamed.
** Summary changed: - [FFe] [HWE] fwupd-efi 1.5 and gnu-efi 3.0.18 + [FFe] [HWE] fwupd-efi 1.6 and gnu-efi 3.0.18 -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/2060197 Title: [FFe] [HWE] fwupd-efi 1.6 and gnu-efi 3.0.18 To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/fwupd-efi/+bug/2060197/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs