From b88587432981014e450393f9ae4d48352e267ce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 23 Aug 2023 01:42:15 +0200 Subject: [PATCH 01/16] debian/changelog: Remove fixup line --- debian/changelog | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bbcdd2be..21d39efc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,6 @@ libfprint (1:1.94.6-1) unstable; urgency=medium * debian: Add libfprint-2-tests package * debian/patches: Use assets from correct paths * debian/rules: Always force building udev hwdb (Closes: #1024309) - * fixup! debian/patches: Use assets from correct paths * debian/patches: Remove execution bit from test asset -- Marco Trevisan (Treviño) Wed, 23 Aug 2023 01:11:51 +0200 From af4d774a08e4268eb959478689f7c56775ed8aa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 23 Aug 2023 01:47:13 +0200 Subject: [PATCH 02/16] debian/rules: Remove python cache files on clean Closes: #1047209 --- debian/rules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index 6cd36b5a..cf117dd9 100755 --- a/debian/rules +++ b/debian/rules @@ -20,3 +20,7 @@ override_dh_auto_configure: override_dh_auto_test: dh_auto_test -- -C $(BUILDDIR) --timeout-multiplier 5 + +override_dh_auto_clean: + rm -rf tests/__pycache__ + dh_auto_clean From 5b04729625cb87c647897fcc8d38646619287204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 24 Aug 2023 09:17:56 +0200 Subject: [PATCH 03/16] debian/control: Update standards-version to 4.6.2, no change needed --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 91273c3b..621b4e0c 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Build-Depends: debhelper-compat (= 13), python3-gi , umockdev Build-Depends-Indep: libglib2.0-doc , libgusb-doc -Standards-Version: 4.6.1 +Standards-Version: 4.6.2 Homepage: https://www.freedesktop.org/wiki/Software/fprint/libfprint Vcs-Browser: https://salsa.debian.org/debian/libfprint Vcs-Git: https://salsa.debian.org/debian/libfprint.git From b2828faa4bd6846457e273dd3c66db9a290d9095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 24 Aug 2023 09:18:25 +0200 Subject: [PATCH 04/16] Update changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 21d39efc..a0ee6d54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libfprint (1:1.94.6-2) UNRELEASED; urgency=medium + + * debian/control: Update standards-version to 4.6.2, no change needed + + -- Marco Trevisan (Treviño) Thu, 24 Aug 2023 09:18:24 +0200 + libfprint (1:1.94.6-1) unstable; urgency=medium * New upstream release From ccb57e4a3afe6e51d243836364f8c309a28a3e37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 24 Aug 2023 09:19:31 +0200 Subject: [PATCH 05/16] Upload to unstable --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a0ee6d54..8121f7d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libfprint (1:1.94.6-2) UNRELEASED; urgency=medium +libfprint (1:1.94.6-2) unstable; urgency=medium * debian/control: Update standards-version to 4.6.2, no change needed - -- Marco Trevisan (Treviño) Thu, 24 Aug 2023 09:18:24 +0200 + -- Marco Trevisan (Treviño) Thu, 24 Aug 2023 09:19:31 +0200 libfprint (1:1.94.6-1) unstable; urgency=medium From b9fefd1ed07496be160315c338f681b2c510f2bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 20 Feb 2024 06:30:08 +0100 Subject: [PATCH 06/16] New upstream release --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8121f7d8..5a2a2457 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libfprint (1:1.94.7-1) UNRELEASED; urgency=medium + + * New upstream release + + -- Marco Trevisan (Treviño) Tue, 20 Feb 2024 06:30:08 +0100 + libfprint (1:1.94.6-2) unstable; urgency=medium * debian/control: Update standards-version to 4.6.2, no change needed From d5f19e380bafb8bb599badff5036cb96efa0f467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 20 Feb 2024 06:30:10 +0100 Subject: [PATCH 07/16] debian/libfprint-2-2.postinst: Devices triggers updated --- debian/changelog | 1 + debian/libfprint-2-2.postinst | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5a2a2457..9598fde3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libfprint (1:1.94.7-1) UNRELEASED; urgency=medium * New upstream release + * debian/libfprint-2-2.postinst: Devices triggers updated -- Marco Trevisan (Treviño) Tue, 20 Feb 2024 06:30:08 +0100 diff --git a/debian/libfprint-2-2.postinst b/debian/libfprint-2-2.postinst index 74792f0d..d77fb5d4 100644 --- a/debian/libfprint-2-2.postinst +++ b/debian/libfprint-2-2.postinst @@ -55,6 +55,8 @@ if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2 udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=5501 || true udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0570 || true udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0571 || true + udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0582 || true + udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=05a1 || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0903 || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0907 || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c01 || true @@ -124,6 +126,9 @@ if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2 udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c8d || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c99 || true udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0603 || true + udevadm trigger --action=add --attr-match=idVendor=2808 --attr-match=idProduct=9e48 || true + udevadm trigger --action=add --attr-match=idVendor=2808 --attr-match=idProduct=d979 || true + udevadm trigger --action=add --attr-match=idVendor=2808 --attr-match=idProduct=a959 || true udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=ffe0 || true udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=a305 || true udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=da04 || true @@ -147,6 +152,7 @@ if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2 udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=63bc || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=63cc || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6496 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6582 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6584 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=658c || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6592 || true @@ -155,6 +161,7 @@ if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2 udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=659c || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6a94 || true udevadm trigger --action=add --attr-match=idVendor=298d --attr-match=idProduct=1010 || true + udevadm trigger --action=add --attr-match=idVendor=0bda --attr-match=idProduct=5813 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00bd || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00df || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00f9 || true @@ -164,11 +171,14 @@ if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2 udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00f0 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0103 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0123 || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0124 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0126 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0129 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0168 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=015f || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0104 || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0173 || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0106 || true udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=2016 || true udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=1000 || true udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=1001 || true @@ -193,6 +203,7 @@ if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2 udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0017 || true udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0018 || true udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0091 || true + udevadm trigger --action=add --attr-match=idVendor=047d --attr-match=idProduct=00f2 || true udevadm trigger --action=add --attr-match=idVendor=04e8 --attr-match=idProduct=730b || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=036b || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c00 || true @@ -200,12 +211,16 @@ if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2 udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c57 || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c5e || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c5a || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c6c || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c70 || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c72 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c77 || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=2706 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=3032 || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=3057 || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=3104 || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=310d || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=3128 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0081 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0088 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=008a || true @@ -239,6 +254,7 @@ if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2 udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=0007 || true udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=9200 || true udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=9800 || true + udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=e340 || true udevadm trigger --action=add --attr-match=idVendor=1188 --attr-match=idProduct=9545 || true udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0007 || true udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=003a || true @@ -251,12 +267,14 @@ if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2 udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0097 || true udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=009d || true udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=00ab || true + udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=00a6 || true udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=1002 || true udevadm trigger --action=add --attr-match=idVendor=1491 --attr-match=idProduct=0088 || true udevadm trigger --action=add --attr-match=idVendor=16d1 --attr-match=idProduct=1027 || true udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0300 || true udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0575 || true udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0576 || true + udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0577 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5042 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5110 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5117 || true @@ -284,6 +302,8 @@ if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2 udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5740 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5e0a || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=581a || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=589a || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6382 || true udevadm trigger --action=add --attr-match=idVendor=2808 --attr-match=idProduct=9338 || true udevadm trigger --action=add --attr-match=idVendor=2808 --attr-match=idProduct=93a9 || true udevadm trigger --action=add --attr-match=idVendor=298d --attr-match=idProduct=2020 || true From afd5ef469092f98735ef4dc83deee567e4d0bd67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 20 Feb 2024 06:34:26 +0100 Subject: [PATCH 08/16] debian/patches: Drop, applied upstream --- debian/patches/series | 2 - ...GTest-utils-to-generate-assets-names.patch | 78 ------------------- ...e.pcapng-Remove-execution-permission.patch | 13 ---- 3 files changed, 93 deletions(-) delete mode 100644 debian/patches/series delete mode 100644 debian/patches/tests-Use-native-GTest-utils-to-generate-assets-names.patch delete mode 100644 debian/patches/tests-egis0570-capture.pcapng-Remove-execution-permission.patch diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 2c8bc6c8..00000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -tests-Use-native-GTest-utils-to-generate-assets-names.patch -tests-egis0570-capture.pcapng-Remove-execution-permission.patch diff --git a/debian/patches/tests-Use-native-GTest-utils-to-generate-assets-names.patch b/debian/patches/tests-Use-native-GTest-utils-to-generate-assets-names.patch deleted file mode 100644 index 5c38c511..00000000 --- a/debian/patches/tests-Use-native-GTest-utils-to-generate-assets-names.patch +++ /dev/null @@ -1,78 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Thu, 17 Aug 2023 21:17:26 +0200 -Subject: tests: Use native GTest utils to generate assets names - -Origin: https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/1372d6f08 ---- - tests/meson.build | 14 +++++++++----- - tests/test-fpi-assembling.c | 4 +--- - 2 files changed, 10 insertions(+), 8 deletions(-) - -diff --git a/tests/meson.build b/tests/meson.build -index b172c1a..31040d1 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -6,6 +6,8 @@ envs.set('G_MESSAGES_DEBUG', 'all') - # Setup paths - envs.set('MESON_SOURCE_ROOT', meson.project_source_root()) - envs.set('MESON_BUILD_ROOT', meson.project_build_root()) -+envs.set('G_TEST_SRCDIR', meson.current_source_dir()) -+envs.set('G_TEST_BUILDDIR', meson.current_build_dir()) - envs.prepend('LD_LIBRARY_PATH', meson.project_build_root() / 'libfprint') - - # Set FP_DEVICE_EMULATION so that drivers can adapt (e.g. to use fixed -@@ -71,6 +73,12 @@ envs_str = run_command(python3, '-c', env_parser_cmd, - env: envs, - check: installed_tests).stdout().strip() - -+envs_str = ' '.join([ -+ envs_str, -+ 'G_TEST_SRCDIR=' + installed_tests_testdir, -+ 'G_TEST_BUILDDIR=' + installed_tests_execdir, -+]) -+ - if get_option('introspection') - envs.prepend('GI_TYPELIB_PATH', meson.project_build_root() / 'libfprint') - virtual_devices_tests = [ -@@ -247,10 +255,6 @@ endif - - unit_tests_deps = { 'fpi-assembling' : [cairo_dep] } - --test_config = configuration_data() --test_config.set_quoted('SOURCE_ROOT', meson.project_source_root()) --test_config_h = configure_file(output: 'test-config.h', configuration: test_config) -- - foreach test_name: unit_tests - if unit_tests_deps.has_key(test_name) - missing_deps = false -@@ -278,7 +282,7 @@ foreach test_name: unit_tests - - basename = 'test-' + test_name - test_exe = executable(basename, -- sources: [basename + '.c', test_config_h], -+ sources: basename + '.c', - dependencies: [ libfprint_private_dep ] + extra_deps, - c_args: common_cflags, - link_whole: test_utils, -diff --git a/tests/test-fpi-assembling.c b/tests/test-fpi-assembling.c -index 94b8fe5..c6dae6f 100644 ---- a/tests/test-fpi-assembling.c -+++ b/tests/test-fpi-assembling.c -@@ -22,7 +22,6 @@ - #include - #include "fpi-assembling.h" - #include "fpi-image.h" --#include "test-config.h" - - typedef struct - { -@@ -67,8 +66,7 @@ test_frame_assembling (void) - g_autoptr(FpImage) fp_img = NULL; - GSList *frames = NULL; - -- g_assert_false (SOURCE_ROOT == NULL); -- path = g_build_path (G_DIR_SEPARATOR_S, SOURCE_ROOT, "tests", "vfs5011", "capture.png", NULL); -+ path = g_test_build_filename (G_TEST_DIST, "vfs5011", "capture.png", NULL); - - img = cairo_image_surface_create_from_png (path); - data = cairo_image_surface_get_data (img); diff --git a/debian/patches/tests-egis0570-capture.pcapng-Remove-execution-permission.patch b/debian/patches/tests-egis0570-capture.pcapng-Remove-execution-permission.patch deleted file mode 100644 index 62706ec1..00000000 --- a/debian/patches/tests-egis0570-capture.pcapng-Remove-execution-permission.patch +++ /dev/null @@ -1,13 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Wed, 23 Aug 2023 01:04:33 +0200 -Subject: tests/egis0570/capture.pcapng: Remove execution permission - -Origin: https://gitlab.freedesktop.org/libfprint/libfprint/-/merge_requests/445 ---- - tests/egis0570/capture.pcapng | Bin - 1 file changed, 0 insertions(+), 0 deletions(-) - mode change 100755 => 100644 tests/egis0570/capture.pcapng - -diff --git a/tests/egis0570/capture.pcapng b/tests/egis0570/capture.pcapng -old mode 100755 -new mode 100644 From 005af841f8d2cb0d8bcc8ad9e5986651683524ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 20 Feb 2024 06:34:45 +0100 Subject: [PATCH 09/16] debian: use udev.pc to place udev rules and hwdb Closes: #1058843 --- debian/control | 1 + debian/libfprint-2-2.install | 4 ++-- debian/rules | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index 621b4e0c..d43565e8 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Build-Depends: debhelper-compat (= 13), python3 , python3-cairo , python3-gi , + systemd-dev, umockdev Build-Depends-Indep: libglib2.0-doc , libgusb-doc Standards-Version: 4.6.2 diff --git a/debian/libfprint-2-2.install b/debian/libfprint-2-2.install index be3d230c..8dd1e0af 100644 --- a/debian/libfprint-2-2.install +++ b/debian/libfprint-2-2.install @@ -1,3 +1,3 @@ -lib/udev/hwdb.d/ -lib/udev/rules.d/ +usr/lib/udev/hwdb.d/ +usr/lib/udev/rules.d/ usr/lib/${DEB_HOST_MULTIARCH}/libfprint-[0-9].so.* diff --git a/debian/rules b/debian/rules index cf117dd9..787a8e5c 100755 --- a/debian/rules +++ b/debian/rules @@ -7,8 +7,7 @@ BUILDDIR = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE) # Configuration arguments CONFIG_ARGS = \ -Dudev_hwdb=enabled \ - -Dudev_hwdb_dir=/lib/udev/hwdb.d \ - -Dudev_rules_dir=/lib/udev/rules.d \ + -Dudev_rules=enabled \ -Ddrivers=all \ -Dgtk-examples=false From 55036d3e5fcc619cbaaddb7d54c6fb0562399f84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 20 Feb 2024 06:46:09 +0100 Subject: [PATCH 10/16] Update changelog --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9598fde3..6ff2be5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ libfprint (1:1.94.7-1) UNRELEASED; urgency=medium * New upstream release * debian/libfprint-2-2.postinst: Devices triggers updated + * debian/patches: Drop, applied upstream + * debian: use udev.pc to place udev rules and hwdb (Closes: #1058843) - -- Marco Trevisan (Treviño) Tue, 20 Feb 2024 06:30:08 +0100 + -- Marco Trevisan (Treviño) Tue, 20 Feb 2024 06:45:31 +0100 libfprint (1:1.94.6-2) unstable; urgency=medium From 034efaa849819c68e2f83c850574aab543b5ad49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 20 Feb 2024 06:46:40 +0100 Subject: [PATCH 11/16] Upload to unstable --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6ff2be5e..509746e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libfprint (1:1.94.7-1) UNRELEASED; urgency=medium +libfprint (1:1.94.7-1) unstable; urgency=medium * New upstream release * debian/libfprint-2-2.postinst: Devices triggers updated * debian/patches: Drop, applied upstream * debian: use udev.pc to place udev rules and hwdb (Closes: #1058843) - -- Marco Trevisan (Treviño) Tue, 20 Feb 2024 06:45:31 +0100 + -- Marco Trevisan (Treviño) Tue, 20 Feb 2024 06:46:40 +0100 libfprint (1:1.94.6-2) unstable; urgency=medium From 9e05793948a57f7797bf1ba6fcbf1319a9097b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 20 Feb 2024 08:28:59 +0100 Subject: [PATCH 12/16] debian/patches: Cherry-pick patches to ignore tests missing dependencies Closes: #1059027 --- .../patches/build-Look-for-sh-just-once.patch | 70 +++++++++++++++++++ ...st-if-the-test-requires-it-during-in.patch | 36 ++++++++++ debian/patches/series | 2 + 3 files changed, 108 insertions(+) create mode 100644 debian/patches/build-Look-for-sh-just-once.patch create mode 100644 debian/patches/build-tests-Skip-a-test-if-the-test-requires-it-during-in.patch create mode 100644 debian/patches/series diff --git a/debian/patches/build-Look-for-sh-just-once.patch b/debian/patches/build-Look-for-sh-just-once.patch new file mode 100644 index 00000000..2dadcd6f --- /dev/null +++ b/debian/patches/build-Look-for-sh-just-once.patch @@ -0,0 +1,70 @@ +From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= +Date: Tue, 20 Feb 2024 08:22:42 +0100 +Subject: build: Look for sh just once + +Origin: https://gitlab.freedesktop.org/libfprint/libfprint/commit/4b72f27d +Forwarded: yes +--- + meson.build | 1 + + tests/meson.build | 10 +++++----- + 2 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/meson.build b/meson.build +index 435827c..28ee27a 100644 +--- a/meson.build ++++ b/meson.build +@@ -91,6 +91,7 @@ gusb_dep = dependency('gusb', version: '>= 0.2.0') + mathlib_dep = cc.find_library('m', required: false) + + # The following dependencies are only used for tests ++sh = find_program('sh', required: true) + cairo_dep = dependency('cairo', required: false) + + # introspection scanning and Gio-2.0.gir +diff --git a/tests/meson.build b/tests/meson.build +index f68ed40..8c8f5d0 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -151,7 +151,7 @@ if get_option('introspection') + endif + else + test(vdtest, +- find_program('sh'), ++ sh, + args: ['-c', 'exit 77'] + ) + endif +@@ -205,7 +205,7 @@ if get_option('introspection') + endif + else + test(driver_test, +- find_program('sh'), ++ sh, + args: ['-c', 'exit 77'] + ) + endif +@@ -224,13 +224,13 @@ if get_option('introspection') + else + warning('Skipping all driver tests as introspection bindings are missing') + test('virtual-image', +- find_program('sh'), ++ sh, + args: ['-c', 'exit 77'] + ) + + foreach driver_test: drivers_tests + test(driver_test, +- find_program('sh'), ++ sh, + args: ['-c', 'exit 77'] + ) + endforeach +@@ -273,7 +273,7 @@ foreach test_name: unit_tests + # Create a dummy test that always skips instead + warning('Test @0@ cannot be compiled due to missing dependencies'.format(test_name)) + test(test_name, +- find_program('sh'), ++ sh, + suite: ['unit-tests'], + args: ['-c', 'exit 77'], + ) diff --git a/debian/patches/build-tests-Skip-a-test-if-the-test-requires-it-during-in.patch b/debian/patches/build-tests-Skip-a-test-if-the-test-requires-it-during-in.patch new file mode 100644 index 00000000..ad363060 --- /dev/null +++ b/debian/patches/build-tests-Skip-a-test-if-the-test-requires-it-during-in.patch @@ -0,0 +1,36 @@ +From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= +Date: Tue, 20 Feb 2024 08:24:12 +0100 +Subject: build/tests: Skip a test if the test requires it during inspection + +In case we don't have dependencies, we should skip the test, otherwise +we can just fail at test time + +Origin: https://gitlab.freedesktop.org/libfprint/libfprint/commit/7dbb21e7 +Forwarded: yes +--- + tests/meson.build | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/tests/meson.build b/tests/meson.build +index 8c8f5d0..dc3b70e 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -100,11 +100,17 @@ if get_option('introspection') + base_args = files(vdtest + '.py') + suite = ['virtual-driver'] + +- r = run_command(unittest_inspector, files(vdtest + '.py'), check: true) ++ r = run_command(unittest_inspector, files(vdtest + '.py'), check: false) + unit_tests = r.stdout().strip().split('\n') + + if r.returncode() == 0 and unit_tests.length() > 0 + suite += vdtest ++ elif r.returncode() == 77 ++ test(vdtest, ++ sh, ++ args: ['-c', 'exit 77'] ++ ) ++ continue + else + unit_tests = [vdtest] + endif diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..00346adf --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +build-Look-for-sh-just-once.patch +build-tests-Skip-a-test-if-the-test-requires-it-during-in.patch From 20ba90212b79d623ea01a40a495b04a0e0829e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 20 Feb 2024 08:33:29 +0100 Subject: [PATCH 13/16] debian/control: Add build-dependency on gir1.2-{gobject,gio}-2.0-dev --- debian/control | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/control b/debian/control index d43565e8..5d1e0608 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,8 @@ Maintainer: FingerForce Team Uploaders: Ulises Vitulli , Marco Trevisan Build-Depends: debhelper-compat (= 13), + gir1.2-gobject-2.0-dev , + gir1.2-gio-2.0-dev , gobject-introspection, gtk-doc-tools, libcairo-dev , From c2b0b14c79bd5ad89c442a966dee1988b56e8769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 20 Feb 2024 08:39:15 +0100 Subject: [PATCH 14/16] debian/control: Add gir depends and provides fields to dev package --- debian/control | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 5d1e0608..77ee6a3a 100644 --- a/debian/control +++ b/debian/control @@ -55,7 +55,9 @@ Architecture: any Multi-Arch: same Depends: gir1.2-fprint-2.0 (= ${binary:Version}), libfprint-2-2 (= ${binary:Version}), - ${misc:Depends} + ${misc:Depends}, + ${gir:Depends}, +Provides: ${gir:Provides}, Suggests: libfprint-2-doc Description: async fingerprint library of fprint project, development headers The fprint project aims to support for consumer fingerprint reader devices. From 4427093248e41f66401f5f2a8c4f9393269ab93e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 20 Feb 2024 08:42:20 +0100 Subject: [PATCH 15/16] Update changelog --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 509746e7..0fcf723e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libfprint (1:1.94.7-2) UNRELEASED; urgency=medium + + * debian/patches: Cherry-pick patches to ignore tests missing dependencies + (Closes: #1059027) + * debian/control: Add build-dependency on gir1.2-{gobject,gio}-2.0-dev + * debian/control: Add gir depends and provides fields to dev package + + -- Marco Trevisan (Treviño) Tue, 20 Feb 2024 08:41:54 +0100 + libfprint (1:1.94.7-1) unstable; urgency=medium * New upstream release From 9e53d14fc49d4dbd05123b7cc8f013e601e89768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 20 Feb 2024 08:42:26 +0100 Subject: [PATCH 16/16] Upload to unstable --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0fcf723e..a117609b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libfprint (1:1.94.7-2) UNRELEASED; urgency=medium +libfprint (1:1.94.7-2) unstable; urgency=medium * debian/patches: Cherry-pick patches to ignore tests missing dependencies (Closes: #1059027) * debian/control: Add build-dependency on gir1.2-{gobject,gio}-2.0-dev * debian/control: Add gir depends and provides fields to dev package - -- Marco Trevisan (Treviño) Tue, 20 Feb 2024 08:41:54 +0100 + -- Marco Trevisan (Treviño) Tue, 20 Feb 2024 08:42:26 +0100 libfprint (1:1.94.7-1) unstable; urgency=medium