Bug#1089479: xorg: diff for NMU version 1:7.7+23.2

[Niels Thykier]

Control: tags 1089479 + patch
Control: tags 1089479 + pending


Dear maintainer,

I've prepared an NMU for xorg (versioned as 1:7.7+23.2) and
uploaded it to DELAYED/15. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru xorg-7.7+23.1/debian/changelog xorg-7.7+23.2/debian/changelog
--- xorg-7.7+23.1/debian/changelog      2024-07-08 12:45:55.000000000 +0000
+++ xorg-7.7+23.2/debian/changelog      2024-12-28 15:03:28.000000000 +0000
@@ -1,3 +1,10 @@
+xorg (1:7.7+23.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Make xorg build without root.  (Closes: #1089479)
+
+ -- Niels Thykier <ni...@thykier.net>  Sat, 28 Dec 2024 15:03:28 +0000
+
 xorg (1:7.7+23.1) unstable; urgency=medium
    * Non-maintainer upload.
diff -Nru xorg-7.7+23.1/debian/control xorg-7.7+23.2/debian/control
--- xorg-7.7+23.1/debian/control        2024-07-08 12:45:44.000000000 +0000
+++ xorg-7.7+23.2/debian/control        2024-12-28 15:03:21.000000000 +0000
@@ -2,6 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Rules-Requires-Root: no
 Standards-Version: 4.5.0
 Build-Depends:
  dpkg (>= 1.16.1),
diff -Nru xorg-7.7+23.1/debian/rules xorg-7.7+23.2/debian/rules
--- xorg-7.7+23.1/debian/rules  2021-08-18 07:07:50.000000000 +0000
+++ xorg-7.7+23.2/debian/rules  2024-12-28 15:03:09.000000000 +0000
@@ -9,18 +9,15 @@
 override_dh_auto_build:
        $(MAKE) -C xsf-docs
 -override_dh_install:
+execute_before_dh_install:

-       dh_install
  override_dh_installinit-indep:
        dh_installinit -px11-common
 -override_dh_fixperms-indep:
+execute_after_dh_fixperms-indep:
        dh_fixperms
-       chown root:root debian/x11-common/etc/X11/Xreset
        chmod 755 debian/x11-common/etc/X11/Xreset
-       chown root:root debian/x11-common/etc/X11/Xsession
        chmod 755 debian/x11-common/etc/X11/Xsession
  # vim:set noet ai sts=8 sw=8 tw=0:

$(MAKE) -C xsf-docs install DESTDIR=$(CURDIR)/debian/xserver-xorg/usr/share/doc/xorg

OpenPGP_signature.asc
Description: OpenPGP digital signature