diff -Nru qemu-8.0.4+dfsg/debian/changelog qemu-8.0.4+dfsg/debian/changelog --- qemu-8.0.4+dfsg/debian/changelog 2023-09-27 18:53:27.000000000 +0000 +++ qemu-8.0.4+dfsg/debian/changelog 2023-10-03 22:13:20.000000000 +0000 @@ -1,3 +1,11 @@ +qemu (1:8.0.4+dfsg-1ubuntu3) mantic; urgency=medium + + * d/rules: Get rid of binary-helper target; explicitly invoke its + commands under binary-{arch,indep}. This makes the build succeed + again in Ubuntu, where binary-helper wasn't being properly invoked. + + -- Sergio Durigan Junior Tue, 03 Oct 2023 18:13:20 -0400 + qemu (1:8.0.4+dfsg-1ubuntu2) mantic; urgency=medium * d/rules: Incorporate the following changes from Debian unstable, in diff -Nru qemu-8.0.4+dfsg/debian/rules qemu-8.0.4+dfsg/debian/rules --- qemu-8.0.4+dfsg/debian/rules 2023-09-27 18:48:47.000000000 +0000 +++ qemu-8.0.4+dfsg/debian/rules 2023-10-03 22:12:39.000000000 +0000 @@ -497,8 +497,11 @@ echo "built-using=$$srcs" >> debian/qemu-user-static.substvars ; \ fi endif -binary-arch: install-arch binary-helper -binary-arch: a=-a +binary-arch: install-arch + dh_installdeb -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a ############################################## ### firmware, qemu-user-data package @@ -701,24 +704,22 @@ dh_lintian -i dh_compress -i dh_fixperms -i -binary-indep: install-indep binary-helper -binary-indep: a=-i +binary-indep: install-indep + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i build: build-arch build-indep install: install-arch install-indep binary: binary-arch binary-indep -binary-helper: - dh_installdeb $a - dh_gencontrol $a - dh_md5sums $a - dh_builddeb $a clean: debian/control dh_clean \ b/ \ configs/devices/x86_64-softmmu/microvm.mak \ -.PHONY: build install binary binary-helper clean +.PHONY: build install binary clean ifneq (,$(wildcard debian/control-in)) # only include rules for debian/control if debian/control-in is present