From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 7 Jul 2024 22:42:31 +0000 (+0100)
Subject: debian/: Upgrade to Debhelper 10.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/checkpath/commitdiff_plain/76384fbb1526e303477dd9655c80162c72b77a48

debian/: Upgrade to Debhelper 10.

Most significantly, this adds multi-arch support.
---

diff --git a/debian/compat b/debian/compat
index 45a4fb7..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+10
diff --git a/debian/control b/debian/control
index 63af45e..acd83eb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: checkpath
 Section: admin
 Priority: extra
 Build-Depends:
-	debhelper (>= 8),
+	debhelper (>= 10),
 	autoconf, automake, libtool, autoconf-archive,
 	pkg-config,
 	mlib-dev (>= 2.0.4)
@@ -34,6 +34,7 @@ Description: Checks PATH variable for security
 
 Package: libcheckpath1
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends}
 Description: Checks paths for security
@@ -45,6 +46,7 @@ Description: Checks paths for security
 
 Package: libcheckpath-dev
 Architecture: any
+Multi-Arch: same
 Section: devel
 Depends: libcheckpath1 (= ${binary:Version}), mlib-dev (>= 2.0.0), libc6-dev
 Description: Checks paths for security
diff --git a/debian/libcheckpath-dev.install b/debian/libcheckpath-dev.install
index e8c95c6..b45c25d 100644
--- a/debian/libcheckpath-dev.install
+++ b/debian/libcheckpath-dev.install
@@ -1,6 +1,6 @@
 debian/tmp/usr/include
-debian/tmp/usr/lib/libcheckpath.a
-debian/tmp/usr/lib/libcheckpath.la
-debian/tmp/usr/lib/libcheckpath.so
-debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/*/libcheckpath.a
+debian/tmp/usr/lib/*/libcheckpath.la
+debian/tmp/usr/lib/*/libcheckpath.so
+debian/tmp/usr/lib/*/pkgconfig
 debian/tmp/usr/share/man/man3
diff --git a/debian/libcheckpath1.install b/debian/libcheckpath1.install
index 182f140..1f1835a 100644
--- a/debian/libcheckpath1.install
+++ b/debian/libcheckpath1.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libcheckpath.so.*
+debian/tmp/usr/lib/*/libcheckpath.so.*
diff --git a/debian/rules b/debian/rules
index 6000c39..8817962 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,2 +1,2 @@
 #! /usr/bin/make -f
-%:; dh $@ --builddirectory=debian/build --with=autoreconf
+%:; dh $@ --builddirectory=debian/build