Bug#1089480: xotcl: Supporting rootless builds by default

[Niels Thykier]

Control: tags -1 patch

On Sat, 7 Dec 2024 22:10:33 +0100 Niels Thykier <ni...@thykier.net> wrote:

Source: xotcl
Version: 1.6.8-5
Severity: important
Tags: ftbfs
Justification: FTBFS
X-Debbugs-Cc: ni...@thykier.net
User: ni...@thykier.net
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`,
xotcl failed to rebuild.

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

Hi

Please see attached as a patch.



Best regards,
Niels

diff -Nru xotcl-1.6.8/debian/changelog xotcl-1.6.8/debian/changelog
--- xotcl-1.6.8/debian/changelog        2022-03-15 10:08:33.000000000 +0100
+++ xotcl-1.6.8/debian/changelog        2025-01-01 17:21:50.000000000 +0100
@@ -1,3 +1,11 @@
+xotcl (1.6.8-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Remove the need for root when building the package.
+    (Closes: #1089480)
+
+ -- Niels Thykier <ni...@thykier.net>  Wed, 01 Jan 2025 16:21:50 +0000
+
 xotcl (1.6.8-5) unstable; urgency=medium
 
   * Team upload.
diff -Nru xotcl-1.6.8/debian/control xotcl-1.6.8/debian/control
--- xotcl-1.6.8/debian/control  2022-03-15 10:08:33.000000000 +0100
+++ xotcl-1.6.8/debian/control  2025-01-01 17:21:25.000000000 +0100
@@ -4,6 +4,7 @@
 Maintainer: Tcl/Tk Debian Packagers <pkg-tcltk-de...@lists.alioth.debian.org>
 Uploaders: Stefan Sobernig <stefan.sober...@wu-wien.ac.at>
 Build-Depends: debhelper-compat (= 12), tcl-dev (>= 8.6), tk-dev (>= 8.6), 
libexpat1-dev
+Rules-Requires-Root: no
 Standards-Version: 4.6.0
 Homepage: http://www.xotcl.org/
 Vcs-Browser: https://salsa.debian.org/tcltk-team/xotcl
diff -Nru xotcl-1.6.8/debian/rules xotcl-1.6.8/debian/rules
--- xotcl-1.6.8/debian/rules    2022-03-15 10:08:33.000000000 +0100
+++ xotcl-1.6.8/debian/rules    2025-01-01 17:21:15.000000000 +0100
@@ -104,9 +104,9 @@
        $(MAKE) DESTDIR=$(TARGET) XOTCLSH=xotclsh install
        # / / / / / / / / / / / / / / / / / / / / / / / / / / /
        # xotcl
-       #install -d -m 755 -o root -g root $(EXTENSION)/usr/lib
-       install -d -m 755 -o root -g root $(ARCH_DEPENDENT)/xotcl$(VERSION)
-       install -d -m 755 -o root -g root $(ARCH_INDEPENDENT)
+       #install -d -m 755 $(EXTENSION)/usr/lib
+       install -d -m 755 $(ARCH_DEPENDENT)/xotcl$(VERSION)
+       install -d -m 755 $(ARCH_INDEPENDENT)
        @cp -R $(TARGET)/usr/lib/* $(ARCH_DEPENDENT)
        for d in $$(cat $(DEB)/xotcl.arch_independent); do \
                mv $(ARCH_DEPENDENT)/xotcl$(VERSION)/$$d 
$(ARCH_INDEPENDENT)/xotcl$(VERSION)-$$d; \
@@ -121,20 +121,20 @@
        rm -f $(ARCH_DEPENDENT)/xotcl$(VERSION)/COPYRIGHT
 
        # xotcl-shells
-       install -d -m 755 -o root -g root $(SHELLS)/usr/bin
+       install -d -m 755 $(SHELLS)/usr/bin
        @cp -R $(TARGET)/usr/bin/* $(SHELLS)/usr/bin/
 
        # man pages go with shells package (as required
        # by Debian policy, section 12.1)
-       install -d -m 755 -o root -g root $(SHELLS)/usr/share/man/man1
+       install -d -m 755 $(SHELLS)/usr/share/man/man1
        cp -R $(TARGET)/usr/share/man/man1/* $(SHELLS)/usr/share/man/man1
 
        # xotcl-dev
-       install -d -m 755 -o root -g root $(DEV)/usr/include/xotcl
+       install -d -m 755 $(DEV)/usr/include/xotcl
        cp -R $(TARGET)/usr/include/xotcl/* $(DEV)/usr/include/xotcl
 
        # move and fix xotclConfig.sh
-       install -d -m 755 -o root -g root $(DEV)/usr/share/tcltk/xotcl$(VERSION)
+       install -d -m 755 $(DEV)/usr/share/tcltk/xotcl$(VERSION)
        mv $(ARCH_DEPENDENT)/xotclConfig.sh 
$(DEV)/usr/share/tcltk/xotcl$(VERSION)/
        perl -i -p \
        -e "s|^(XOTCL_BUILD_LIB_SPEC)=.*$$|\1='-L/usr/lib/tcltk/xotcl$(VERSION) 
-lxotcl$(VERSION)'|;" \
@@ -147,7 +147,7 @@
        $(DEV)/usr/share/tcltk/xotcl$(VERSION)/xotclConfig.sh
 
        # `- provide symlinks 
-       install -d -m 755 -o root -g root $(DEV)/usr/lib/tcltk/xotcl$(VERSION)
+       install -d -m 755 $(DEV)/usr/lib/tcltk/xotcl$(VERSION)
 
        (cd $(DEV)/usr/lib; \
        ln -sf ../share/tcltk/xotcl$(VERSION)/xotclConfig.sh;)
@@ -159,7 +159,7 @@
        mv $(ARCH_DEPENDENT)/xotcl$(VERSION)/*.a 
$(DEV)/usr/lib/tcltk/xotcl$(VERSION)/
 
        # xotcl-doc
-       install -d -m 755 -o root -g root $(DOCDIR)/readings
+       install -d -m 755 $(DOCDIR)/readings
        for f in $(CURDIR)/doc/*.pdf $(CURDIR)/doc/*.html $(CURDIR)/doc/*.css 
$(CURDIR)/doc/*.gif ; do \
                cp $$f $(DOCDIR)/readings/; \
        done    

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.

OpenPGP_signature.asc
Description: OpenPGP digital signature