[Pkg-tcltk-devel] Bug#1089480: xotcl: diff for NMU version 1.6.8-5.1

[Niels Thykier]

Control: tags 1089480 + patch
Control: tags 1089480 + pending


Dear maintainer,

I've prepared an NMU for xotcl (versioned as 1.6.8-5.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru xotcl-1.6.8/debian/changelog xotcl-1.6.8/debian/changelog
--- xotcl-1.6.8/debian/changelog	2022-03-15 09:08:33.000000000 +0000
+++ xotcl-1.6.8/debian/changelog	2025-01-01 16:21:50.000000000 +0000
@@ -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 <niels at 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 09:08:33.000000000 +0000
+++ xotcl-1.6.8/debian/control	2025-01-01 16:21:25.000000000 +0000
@@ -4,6 +4,7 @@
  Maintainer: Tcl/Tk Debian Packagers 
<pkg-tcltk-devel at lists.alioth.debian.org>
  Uploaders: Stefan Sobernig <stefan.sobernig at 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 09:08:33.000000000 +0000
+++ xotcl-1.6.8/debian/rules	2025-01-01 16:21:15.000000000 +0000
@@ -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	
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://alioth-lists.debian.net/pipermail/pkg-tcltk-devel/attachments/20250103/fa6e2ced/attachment.sig>