debian/: Upgrade to Debhelper 10.

Most significantly, this adds multi-arch support.

diff --git a/debian/compat b/debian/compat
index 45a4fb75db864000d01701c0f7a51864bd4daabf..f599e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+10

diff --git a/debian/control b/debian/control
index 63af45e70ece0e4f8f92d4c11b53eda422b56bde..acd83ebaf938044fd0baf3547ba19a4d2a353536 100644 (file)
--- 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 e8c95c6b775dfb700dc1893d43c17b75f65ab4d6..b45c25d5cd9662e642d22436a4e4917ebf906f9b 100644 (file)
--- 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 182f14080b6e145f7a7562c35005a07d7f381fc2..1f1835aaf03cee5129825274e364581170ad5008 100644 (file)
--- 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 6000c39c2f8a3c27b7aebd357cd1568aaa68684d..881796298a308f89ee0bcd3eb7426fcdd76da609 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,2 +1,2 @@
 #! /usr/bin/make -f
-%:; dh $@ --builddirectory=debian/build --with=autoreconf
+%:; dh $@ --builddirectory=debian/build