From cc3a29ca477fa1943fcc51c643f0a000a557ac4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 2 Dec 2020 20:47:11 +0100 Subject: [PATCH] debian: Switch to debhelper 13 and use its features As per this restrict more the .install files wilcards --- debian/control | 2 +- debian/gir1.2-fprint-2.0.install | 2 +- debian/libfprint-2-2.install | 2 +- debian/libfprint-2-dev.install | 6 +++--- debian/libfprint-2-doc.install | 2 +- debian/libfprint-2-tod-dev.install | 6 +++--- debian/libfprint-2-tod1.install | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/debian/control b/debian/control index 4e725f1e..f1074cf7 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: FingerForce Team Uploaders: Ulises Vitulli , Didier Raboud Marco Trevisan -Build-Depends: debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 13), gobject-introspection, gtk-doc-tools, libcairo-dev , diff --git a/debian/gir1.2-fprint-2.0.install b/debian/gir1.2-fprint-2.0.install index ccdda392..d801923e 100644 --- a/debian/gir1.2-fprint-2.0.install +++ b/debian/gir1.2-fprint-2.0.install @@ -1 +1 @@ -usr/lib/*/girepository-1.0/* +usr/lib/${DEB_HOST_MULTIARCH}/girepository-1.0/FPrint-*.typelib diff --git a/debian/libfprint-2-2.install b/debian/libfprint-2-2.install index cc498ef9..ff020efe 100644 --- a/debian/libfprint-2-2.install +++ b/debian/libfprint-2-2.install @@ -1,2 +1,2 @@ lib/udev/rules.d/ -usr/lib/*/libfprint-[0-9].so.* +usr/lib/${DEB_HOST_MULTIARCH}/libfprint-[0-9].so.* diff --git a/debian/libfprint-2-dev.install b/debian/libfprint-2-dev.install index ef75cd48..377615d7 100644 --- a/debian/libfprint-2-dev.install +++ b/debian/libfprint-2-dev.install @@ -1,4 +1,4 @@ usr/include/libfprint-[0-9]/*.h -usr/lib/*/libfprint-[0-9].so -usr/lib/*/pkgconfig/libfprint-[0-9].pc -usr/share/gir-1.0/* +usr/lib/${DEB_HOST_MULTIARCH}/libfprint-[0-9].so +usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/libfprint-[0-9].pc +usr/share/gir-1.0/FPrint-*.gir diff --git a/debian/libfprint-2-doc.install b/debian/libfprint-2-doc.install index d6da04cd..41cae7c6 100644 --- a/debian/libfprint-2-doc.install +++ b/debian/libfprint-2-doc.install @@ -1 +1 @@ -usr/share/gtk-doc/ +usr/share/gtk-doc/*/libfprint-* diff --git a/debian/libfprint-2-tod-dev.install b/debian/libfprint-2-tod-dev.install index 4094df77..91197c00 100644 --- a/debian/libfprint-2-tod-dev.install +++ b/debian/libfprint-2-tod-dev.install @@ -1,3 +1,3 @@ -usr/include/*/tod-*/* -usr/lib/*/libfprint-*-tod.so -usr/lib/*/pkgconfig/libfprint-*-tod-*.pc +usr/include/libfprint-[0-9]/tod-[0-9]/* +usr/lib/${DEB_HOST_MULTIARCH}/libfprint-[0-9]-tod.so +usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/libfprint-[0-9]-tod-[0-9].pc diff --git a/debian/libfprint-2-tod1.install b/debian/libfprint-2-tod1.install index 9b4ff526..69ecd4e6 100644 --- a/debian/libfprint-2-tod1.install +++ b/debian/libfprint-2-tod1.install @@ -1 +1 @@ -usr/lib/*/libfprint-*-tod.so.* +usr/lib/${DEB_HOST_MULTIARCH}/libfprint-[0-9]-tod.so.*