Control: tags -1 patch:

On Sat, 7 Dec 2024 21:50:58 +0100 Niels Thykier <[email protected]> wrote:
Source: taggrepper
Version: 0.10-2
Severity: important
Tags: ftbfs
Justification: FTBFS
X-Debbugs-Cc: [email protected]
User: [email protected]
Usertags: rrr-no-as-default-issue

Dear maintainer,

During a test rebuild for building packages with
`Rules-Requires-Root: no` as the default in `dpkg`,
taggrepper failed to rebuild.

Log Summary:
-------------------------------------------------------------------------------
[...]

Hi

Please see attached as a patch.

I intend to NMU to make progress on the MBF if I do not hear from you on this. It would help me if you either uploaded this soon or approved the NMU (enabling me to skip the delay). Thanks in advance.

Best regards,
Niels
diff -Nru taggrepper-0.10/debian/changelog taggrepper-0.10/debian/changelog
--- taggrepper-0.10/debian/changelog    2023-07-03 10:33:16.000000000 +0200
+++ taggrepper-0.10/debian/changelog    2025-01-01 11:12:40.000000000 +0100
@@ -1,3 +1,11 @@
+taggrepper (0.10-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Remove need for root when building package.
+    (Closes: #1089448)
+
+ -- Niels Thykier <[email protected]>  Wed, 01 Jan 2025 10:12:40 +0000
+
 taggrepper (0.10-2) unstable; urgency=medium
 
   * Update debian packaging: remove source epoch
diff -Nru taggrepper-0.10/debian/control taggrepper-0.10/debian/control
--- taggrepper-0.10/debian/control      2023-07-03 10:33:16.000000000 +0200
+++ taggrepper-0.10/debian/control      2025-01-01 11:11:23.000000000 +0100
@@ -3,6 +3,7 @@
 Priority: optional
 Maintainer: Kumar Appaiah <[email protected]>
 Build-Depends: libpcre2-dev, libflac-dev, libid3tag0-dev, libvorbis-dev, 
pkg-config, libmagic-dev
+Rules-Requires-Root: no
 Standards-Version: 4.6.2
 Homepage: https://github.com/kumanna/taggrepper
 
diff -Nru taggrepper-0.10/debian/rules taggrepper-0.10/debian/rules
--- taggrepper-0.10/debian/rules        2023-07-03 10:33:16.000000000 +0200
+++ taggrepper-0.10/debian/rules        2025-01-01 11:10:44.000000000 +0100
@@ -16,10 +16,10 @@
 # Install program
 INSTALL = install
 
-INSTALL_FILE    = $(INSTALL) -p    -o root -g root  -m  644
-INSTALL_PROGRAM = $(INSTALL) -p    -o root -g root  -m  755
-INSTALL_SCRIPT  = $(INSTALL) -p    -o root -g root  -m  755
-INSTALL_DIR     = $(INSTALL) -p -d -o root -g root  -m  755
+INSTALL_FILE    = $(INSTALL) -p    -m  644
+INSTALL_PROGRAM = $(INSTALL) -p    -m  755
+INSTALL_SCRIPT  = $(INSTALL) -p    -m  755
+INSTALL_DIR     = $(INSTALL) -p -d -m  755
 
 
 # The installation directory
@@ -62,25 +62,25 @@
        $(MAKE)
        touch $@
 
-clean: checkroot
+clean:
        $(checkdir)
        rm -f build-stamp
        [ ! -f Makefile ] || $(MAKE) distclean
        rm -f config.sub config.guess
        rm -rf $(PACKAGE_DIR) debian/files debian/substvars config.log
 
-install: checkroot build
+install: build
        $(checkdir)
        $(MAKE) DESTDIR=$(CURDIR)/$(PACKAGE_DIR) install
        # fix directory permissions
        find '$(PACKAGE_DIR)' -type d -print0 | xargs -0r chmod 0755
 
 # Build architecture-independent files here.
-binary-indep: checkroot build install
+binary-indep: build install
 # We have nothing to do by default.
 
 # Build architecture-dependent files here.
-binary-arch: checkroot build install
+binary-arch: build install
        $(checkdir)
        $(INSTALL_DIR) $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/
        $(INSTALL_FILE) -m 644 README.md 
$(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/
@@ -103,7 +103,7 @@
        dpkg-gencontrol -p$(PACKAGE_NAME) -P$(PACKAGE_DIR)
        find $(PACKAGE_DIR) -newermt "@$$SOURCE_DATE_EPOCH" -print0 | \
                xargs -0r touch --no-dereference --date="@$$SOURCE_DATE_EPOCH"
-       dpkg-deb --build $(PACKAGE_DIR) ..
+       dpkg-deb --root-owner-group --build $(PACKAGE_DIR) ..
 
 binary: binary-indep binary-arch
 
@@ -111,9 +111,5 @@
        test -f src/taggrepper.c && test -f debian/rules
 endef
 
-checkroot:
-       $(checkdir)
-       test root = "`whoami`"
-
 
 .PHONY: build clean binary-indep binary-arch binary install

Attachment: OpenPGP_signature.asc
Description: OpenPGP digital signature

Reply via email to