mirrors/libfprint
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libfprint/libfprint.git synced 2026-06-11 18:38:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

debian/patches: Reorder to give upstream more priority

Browse Source
This commit is contained in:
Marco Trevisan (Treviño)
2020-11-25 19:56:49 +01:00
parent 0c9f7cf5ea
commit 2866d8a247
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/patches/list-udev-rules-Remove-Wrongly-added-well-known-USB-contr.patch
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libfprint/+bug/1906296
1 file changed, 1 deletion(-) 1 file changed, 1 deletion(-)
diff --git a/libfprint/fprint-list-udev-rules.c b/libfprint/fprint-list-udev-rules.c diff --git a/libfprint/fprint-list-udev-rules.c b/libfprint/fprint-list-udev-rules.c
index 6fbafe2..ff8fd1c 100644 index aee13e4..183cfa5 100644
--- a/libfprint/fprint-list-udev-rules.c --- a/libfprint/fprint-list-udev-rules.c
+++ b/libfprint/fprint-list-udev-rules.c +++ b/libfprint/fprint-list-udev-rules.c
@@ -76,7 +76,6 @@ static const FpIdEntry whitelist_id_table[] = { @@ -76,7 +76,6 @@ static const FpIdEntry whitelist_id_table[] = {
debian/patches/series
Vendored
+2 -2
View File
@@ -1,5 +1,3 @@
# Debian specifics
udev-rules-creation-add-Debian-specifics.patch
image-device-Don-t-deactivate-if-deactivation-was-already.patch image-device-Don-t-deactivate-if-deactivation-was-already.patch
aes3k-Fix-transfer-error-path-and-cancellable-lifetime.patch aes3k-Fix-transfer-error-path-and-cancellable-lifetime.patch
tests-Add-AES3500-test-case.patch tests-Add-AES3500-test-case.patch
@@ -14,3 +12,5 @@ udev-rules-Add-unsupported-devices-from-wiki-page-to-rule.patch
udev-rules-Regenerate-from-wiki-to-include-VFS495.patch udev-rules-Regenerate-from-wiki-to-include-VFS495.patch
list-udev-rules-Remove-Wrongly-added-well-known-USB-contr.patch list-udev-rules-Remove-Wrongly-added-well-known-USB-contr.patch
synaptics-add-identify-function.patch synaptics-add-identify-function.patch
# Debian specifics
udev-rules-creation-add-Debian-specifics.patch
debian/patches/udev-rules-Add-unsupported-devices-from-wiki-page-to-rule.patch
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libfprint/+bug/1905603
1 file changed, 71 insertions(+), 3 deletions(-) 1 file changed, 71 insertions(+), 3 deletions(-)
diff --git a/libfprint/fprint-list-udev-rules.c b/libfprint/fprint-list-udev-rules.c diff --git a/libfprint/fprint-list-udev-rules.c b/libfprint/fprint-list-udev-rules.c
index 00bfa92..a921776 100644 index 5f17b6b..bbca6ef 100644
--- a/libfprint/fprint-list-udev-rules.c --- a/libfprint/fprint-list-udev-rules.c
+++ b/libfprint/fprint-list-udev-rules.c +++ b/libfprint/fprint-list-udev-rules.c
@@ -25,11 +25,79 @@ @@ -25,11 +25,79 @@
debian/patches/udev-rules-Regenerate-from-wiki-to-include-VFS495.patch
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libfprint/+bug/1905603
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/libfprint/fprint-list-udev-rules.c b/libfprint/fprint-list-udev-rules.c diff --git a/libfprint/fprint-list-udev-rules.c b/libfprint/fprint-list-udev-rules.c
index a921776..6fbafe2 100644 index bbca6ef..aee13e4 100644
--- a/libfprint/fprint-list-udev-rules.c --- a/libfprint/fprint-list-udev-rules.c
+++ b/libfprint/fprint-list-udev-rules.c +++ b/libfprint/fprint-list-udev-rules.c
@@ -59,6 +59,7 @@ static const FpIdEntry whitelist_id_table[] = { @@ -59,6 +59,7 @@ static const FpIdEntry whitelist_id_table[] = {
debian/patches/udev-rules-creation-add-Debian-specifics.patch
Vendored
+3 -3
View File
@@ -12,10 +12,10 @@ ones; mode and group to all.
1 file changed, 4 insertions(+), 5 deletions(-) 1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/libfprint/fprint-list-udev-rules.c b/libfprint/fprint-list-udev-rules.c diff --git a/libfprint/fprint-list-udev-rules.c b/libfprint/fprint-list-udev-rules.c
index 5f17b6b..00bfa92 100644 index 183cfa5..ff8fd1c 100644
--- a/libfprint/fprint-list-udev-rules.c --- a/libfprint/fprint-list-udev-rules.c
+++ b/libfprint/fprint-list-udev-rules.c +++ b/libfprint/fprint-list-udev-rules.c
@@ -66,9 +66,6 @@ print_driver (const FpDeviceClass *cls) @@ -134,9 +134,6 @@ print_driver (const FpDeviceClass *cls)
if (entry->vid == bl_entry->vid && entry->pid == bl_entry->pid) if (entry->vid == bl_entry->vid && entry->pid == bl_entry->pid)
break; break;
@@ -25,7 +25,7 @@ index 5f17b6b..00bfa92 100644
key = g_strdup_printf ("%04x:%04x", entry->vid, entry->pid); key = g_strdup_printf ("%04x:%04x", entry->vid, entry->pid);
if (g_hash_table_lookup (printed, key) != NULL) if (g_hash_table_lookup (printed, key) != NULL)
@@ -82,8 +79,10 @@ print_driver (const FpDeviceClass *cls) @@ -150,8 +147,10 @@ print_driver (const FpDeviceClass *cls)
if (num_printed == 0) if (num_printed == 0)
g_print ("# %s\n", cls->full_name); g_print ("# %s\n", cls->full_name);