diff -Nru fwupd-efi-1.2/debian/changelog fwupd-efi-1.2/debian/changelog --- fwupd-efi-1.2/debian/changelog 2022-01-26 19:15:00.000000000 +0000 +++ fwupd-efi-1.2/debian/changelog 2022-02-09 23:05:46.000000000 +0000 @@ -1,3 +1,11 @@ +fwupd-efi (1:1.2-3) unstable; urgency=medium + + [ Mario Limonciello ] + * Rebuild to fix Build-Depends in the signed-template + packages. Closes: #1005144 + + -- Steve McIntyre <93sam@debian.org> Wed, 09 Feb 2022 23:05:46 +0000 + fwupd-efi (1:1.2-2) unstable; urgency=medium * Correct the signing template to use binary package not source package diff -Nru fwupd-efi-1.2/debian/grab_version fwupd-efi-1.2/debian/grab_version --- fwupd-efi-1.2/debian/grab_version 2022-01-04 19:05:10.000000000 +0000 +++ fwupd-efi-1.2/debian/grab_version 2021-11-06 23:30:14.000000000 +0000 @@ -13,9 +13,6 @@ # Remove any trailing +b - ignore binNMUs $this_version =~ s/\+b\d+$//; -# Remove the epoch -$this_version =~ s/.*://; - # Code borrowed from dch for incrementing a version number, let's # assume it works! $this_version =~ /^(.*?)([a-yA-Y][a-zA-Z]*|\d*)$/; diff -Nru fwupd-efi-1.2/debian/rules fwupd-efi-1.2/debian/rules --- fwupd-efi-1.2/debian/rules 2022-01-24 22:31:07.000000000 +0000 +++ fwupd-efi-1.2/debian/rules 2022-02-09 23:02:52.000000000 +0000 @@ -13,10 +13,11 @@ SB_STYLE := debian deb_version := $(shell debian/grab_version) +deb_version_no_epoch := $(shell debian/grab_version | sed s/.*://) deb_next_version := $(shell debian/grab_version --next) ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes)) SB_STYLE := ubuntu - tar_name := fwupd_$(deb_version)_$(DEB_HOST_ARCH).tar.gz + tar_name := fwupd_$(deb_version_no_epoch)_$(DEB_HOST_ARCH).tar.gz CONFARGS += -Defi_sbat_distro_id=ubuntu CONFARGS += -Defi_sbat_distro_summary=Ubuntu CONFARGS += -Defi_sbat_distro_pkgname=fwupd @@ -71,9 +72,9 @@ dh_builddeb ifeq (ubuntu,$(SB_STYLE)) set -e; if [ -d debian/tmp/usr/libexec/fwupd/efi/ ]; then \ - mkdir -p debian/fwupd-images/$(deb_version); \ - cp debian/tmp/usr/libexec/fwupd/efi/fwupd*.efi debian/fwupd-images/$(deb_version); \ - echo $(deb_version) > debian/fwupd-images/$(deb_version)/version; \ + mkdir -p debian/fwupd-images/$(deb_version_no_epoch); \ + cp debian/tmp/usr/libexec/fwupd/efi/fwupd*.efi debian/fwupd-images/$(deb_version_no_epoch); \ + echo $(deb_version_no_epoch) > debian/fwupd-images/$(deb_version_no_epoch)/version; \ tar -C debian/fwupd-images -czvf ../$(tar_name) .; \ dpkg-distaddfile $(tar_name) raw-uefi -; \ fi