[Fingerforce-commits] [SCM] libfprint packaging for Debian by the FingerForce Team. branch, debian, updated. debian/0.4.0-4-gdfff16f-2-2-gaa679f6

[Didier Raboud]

The following commit has been merged in the debian branch:
commit 8019e859673ee5f04b9066644b1fcfac9483179b
Author: Didier Raboud <odyx at debian.org>
Date:   Mon Jun 25 22:47:26 2012 +0200

    Patch the udev rules creator to include all devices.
    
    The power/control blacklist is respected: 0483:2016 is blacklisted for
    power/control but is supported by a built driver and as such, should get
    a mode and group specification.
    
    Closes: #679001

diff --git a/debian/patches/series b/debian/patches/series
index 4910d8a..871c3f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 kFreeBSD_FTBFS_add_ETIME_definition.patch
+udev-rules-creation-add-Debian-specifics.patch
diff --git a/debian/patches/udev-rules-creation-add-Debian-specifics.patch b/debian/patches/udev-rules-creation-add-Debian-specifics.patch
new file mode 100644
index 0000000..8f9796a
--- /dev/null
+++ b/debian/patches/udev-rules-creation-add-Debian-specifics.patch
@@ -0,0 +1,31 @@
+Description: Tweak the udev rules creator for Debian usage
+ List all devices; automatic power/control only for the non-blacklisted
+ ones; mode and group to all.
+Author: Didier Raboud <odyx at debian.org>
+Origin: vendor
+Last-Update: 2012-06-26
+
+--- a/libfprint/fprint-list-udev-rules.c
++++ b/libfprint/fprint-list-udev-rules.c
+@@ -54,9 +54,6 @@
+ 		break;
+ 	    }
+ 	}
+-	if (blacklist)
+-	    continue;
+-
+ 	key = g_strdup_printf ("%04x:%04x", driver->id_table[i].vendor, driver->id_table[i].product);
+ 
+ 	if (g_hash_table_lookup (printed, key) != NULL) {
+@@ -66,7 +63,10 @@
+ 
+ 	g_hash_table_insert (printed, key, GINT_TO_POINTER (1));
+ 
+-	printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ATTRS{dev}==\"*\", ATTR{power/control}=\"auto\"\n", driver->id_table[i].vendor, driver->id_table[i].product);
++	printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ATTRS{dev}==\"*\", ", driver->id_table[i].vendor, driver->id_table[i].product);
++	if (!blacklist)
++		printf ("ATTR{power/control}=\"auto\", ");
++	printf ("MODE=\"0664\", GROUP=\"plugdev\"\n");
+     }
+ }
+ 
diff --git a/debian/rules b/debian/rules
index b6652c6..dcbe79a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,5 +27,5 @@ override_dh_auto_install:
 	done
 
 override_dh_installudev:
-	sed -e 's/$$/, MODE="0664", GROUP="plugdev"/g' libfprint/60-fprint-autosuspend.rules > debian/libfprint0.udev
+	cp libfprint/60-fprint-autosuspend.rules debian/libfprint0.udev
 	dh_installudev

-- 
libfprint packaging for Debian by the FingerForce Team.