Merging debian version 2.12.0-4.

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

3 files changed, 13 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index cfcc0e8..85d4eae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+man-db (2.12.0-4) unstable; urgency=medium
+
+  * Build-depend on pkgconf rather than pkg-config.
+  * Build-depend on gnulib and rebootstrap from it at build time.
+
+ -- Colin Watson <cjwatson@debian.org>  Fri, 29 Mar 2024 19:33:19 +0000
+
 man-db (2.12.0-3~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/control b/debian/control
index aa3fb85..9bde896 100644
--- a/debian/control
+++ b/debian/control
@@ -11,11 +11,12 @@ Build-Depends: autopoint,
                debhelper-compat (= 13),
                dh-apparmor,
                flex,
+               gnulib,
                groff,
                libgdbm-dev,
                libpipeline-dev,
                libseccomp-dev [amd64 arm64 armel armhf hppa i386 mips mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390x x32],
-               pkg-config,
+               pkgconf,
                po4a,
                systemd-dev [linux-any],
                zlib1g-dev,
diff --git a/debian/rules b/debian/rules
index 853503f..bcbd753 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,10 @@ export DEB_BUILD_MAINT_OPTIONS := hardening=+all
 # Use DT_RUNPATH rather than DT_RPATH, so that LD_LIBRARY_PATH works properly.
 export DEB_LDFLAGS_MAINT_APPEND := -Wl,--enable-new-dtags
 
+override_dh_autoreconf:
+	dh_autoreconf ./bootstrap -- \
+		--gnulib-srcdir=/usr/share/gnulib --no-git --skip-po
+
 # --libdir is set here because debhelper defaults to using
 # multiarch paths at compat level 9, which is a reasonable choice in general
 # but unnecessary here.