Bug#1089474: xfaces: diff for NMU version 3.3-30.2

[Niels Thykier]

Control: tags 1089474 + patch
Control: tags 1089474 + pending


Dear maintainer,

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

Regards.

diff -u xfaces-3.3/debian/changelog xfaces-3.3/debian/changelog
--- xfaces-3.3/debian/changelog
+++ xfaces-3.3/debian/changelog
@@ -1,3 +1,13 @@
+xfaces (3.3-30.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Remove need for root when building the package.
+    (Closes: #1089474)
+  * Run `dpkg-gencontrol` a bit later to ensure the
+    Installed-Size is correct.
+
+ -- Niels Thykier <ni...@thykier.net>  Wed, 01 Jan 2025 09:14:02 +0000
+
 xfaces (3.3-30.1) unstable; urgency=high
    * Non-maintainer upload
diff -u xfaces-3.3/debian/control xfaces-3.3/debian/control
--- xfaces-3.3/debian/control
+++ xfaces-3.3/debian/control
@@ -2,6 +2,7 @@
 Section: mail
 Priority: optional
 Maintainer: Hakan Ardo <ha...@debian.org>
+Rules-Requires-Root: no
 Standards-Version: 3.9.6

 diff -u xfaces-3.3/debian/rules xfaces-3.3/debian/rules
--- xfaces-3.3/debian/rules
+++ xfaces-3.3/debian/rules
@@ -29,13 +29,13 @@
        -rm -rf *~ debian/tmp debian/*~ debian/files* debian/substvars
        dh_clean
 -binary-indep: checkroot build
+binary-indep:  build
        $(checkdir)
 # There are no architecture-independent files to be uploaded
 # generated by this package.  If there were any they would be
 # made here.
 -binary-arch:  checkroot build
+binary-arch:   build
        $(checkdir)
        -rm -rf debian/tmp
        install -d debian/tmp debian/tmp/DEBIAN
@@ -68,14 +68,13 @@
        cp debian/copyright debian/tmp/usr/doc/$(package)/.
        chmod 0644 debian/tmp/usr/doc/$(package)/*
        dpkg-shlibdeps xfaces
-       dpkg-gencontrol -isp
-       chown -R root.root debian/tmp
+       dh_strip
        chmod -R g-ws debian/tmp
        mv debian/tmp/usr/doc debian/tmp/usr/share
        cp debian/prerm debian/tmp/DEBIAN
        chmod 755 debian/tmp/DEBIAN/prerm
-       dh_strip
-       dpkg --build debian/tmp ..
+       dpkg-gencontrol -isp
+       dpkg-deb --root-owner-group --build debian/tmp ..
  define checkdir
        test -f face_actions.c -a -f debian/rules
@@ -88,8 +87,4 @@
 source diff:
        @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 -checkroot:
-       $(checkdir)
-       test root = "`whoami`"
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+.PHONY: binary binary-arch binary-indep clean

Build-Depends: libxext-dev, libxmu-dev, libxpm-dev, libxt-dev, xutils-dev, x11proto-core-dev, libxaw7-dev, nas-dev, libcompfaceg1-dev, debhelper (>=9)

OpenPGP_signature.asc
Description: OpenPGP digital signature