Drop manual multiarch file handling in favor of dh-exec.

8 files changed, 10 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index a1af29c4..035997c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ pam (1.5.2-3) UNRELEASED; urgency=medium
     installed by the upstream rules
   * Drop obsolete upgrade code from maintainer scripts which is no longer
     used
+  * Drop manual multiarch file handling in favor of dh-exec.
 
  -- Steve Langasek <vorlon@debian.org>  Thu, 18 Aug 2022 18:26:29 +0000
 
diff --git a/debian/clean b/debian/clean
index 18af497a..62f09e76 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,3 +1 @@
 debian/local/pam_getenv.8
-debian/libpam0g-dev.links
-debian/libpam0g-dev.install
diff --git a/debian/control b/debian/control
index f80df13b..873dd8fc 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Uploaders: Sam Hartman <hartmans@debian.org>
 Maintainer: Steve Langasek <vorlon@debian.org>
 Standards-Version: 4.6.0
-Build-Depends: debhelper-compat (= 13), quilt, flex, libdb-dev, libselinux1-dev [linux-any], po-debconf, dh-autoreconf, autopoint, libaudit-dev [linux-any] <!stage1>, pkg-config, libfl-dev, libfl-dev:native, docbook-xsl, docbook-xml, xsltproc, libxml2-utils, w3m
+Build-Depends: debhelper-compat (= 13), dh-exec, quilt, flex, libdb-dev, libselinux1-dev [linux-any], po-debconf, dh-autoreconf, autopoint, libaudit-dev [linux-any] <!stage1>, pkg-config, libfl-dev, libfl-dev:native, docbook-xsl, docbook-xml, xsltproc, libxml2-utils, w3m
 Build-Conflicts-Indep: fop
 Build-Conflicts: libdb4.2-dev, libxcrypt-dev
 Vcs-Browser: https://salsa.debian.org/vorlon/pam
diff --git a/debian/libpam0g-dev.install b/debian/libpam0g-dev.install
new file mode 100755
index 00000000..0d6f4856
--- /dev/null
+++ b/debian/libpam0g-dev.install
@@ -0,0 +1,4 @@
+#!/usr/bin/dh-exec
+usr/include/security/*
+lib/${DEB_HOST_MULTIARCH}/*.a		usr/lib/${DEB_HOST_MULTIARCH}
+lib/${DEB_HOST_MULTIARCH}/pkgconfig/*.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
diff --git a/debian/libpam0g-dev.install.in b/debian/libpam0g-dev.install.in
deleted file mode 100644
index 8288bc01..00000000
--- a/debian/libpam0g-dev.install.in
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/security/*
-lib/@DEB_HOST_MULTIARCH@/*.a		usr/lib/@DEB_HOST_MULTIARCH@
-lib/@DEB_HOST_MULTIARCH@/pkgconfig/*.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig
diff --git a/debian/libpam0g-dev.links b/debian/libpam0g-dev.links
new file mode 100755
index 00000000..5cbfd6db
--- /dev/null
+++ b/debian/libpam0g-dev.links
@@ -0,0 +1,4 @@
+#!/usr/bin/dh-exec
+/lib/${DEB_HOST_MULTIARCH}/libpam.so.0 usr/lib/${DEB_HOST_MULTIARCH}/libpam.so
+/lib/${DEB_HOST_MULTIARCH}/libpamc.so.0 usr/lib/${DEB_HOST_MULTIARCH}/libpamc.so
+/lib/${DEB_HOST_MULTIARCH}/libpam_misc.so.0 usr/lib/${DEB_HOST_MULTIARCH}/libpam_misc.so
diff --git a/debian/libpam0g-dev.links.in b/debian/libpam0g-dev.links.in
deleted file mode 100644
index ee062368..00000000
--- a/debian/libpam0g-dev.links.in
+++ /dev/null
@@ -1,3 +0,0 @@
-/lib/@DEB_HOST_MULTIARCH@/libpam.so.0 usr/lib/@DEB_HOST_MULTIARCH@/libpam.so
-/lib/@DEB_HOST_MULTIARCH@/libpamc.so.0 usr/lib/@DEB_HOST_MULTIARCH@/libpamc.so
-/lib/@DEB_HOST_MULTIARCH@/libpam_misc.so.0 usr/lib/@DEB_HOST_MULTIARCH@/libpam_misc.so
diff --git a/debian/rules b/debian/rules
index 690c6b2b..5470c25a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,6 @@ override_dh_auto_configure:
 # .install files don't have "except for" handling, so we need to exclude
 # our module that doesn't match right here
 override_dh_install:
-	sed -e"s/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g" $(d)/libpam0g-dev.install.in > $(d)/libpam0g-dev.install
 	dh_install
 	# Make sure the md5sums for the templates we ship are
 	# recognized by pam-auth-update.
@@ -61,12 +60,6 @@ override_dh_installman:
 	rm -f $(d)/libpam-modules/usr/share/man/man5/pam.conf.5
 	rm -f $(d)/libpam-modules/usr/share/man/man8/pam_timestamp_check.8
 
-# dh_link doesn't do wildcards, so we can't auto-link to the right per-arch
-# directory
-override_dh_link:
-	sed -e"s/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g" $(d)/libpam0g-dev.links.in > $(d)/libpam0g-dev.links
-	dh_link
-
 # using perms that differ from upstream (sgid instead of suid) /and/ that
 # dh_fixperms doesn't want
 override_dh_fixperms: