Control: tags -1 patch On Sat, 7 Dec 2024 19:58:42 +0100 Niels Thykier <[email protected]> wrote:
Source: debdelta Version: 0.70 Severity: important Tags: ftbfs Justification: FTBFS X-Debbugs-Cc: [email protected] User: [email protected] Usertags: rrr-no-as-default-issueDear maintainer, During a test rebuild for building packages with `Rules-Requires-Root: no` as the default in `dpkg`, debdelta failed to rebuild. [...]
Hi, Please see attached patch as a way to solve this problem. Best regards, Niels
diff -Nru debdelta-0.70/debian/changelog debdelta-0.70+nmu1/debian/changelog --- debdelta-0.70/debian/changelog 2024-01-02 09:02:03.000000000 +0100 +++ debdelta-0.70+nmu1/debian/changelog 2024-12-28 12:38:54.000000000 +0100 @@ -1,3 +1,10 @@ +debdelta (0.70+nmu1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Have debdelta build without requiring root. + + -- Niels Thykier <[email protected]> Sat, 28 Dec 2024 11:38:54 +0000 + debdelta (0.70) unstable; urgency=medium * update documentation diff -Nru debdelta-0.70/debian/control debdelta-0.70+nmu1/debian/control --- debdelta-0.70/debian/control 2024-01-02 09:02:03.000000000 +0100 +++ debdelta-0.70+nmu1/debian/control 2024-12-28 12:38:54.000000000 +0100 @@ -3,6 +3,7 @@ Priority: optional Build-Depends: zlib1g-dev, libbz2-dev Maintainer: A Mennucc1 <[email protected]> +Rules-Requires-Root: no Standards-Version: 4.6.2 Homepage: http://debdelta.debian.net Vcs-git: https://salsa.debian.org/mennucc1/debdelta.git diff -Nru debdelta-0.70/debian/rules debdelta-0.70+nmu1/debian/rules --- debdelta-0.70/debian/rules 2024-01-02 09:02:03.000000000 +0100 +++ debdelta-0.70+nmu1/debian/rules 2024-12-28 12:38:54.000000000 +0100 @@ -53,7 +53,7 @@ rm -f minigzip minibzip2 rm -rf $(D) $(D2) -binary-indep: checkroot build +binary-indep: build $(checkdir) rm -rf $(D2) install -d $(D2)/DEBIAN $(docdir2) $(docdir2doc) @@ -65,15 +65,14 @@ ln -s ../debdelta-doc/html $(docdir2) # build package dpkg-gencontrol -Pdebian/debdelta-doc -pdebdelta-doc - chown -R root:root $(D2) find debian/debdelta-doc -newermt '$(BUILD_DATE)' -print0 | \ xargs -0r touch --no-dereference --date='$(BUILD_DATE)' # Ensure correct mode for files for reproducible builds chmod -c 0755 $(docdir2doc)/html/ chmod -c 0644 $(docdir2doc)/html/* - dpkg-deb --build $(D2) .. + dpkg-deb --root-owner-group --build $(D2) .. -binary-arch: checkroot build +binary-arch: build $(checkdir) rm -rf $(D) # dirs @@ -117,12 +116,11 @@ # build package dpkg-shlibdeps $(D)/usr/lib/debdelta/minigzip $(D)/usr/lib/debdelta/minibzip2 dpkg-gencontrol -Pdebian/debdelta -pdebdelta - chown -R root:root $(D) find debian/debdelta -newermt '$(BUILD_DATE)' -print0 | \ xargs -0r touch --no-dereference --date='$(BUILD_DATE)' # Ensure correct mode for files for reproducible builds chmod -c 0644 $(D)/usr/share/debdelta/*.patch - dpkg-deb --build $(D) .. + dpkg-deb --root-owner-group --build $(D) .. define checkdir test -f debdelta -a -f debian/rules @@ -130,8 +128,4 @@ binary: binary-indep binary-arch -checkroot: - $(checkdir) - test $$(id -u) = 0 - .PHONY: binary binary-arch binary-indep clean checkroot
OpenPGP_signature.asc
Description: OpenPGP digital signature
