Merge tag 'debian/1%1.94.6-1' into ubuntu

libfprint Debian release 1:1.94.6-1

debian/changelog

@@ -19,6 +19,19 @@ libfprint (1:1.94.6+tod1-0ubuntu1) mantic; urgency=medium
 
  -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Thu, 17 Aug 2023 21:53:59 +0200
 
+libfprint (1:1.94.6-1) unstable; urgency=medium
+
+  * New upstream release
+  * debian/libfprint-2-2.postinst: Devices triggers updated
+  * debian/patches: Drop, applied upstream
+  * 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) <marco@ubuntu.com>  Wed, 23 Aug 2023 01:11:51 +0200
+
 libfprint (1:1.94.5+tod1-0ubuntu2) lunar; urgency=medium
 
   * debian/patches/git_tests_fix.patch:
@@ -39,6 +52,23 @@ libfprint (1:1.94.5+tod1-0ubuntu1) kinetic; urgency=medium
 
  -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Fri, 14 Oct 2022 00:18:27 +0200
 
+libfprint (1:1.94.5-1) unstable; urgency=medium
+
+  * New upstream release:
+     - New driver: fpcmoc, supporting various FPC MOC Fingerprint Sensors
+     - goodixmoc:
+       + New PIDs 0x6014, 0x6094, 0x631C, 0x634C, 0x6384, 0x659A.
+       + Support resetting device on firmware failure due to corrupted DB.
+     - elanmoc: New PIDs 0x0c88, 0x0c8c, 0x0c8d.
+     - synaptics: New PID 0x0104.
+     - upektc: New PID 0x2017.
+     - Fixed various memory leaks
+  * debian/libfprint-2-2.postinst: Devices triggers updated
+  * debian/patches: Cherry-pick post-release upstream cleanups
+  * debian/docs: Update reference to README.md and remove TODO
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Fri, 14 Oct 2022 01:09:06 +0200
+
 libfprint (1:1.94.3+tod1-0ubuntu3) kinetic; urgency=medium
 
   * elanmoc: Add support for more supported PIDs.
@@ -73,6 +103,19 @@ libfprint (1:1.94.2+tod1-0ubuntu1) jammy; urgency=medium
 
  -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Tue, 14 Dec 2021 19:57:05 +0100
 
+libfprint (1:1.94.2-1) unstable; urgency=medium
+
+  * New upstream release
+  * debian/libfprint-2-2.postinst: Devices triggers updated
+  * debian/libfprint-2-*.install: Use more restrictive rules to reduce ubuntu
+    delta
+  * debian/update-udev-triggers: Ignore errors on udevadm trigger.
+    These are not fatal for package installation and rebuild postinst script
+  * debian/watch: Use @PACKAGE@
+  * debian/patches: Drop, all applied upstream
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Wed, 03 Nov 2021 17:39:27 +0100
+
 libfprint (1:1.94.1+tod1-0ubuntu2) jammy; urgency=medium
 
   * debian/patches: Ensure that structures padding is constant in all archs
@@ -631,7 +674,7 @@ libfprint (1:0.5.0-6) unstable; urgency=low
 
   [ Jeremy Bicha ]
   * Fix underlinking against glib - thanks to Julian Taylor
-   (Closes: #710381, #713466) 
+   (Closes: #710381, #713466)
 
   [ Didier Raboud ]
   * Run udevadm trigger on 147e:2020 too
@@ -739,8 +782,8 @@ libfprint (20110418git-1) unstable; urgency=low
   * New upstream release.
   * Removing resigned uploader from the Uploaders filed (Closes: #595719).
   * Cleaning out 'dependency_libs' for multiarch support (Closes: #620447).
-  * Added libnss as build-depend for uru4000.  
+  * Added libnss as build-depend for uru4000.
-  * Added Validity VFS101 device support. 
+  * Added Validity VFS101 device support.
   * Bump Standard-version up to 3.9.2.0 (no changes needed).
 
  -- Ulises Vitulli <dererk@debian.org>  Tue, 19 Apr 2011 14:58:27 -0300
@@ -748,7 +791,7 @@ libfprint (20110418git-1) unstable; urgency=low
 libfprint (20100820git-1) unstable; urgency=low
 
   * New upstream snapshot.
-  * Remove local patches, reported and applied on upstream side, 
+  * Remove local patches, reported and applied on upstream side,
     thanks BastienNocera:
     - Check-return-code-from-img2print-conversion.patch.
     - Add-some-corrective-action-if-there-are-missing-pack.patch.

debian/control

@@ -9,25 +9,24 @@ Build-Depends: debhelper-compat (= 13),
                gtk-doc-tools,
                libcairo-dev <!nocheck>,
                libgirepository1.0-dev,
-               libglib2.0-dev (>= 2.56),
+               libglib2.0-dev,
                libgudev-1.0-dev,
-               libgusb-dev (>= 0.3.0),
+               libgusb-dev,
                libnss3-dev,
                libpixman-1-dev,
-               meson (>= 0.49.0),
+               meson,
                python3 <!nocheck>,
                python3-cairo <!nocheck>,
                python3-gi <!nocheck>,
                umockdev <!nocheck>
 Build-Depends-Indep: libglib2.0-doc <!nodoc>, libgusb-doc <!nodoc>
-Standards-Version: 4.5.1
+Standards-Version: 4.6.1
 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
 
 Package: libfprint-2-2
 Architecture: any
-Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Description: async fingerprint library of fprint project, shared libraries

debian/patches/series

@@ -1,4 +1,5 @@
-tests-Install-current-TOD-driver-in-installed-tests-and-u.patch
 tests-Use-native-GTest-utils-to-generate-assets-names.patch
-tests-Use-tests-execdir-install-rpath.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

debian/patches/tests-Install-current-TOD-driver-in-installed-tests-and-u.patch

@@ -7,10 +7,10 @@ Subject: tests: Install current TOD driver in installed tests and use it
  1 file changed, 9 insertions(+), 4 deletions(-)
 
 diff --git a/tests/meson.build b/tests/meson.build
-index fe87ef0..5058ae3 100644
+index 1eb2b4b..2832158 100644
 --- a/tests/meson.build
 +++ b/tests/meson.build
-@@ -131,6 +131,7 @@ if get_option('introspection')
+@@ -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
@@ -18,7 +18,7 @@ index fe87ef0..5058ae3 100644
                          ]),
                          'extra_content': '',
                      },
-@@ -389,7 +390,8 @@ if get_option('tod')
+@@ -393,7 +394,8 @@ if get_option('tod')
          ],
          include_directories: include_directories('../libfprint'),
          dependencies: deps,
@@ -28,7 +28,7 @@ index fe87ef0..5058ae3 100644
      )
  
      fp_todv1_enums = gnome.mkenums_simple('fp-todv1-enums',
-@@ -494,8 +496,10 @@ if get_option('tod')
+@@ -498,8 +500,10 @@ if get_option('tod')
              endif
              tod_test_envs = tod_envs
              tod_test_envs.prepend('FP_DRIVERS_WHITELIST', tod_driver)
@@ -41,7 +41,7 @@ index fe87ef0..5058ae3 100644
              tod_test_envs.set('FP_TOD_TEST_DRIVER_NAME', tod_driver)
  
              test(tod_test_name + '-' + tod_driver,
-@@ -520,7 +524,8 @@ if get_option('tod')
+@@ -524,7 +528,8 @@ if get_option('tod')
                          'env': ' '.join([
                              tod_envs_str,
                              'FP_TOD_DRIVERS_DIR=' + installed_tests_execdir /

debian/patches/tests-Use-native-GTest-utils-to-generate-assets-names.patch

@@ -2,13 +2,14 @@ From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
 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 5058ae3..2832158 100644
+index fe87ef0..1eb2b4b 100644
 --- a/tests/meson.build
 +++ b/tests/meson.build
 @@ -6,6 +6,8 @@ envs.set('G_MESSAGES_DEBUG', 'all')
@@ -33,7 +34,7 @@ index 5058ae3..2832158 100644
  if get_option('introspection')
      envs.prepend('GI_TYPELIB_PATH', meson.project_build_root() / 'libfprint')
      virtual_devices_tests = [
-@@ -247,10 +255,6 @@ endif
+@@ -246,10 +254,6 @@ endif
  
  unit_tests_deps = { 'fpi-assembling' : [cairo_dep] }
  
@@ -44,7 +45,7 @@ index 5058ae3..2832158 100644
  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
+@@ -277,7 +281,7 @@ foreach test_name: unit_tests
  
      basename = 'test-' + test_name
      test_exe = executable(basename,

debian/patches/tests-egis0570-capture.pcapng-Remove-execution-permission.patch

@@ -0,0 +1,13 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
+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

debian/upstream/metadata

@@ -0,0 +1,4 @@
+---
+Bug-Database: https://gitlab.freedesktop.org/libfprint/libfprint/-/issues
+Bug-Submit: https://gitlab.freedesktop.org/libfprint/libfprint/-/issues/new
+Repository-Browse: https://gitlab.freedesktop.org/libfprint/libfprint