Merging debian version 2.12.1-2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 23 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index f8953ae..4fa9102 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+man-db (2.12.1-2) unstable; urgency=medium
+
+  [ Colin Watson ]
+  * Configure with --disable-setuid to reduce the need for chown at package
+    build time.  (The man-db/install-setuid debconf question still works as
+    before.)
+
+  [ Niels Thykier ]
+  * Migrate to debputy to avoid needing fakeroot.
+
+ -- Colin Watson <cjwatson@debian.org>  Wed, 05 Jun 2024 14:51:41 +0100
+
 man-db (2.12.1-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 9bde896..ba7938b 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends: autopoint,
                bsdextrautils | bsdmainutils (<< 12.1.1~),
                debhelper-compat (= 13),
                dh-apparmor,
+               dh-sequence-zz-debputy-rrr (>= 0.1.23~),
                flex,
                gnulib,
                groff,
@@ -25,7 +26,7 @@ Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/man-db
 Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/man-db
 XSBC-Original-Vcs-Browser: https://salsa.debian.org/debian/man-db
 XSBC-Original-Vcs-Git: https://salsa.debian.org/debian/man-db.git
-Rules-Requires-Root: binary-targets
+Rules-Requires-Root: no
 
 Package: man-db
 Architecture: any
diff --git a/debian/debputy.manifest b/debian/debputy.manifest
new file mode 100644
index 0000000..db31319
--- /dev/null
+++ b/debian/debputy.manifest
@@ -0,0 +1,8 @@
+manifest-version: '0.1'
+packages:
+  man-db:
+    transformations:
+      - create-directories:
+          path: var/cache/man
+          owner: man
+          group: man
diff --git a/debian/rules b/debian/rules
index bcbd753..70c691d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ override_dh_autoreconf:
 override_dh_auto_configure:
 	dh_auto_configure -- \
 	            --libdir=\$${prefix}/lib \
-	            --enable-setuid \
+	            --disable-setuid \
 	            --with-device=latin1 --enable-mb-groff \
 	            --with-config-file=/etc/manpath.config \
 	            --with-browser=www-browser --with-pager=pager \
@@ -39,8 +39,5 @@ execute_after_dh_auto_install:
 execute_after_dh_install:
 	dh_apparmor --profile-name=usr.bin.man
 
-execute_after_dh_fixperms:
-	chown man:man $(dtmp)/var/cache/man
-
 # Our shared libraries are private.
 override_dh_makeshlibs: