diff --git a/debian/changelog b/debian/changelog index 32e08928..9d92c816 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,24 @@ libfprint (1:1.94.7+tod1-1) UNRELEASED; urgency=medium -- Marco Trevisan (Treviño) Tue, 20 Feb 2024 09:12:17 +0100 +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:42:26 +0100 + +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:46:40 +0100 + libfprint (1:1.94.6+tod1-0ubuntu3) mantic; urgency=medium [ Marco Trevisan (Treviño) ] @@ -46,6 +64,12 @@ libfprint (1:1.94.6+tod1-0ubuntu1) mantic; urgency=medium -- Marco Trevisan (Treviño) Thu, 17 Aug 2023 21:53:59 +0200 +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:19:31 +0200 + libfprint (1:1.94.6-1) unstable; urgency=medium * New upstream release @@ -54,7 +78,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 diff --git a/debian/control b/debian/control index 36baf65a..e797d850 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,8 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: FingerForce Team Uploaders: 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 , @@ -18,9 +20,10 @@ 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.1 +Standards-Version: 4.6.2 Homepage: https://www.freedesktop.org/wiki/Software/fprint/libfprint Vcs-Browser: https://salsa.debian.org/ubuntu-dev-team/libfprint Vcs-Git: https://salsa.debian.org/ubuntu-dev-team/libfprint.git -b ubuntu @@ -52,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. 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/patches/series b/debian/patches/series deleted file mode 100644 index 062b68b5..00000000 --- a/debian/patches/series +++ /dev/null @@ -1,6 +0,0 @@ -tests-Use-native-GTest-utils-to-generate-assets-names.patch -tests-egis0570-capture.pcapng-Remove-execution-permission.patch -tests-Remove-executable-bits-from-installed-libraries.patch -tests-Install-current-TOD-driver-in-installed-tests-and-u.patch -tests-Use-tests-execdir-install-rpath.patch -synaptics-fix-enroll_identify-problem-after-user-reset-da.patch diff --git a/debian/patches/synaptics-fix-enroll_identify-problem-after-user-reset-da.patch b/debian/patches/synaptics-fix-enroll_identify-problem-after-user-reset-da.patch deleted file mode 100644 index 4ba90e5e..00000000 --- a/debian/patches/synaptics-fix-enroll_identify-problem-after-user-reset-da.patch +++ /dev/null @@ -1,92 +0,0 @@ -From: Vincent Huang -Date: Tue, 4 Jul 2023 15:45:36 +0800 -Subject: synaptics: fix enroll_identify problem after user reset database - ---- - libfprint/drivers/synaptics/synaptics.c | 23 ++++++++++++++--------- - libfprint/drivers/synaptics/synaptics.h | 1 + - 2 files changed, 15 insertions(+), 9 deletions(-) - -diff --git a/libfprint/drivers/synaptics/synaptics.c b/libfprint/drivers/synaptics/synaptics.c -index f13b820..99717c1 100644 ---- a/libfprint/drivers/synaptics/synaptics.c -+++ b/libfprint/drivers/synaptics/synaptics.c -@@ -106,7 +106,11 @@ cmd_receive_cb (FpiUsbTransfer *transfer, - - if (self->cmd_complete_on_removal) - { -- fpi_ssm_mark_completed (transfer->ssm); -+ if (self->delay_error) -+ fpi_ssm_mark_failed (transfer->ssm, -+ g_steal_pointer (&self->delay_error)); -+ else -+ fpi_ssm_mark_completed (transfer->ssm); - return; - } - } -@@ -641,18 +645,20 @@ verify (FpDevice *device) - } - - static void --identify_complete_after_finger_removal (FpiDeviceSynaptics *self) -+identify_complete_after_finger_removal (FpiDeviceSynaptics *self, GError *error) - { - FpDevice *device = FP_DEVICE (self); - - if (self->finger_on_sensor) - { - fp_dbg ("delaying identify report until after finger removal!"); -+ g_propagate_error (&self->delay_error, error); -+ - self->cmd_complete_on_removal = TRUE; - } - else - { -- fpi_device_identify_complete (device, NULL); -+ fpi_device_identify_complete (device, error); - } - } - -@@ -702,19 +708,18 @@ identify_msg_cb (FpiDeviceSynaptics *self, - fp_info ("Match error occurred"); - fpi_device_identify_report (device, NULL, NULL, - fpi_device_retry_new (FP_DEVICE_RETRY_GENERAL)); -- identify_complete_after_finger_removal (self); -+ identify_complete_after_finger_removal (self, NULL); - } - else if (resp->result == BMKT_FP_NO_MATCH) - { - fp_info ("Print didn't match"); - fpi_device_identify_report (device, NULL, NULL, NULL); -- identify_complete_after_finger_removal (self); -+ identify_complete_after_finger_removal (self, NULL); - } -- else if (resp->result == BMKT_FP_DATABASE_NO_RECORD_EXISTS) -+ else if (resp->result == BMKT_FP_DATABASE_NO_RECORD_EXISTS || resp->result == BMKT_FP_DATABASE_EMPTY) - { - fp_info ("Print is not in database"); -- fpi_device_identify_complete (device, -- fpi_device_error_new (FP_DEVICE_ERROR_DATA_NOT_FOUND)); -+ identify_complete_after_finger_removal (self, fpi_device_error_new (FP_DEVICE_ERROR_DATA_NOT_FOUND)); - } - else - { -@@ -750,7 +755,7 @@ identify_msg_cb (FpiDeviceSynaptics *self, - else - fpi_device_identify_report (device, NULL, print, NULL); - -- identify_complete_after_finger_removal (self); -+ identify_complete_after_finger_removal (self, NULL); - } - } - } -diff --git a/libfprint/drivers/synaptics/synaptics.h b/libfprint/drivers/synaptics/synaptics.h -index 5fc0a19..6138db3 100644 ---- a/libfprint/drivers/synaptics/synaptics.h -+++ b/libfprint/drivers/synaptics/synaptics.h -@@ -127,4 +127,5 @@ struct _FpiDeviceSynaptics - - struct syna_enroll_resp_data enroll_resp_data; - syna_state_t state; -+ GError *delay_error; - }; diff --git a/debian/patches/tests-Install-current-TOD-driver-in-installed-tests-and-u.patch b/debian/patches/tests-Install-current-TOD-driver-in-installed-tests-and-u.patch deleted file mode 100644 index 19621346..00000000 --- a/debian/patches/tests-Install-current-TOD-driver-in-installed-tests-and-u.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Thu, 17 Aug 2023 20:50:09 +0200 -Subject: tests: Install current TOD driver in installed tests and use it - ---- - tests/meson.build | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/tests/meson.build b/tests/meson.build -index 1eb2b4b..2832158 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -139,6 +139,7 @@ if get_option('introspection') - 'LD_LIBRARY_PATH=' + installed_tests_libdir, - 'FP_PRINTS_PATH=' + installed_tests_testdir / 'prints', - # FIXME: Adding this requires gnome-desktop-testing!12 -+ # 'GI_TYPELIB_PATH=' + installed_tests_libdir / 'girepository-1.0', - ]), - 'extra_content': '', - }, -@@ -393,7 +394,8 @@ if get_option('tod') - ], - include_directories: include_directories('../libfprint'), - dependencies: deps, -- install: false -+ install: installed_tests, -+ install_dir: installed_tests_execdir / 'tod-drivers' / 'current', - ) - - fp_todv1_enums = gnome.mkenums_simple('fp-todv1-enums', -@@ -498,8 +500,10 @@ if get_option('tod') - endif - tod_test_envs = tod_envs - tod_test_envs.prepend('FP_DRIVERS_WHITELIST', tod_driver) -- tod_test_envs.set('FP_TOD_DRIVERS_DIR', meson.current_source_dir() / -- tod_driver_info.get('tod-dir')) -+ tod_test_envs.set('FP_TOD_DRIVERS_DIR', -+ tod_driver_info.get('tod-dir') == meson.current_build_dir() ? -+ meson.current_build_dir() : -+ meson.current_source_dir() / tod_driver_info.get('tod-dir')) - tod_test_envs.set('FP_TOD_TEST_DRIVER_NAME', tod_driver) - - test(tod_test_name + '-' + tod_driver, -@@ -524,7 +528,8 @@ if get_option('tod') - 'env': ' '.join([ - tod_envs_str, - 'FP_TOD_DRIVERS_DIR=' + installed_tests_execdir / -- tod_driver_info.get('tod-dir'), -+ (tod_driver_info.get('tod-dir') == meson.current_build_dir() ? -+ 'tod-drivers' / 'current' : tod_driver_info.get('tod-dir')), - ]), - 'extra_content': '', - }, diff --git a/debian/patches/tests-Remove-executable-bits-from-installed-libraries.patch b/debian/patches/tests-Remove-executable-bits-from-installed-libraries.patch deleted file mode 100644 index 5fdff68d..00000000 --- a/debian/patches/tests-Remove-executable-bits-from-installed-libraries.patch +++ /dev/null @@ -1,68 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Mon, 21 Aug 2023 12:42:02 +0200 -Subject: tests: Remove executable bits from installed libraries - -(cherry picked from commit 54f02c77991506bd28d375a19ccdac49a12ba9ae) ---- - .../libdevice-fake-tod-ssm-test-v1+1.90.1-x86_64.so | Bin - .../libdevice-fake-tod-test-driver-v1+1.90.1-x86_64.so | Bin - .../libdevice-fake-tod-ssm-test-v1+1.90.2-x86_64.so | Bin - .../libdevice-fake-tod-test-driver-v1+1.90.2-x86_64.so | Bin - .../libdevice-fake-tod-ssm-test-v1+1.90.3-x86_64.so | Bin - .../libdevice-fake-tod-test-driver-v1+1.90.3-x86_64.so | Bin - .../libdevice-fake-tod-ssm-test-v1+1.90.5-x86_64.so | Bin - .../libdevice-fake-tod-test-driver-v1+1.90.5-x86_64.so | Bin - .../libdevice-fake-tod-ssm-test-v1+1.94.0-x86_64.so | Bin - .../libdevice-fake-tod-test-driver-v1+1.94.0-x86_64.so | Bin - .../libdevice-fake-tod-ssm-test-v1+1.94.3-x86_64.so | Bin - .../libdevice-fake-tod-test-driver-v1+1.94.3-x86_64.so | Bin - 12 files changed, 0 insertions(+), 0 deletions(-) - mode change 100755 => 100644 tests/tod-drivers/tod-x86_64-v1+1.90.1/libdevice-fake-tod-ssm-test-v1+1.90.1-x86_64.so - mode change 100755 => 100644 tests/tod-drivers/tod-x86_64-v1+1.90.1/libdevice-fake-tod-test-driver-v1+1.90.1-x86_64.so - mode change 100755 => 100644 tests/tod-drivers/tod-x86_64-v1+1.90.2/libdevice-fake-tod-ssm-test-v1+1.90.2-x86_64.so - mode change 100755 => 100644 tests/tod-drivers/tod-x86_64-v1+1.90.2/libdevice-fake-tod-test-driver-v1+1.90.2-x86_64.so - mode change 100755 => 100644 tests/tod-drivers/tod-x86_64-v1+1.90.3/libdevice-fake-tod-ssm-test-v1+1.90.3-x86_64.so - mode change 100755 => 100644 tests/tod-drivers/tod-x86_64-v1+1.90.3/libdevice-fake-tod-test-driver-v1+1.90.3-x86_64.so - mode change 100755 => 100644 tests/tod-drivers/tod-x86_64-v1+1.90.5/libdevice-fake-tod-ssm-test-v1+1.90.5-x86_64.so - mode change 100755 => 100644 tests/tod-drivers/tod-x86_64-v1+1.90.5/libdevice-fake-tod-test-driver-v1+1.90.5-x86_64.so - mode change 100755 => 100644 tests/tod-drivers/tod-x86_64-v1+1.94.0/libdevice-fake-tod-ssm-test-v1+1.94.0-x86_64.so - mode change 100755 => 100644 tests/tod-drivers/tod-x86_64-v1+1.94.0/libdevice-fake-tod-test-driver-v1+1.94.0-x86_64.so - mode change 100755 => 100644 tests/tod-drivers/tod-x86_64-v1+1.94.3/libdevice-fake-tod-ssm-test-v1+1.94.3-x86_64.so - mode change 100755 => 100644 tests/tod-drivers/tod-x86_64-v1+1.94.3/libdevice-fake-tod-test-driver-v1+1.94.3-x86_64.so - -diff --git a/tests/tod-drivers/tod-x86_64-v1+1.90.1/libdevice-fake-tod-ssm-test-v1+1.90.1-x86_64.so b/tests/tod-drivers/tod-x86_64-v1+1.90.1/libdevice-fake-tod-ssm-test-v1+1.90.1-x86_64.so -old mode 100755 -new mode 100644 -diff --git a/tests/tod-drivers/tod-x86_64-v1+1.90.1/libdevice-fake-tod-test-driver-v1+1.90.1-x86_64.so b/tests/tod-drivers/tod-x86_64-v1+1.90.1/libdevice-fake-tod-test-driver-v1+1.90.1-x86_64.so -old mode 100755 -new mode 100644 -diff --git a/tests/tod-drivers/tod-x86_64-v1+1.90.2/libdevice-fake-tod-ssm-test-v1+1.90.2-x86_64.so b/tests/tod-drivers/tod-x86_64-v1+1.90.2/libdevice-fake-tod-ssm-test-v1+1.90.2-x86_64.so -old mode 100755 -new mode 100644 -diff --git a/tests/tod-drivers/tod-x86_64-v1+1.90.2/libdevice-fake-tod-test-driver-v1+1.90.2-x86_64.so b/tests/tod-drivers/tod-x86_64-v1+1.90.2/libdevice-fake-tod-test-driver-v1+1.90.2-x86_64.so -old mode 100755 -new mode 100644 -diff --git a/tests/tod-drivers/tod-x86_64-v1+1.90.3/libdevice-fake-tod-ssm-test-v1+1.90.3-x86_64.so b/tests/tod-drivers/tod-x86_64-v1+1.90.3/libdevice-fake-tod-ssm-test-v1+1.90.3-x86_64.so -old mode 100755 -new mode 100644 -diff --git a/tests/tod-drivers/tod-x86_64-v1+1.90.3/libdevice-fake-tod-test-driver-v1+1.90.3-x86_64.so b/tests/tod-drivers/tod-x86_64-v1+1.90.3/libdevice-fake-tod-test-driver-v1+1.90.3-x86_64.so -old mode 100755 -new mode 100644 -diff --git a/tests/tod-drivers/tod-x86_64-v1+1.90.5/libdevice-fake-tod-ssm-test-v1+1.90.5-x86_64.so b/tests/tod-drivers/tod-x86_64-v1+1.90.5/libdevice-fake-tod-ssm-test-v1+1.90.5-x86_64.so -old mode 100755 -new mode 100644 -diff --git a/tests/tod-drivers/tod-x86_64-v1+1.90.5/libdevice-fake-tod-test-driver-v1+1.90.5-x86_64.so b/tests/tod-drivers/tod-x86_64-v1+1.90.5/libdevice-fake-tod-test-driver-v1+1.90.5-x86_64.so -old mode 100755 -new mode 100644 -diff --git a/tests/tod-drivers/tod-x86_64-v1+1.94.0/libdevice-fake-tod-ssm-test-v1+1.94.0-x86_64.so b/tests/tod-drivers/tod-x86_64-v1+1.94.0/libdevice-fake-tod-ssm-test-v1+1.94.0-x86_64.so -old mode 100755 -new mode 100644 -diff --git a/tests/tod-drivers/tod-x86_64-v1+1.94.0/libdevice-fake-tod-test-driver-v1+1.94.0-x86_64.so b/tests/tod-drivers/tod-x86_64-v1+1.94.0/libdevice-fake-tod-test-driver-v1+1.94.0-x86_64.so -old mode 100755 -new mode 100644 -diff --git a/tests/tod-drivers/tod-x86_64-v1+1.94.3/libdevice-fake-tod-ssm-test-v1+1.94.3-x86_64.so b/tests/tod-drivers/tod-x86_64-v1+1.94.3/libdevice-fake-tod-ssm-test-v1+1.94.3-x86_64.so -old mode 100755 -new mode 100644 -diff --git a/tests/tod-drivers/tod-x86_64-v1+1.94.3/libdevice-fake-tod-test-driver-v1+1.94.3-x86_64.so b/tests/tod-drivers/tod-x86_64-v1+1.94.3/libdevice-fake-tod-test-driver-v1+1.94.3-x86_64.so -old mode 100755 -new mode 100644 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 7b847a87..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 fe87ef0..1eb2b4b 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 = [ -@@ -246,10 +254,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 -@@ -277,7 +281,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-Use-tests-execdir-install-rpath.patch b/debian/patches/tests-Use-tests-execdir-install-rpath.patch deleted file mode 100644 index 2e95456d..00000000 --- a/debian/patches/tests-Use-tests-execdir-install-rpath.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Mon, 21 Aug 2023 12:22:07 +0200 -Subject: tests: Use tests execdir install rpath - ---- - tests/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/meson.build b/tests/meson.build -index 2832158..e95c1cf 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -396,6 +396,7 @@ if get_option('tod') - dependencies: deps, - install: installed_tests, - install_dir: installed_tests_execdir / 'tod-drivers' / 'current', -+ install_rpath: installed_tests_execdir, - ) - - fp_todv1_enums = gnome.mkenums_simple('fp-todv1-enums', 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 diff --git a/debian/rules b/debian/rules index 40c1331e..5ff24850 100755 --- a/debian/rules +++ b/debian/rules @@ -8,8 +8,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 @@ -21,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