Bug#881835: mbr: diff for NMU version 1.1.11-5.2
Control: tags 881835 + pending Dear maintainer, I've prepared an NMU for mbr (versioned as 1.1.11-5.2) and uploaded it to DELAYED/7. Please feel free to tell me if I should delay it longer. (Apologies for the noise; I managed to cancel the upload and correct the missing Closes) Regards. diff -u mbr-1.1.11/debian/changelog mbr-1.1.11/debian/changelog --- mbr-1.1.11/debian/changelog +++ mbr-1.1.11/debian/changelog @@ -1,3 +1,23 @@ +mbr (1.1.11-5.2) unstable; urgency=medium + + * Non-maintainer upload. + + [ Simon McVittie ] + * Only copy install-mbr to debian/mbr-udeb/sbin if we are going to +build the mbr-udeb package, fixing FTBFS on non-x86 architectures. +In recent debhelper versions, dh_installdirs does not create +directories for binary packages that are not applicable to the +current architecture. (Closes: #881835) + + [ Niels Thykier ] + * Set Rules-Requires-Root (R³) to no. + * Replace use of "Priority: extra" with "Priority: optional" as the +former is now obsolete and replaced by the latter. + * Use Package-Type without the "XC-" prefix as it is no longer +required. + + -- Niels Thykier Mon, 06 Aug 2018 18:53:12 + + mbr (1.1.11-5.1) unstable; urgency=medium * Non-maintainer upload. diff -u mbr-1.1.11/debian/control mbr-1.1.11/debian/control --- mbr-1.1.11/debian/control +++ mbr-1.1.11/debian/control @@ -4,6 +4,7 @@ Maintainer: Santiago Garcia Mantinan Standards-Version: 3.9.3 Build-Depends: debhelper(>= 7), bin86, util-linux (>= 2.13) | linux32, xxd +Rules-Requires-Root: no Package: mbr Architecture: any @@ -16,9 +17,8 @@ Package: mbr-udeb Architecture: i386 amd64 lpia Depends: ${shlibs:Depends}, ${misc:Depends} -Priority: extra Section: debian-installer -XC-Package-Type: udeb +Package-Type: udeb XB-Installer-Menu-Item: 9 Description: Master Boot Record for IBM-PC compatible computers diff -u mbr-1.1.11/debian/rules mbr-1.1.11/debian/rules --- mbr-1.1.11/debian/rules +++ mbr-1.1.11/debian/rules @@ -1,5 +1,7 @@ #!/usr/bin/make -f +binaries := $(shell dh_listpackages) + CC := gcc -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 CFLAGS := -g -Wall -W @@ -38,7 +40,9 @@ dh_installdocs -p mbr debian/README-1st.Debian NEWS README AUTHORS dh_installchangelogs $(MAKE) install INSTALL_PROGRAM="$(INSTALL_PROGRAM)" +ifneq ($(filter mbr-udeb,$(binaries)),) cp `pwd`/debian/mbr/sbin/install-mbr `pwd`/debian/mbr-udeb/sbin/ +endif binary-indep: build dh_testdir
Bug#881835: mbr: diff for NMU version 1.1.11-5.2
Package: mbr Version: 1.1.11-5.1 Severity: normal Tags: patch pending Dear maintainer, I've prepared an NMU for mbr (versioned as 1.1.11-5.2) and uploaded it to DELAYED/7. Please feel free to tell me if I should delay it longer. (Yes, it is missing a Closes; I will do that manually). Regards. diff -u mbr-1.1.11/debian/changelog mbr-1.1.11/debian/changelog --- mbr-1.1.11/debian/changelog +++ mbr-1.1.11/debian/changelog @@ -1,3 +1,23 @@ +mbr (1.1.11-5.2) unstable; urgency=medium + + * Non-maintainer upload. + + [ Simon McVittie ] + * Only copy install-mbr to debian/mbr-udeb/sbin if we are going to +build the mbr-udeb package, fixing FTBFS on non-x86 architectures. +In recent debhelper versions, dh_installdirs does not create +directories for binary packages that are not applicable to the +current architecture. + + [ Niels Thykier ] + * Set Rules-Requires-Root (R³) to no. + * Replace use of "Priority: extra" with "Priority: optional" as the +former is now obsolete and replaced by the latter. + * Use Package-Type without the "XC-" prefix as it is no longer +required. + + -- Niels Thykier Mon, 06 Aug 2018 18:53:12 + + mbr (1.1.11-5.1) unstable; urgency=medium * Non-maintainer upload. diff -u mbr-1.1.11/debian/control mbr-1.1.11/debian/control --- mbr-1.1.11/debian/control +++ mbr-1.1.11/debian/control @@ -4,6 +4,7 @@ Maintainer: Santiago Garcia Mantinan Standards-Version: 3.9.3 Build-Depends: debhelper(>= 7), bin86, util-linux (>= 2.13) | linux32, xxd +Rules-Requires-Root: no Package: mbr Architecture: any @@ -16,9 +17,8 @@ Package: mbr-udeb Architecture: i386 amd64 lpia Depends: ${shlibs:Depends}, ${misc:Depends} -Priority: extra Section: debian-installer -XC-Package-Type: udeb +Package-Type: udeb XB-Installer-Menu-Item: 9 Description: Master Boot Record for IBM-PC compatible computers diff -u mbr-1.1.11/debian/rules mbr-1.1.11/debian/rules --- mbr-1.1.11/debian/rules +++ mbr-1.1.11/debian/rules @@ -1,5 +1,7 @@ #!/usr/bin/make -f +binaries := $(shell dh_listpackages) + CC := gcc -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 CFLAGS := -g -Wall -W @@ -38,7 +40,9 @@ dh_installdocs -p mbr debian/README-1st.Debian NEWS README AUTHORS dh_installchangelogs $(MAKE) install INSTALL_PROGRAM="$(INSTALL_PROGRAM)" +ifneq ($(filter mbr-udeb,$(binaries)),) cp `pwd`/debian/mbr/sbin/install-mbr `pwd`/debian/mbr-udeb/sbin/ +endif binary-indep: build dh_testdir