colord/colord-udev-hwdb.patch
Dominique Leuenberger a61c3043be Accepting request 197554 from home:fcrozat:branches:GNOME:Factory
- Add colord-udev-hwdb.patch: call udev hwdb to fill appropriately
  usb device informations (backport from upstream GIT).

OBS-URL: https://build.opensuse.org/request/show/197554
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/colord?expand=0&rev=79
2013-09-07 13:13:44 +00:00

30 lines
1.2 KiB
Diff

From fd9654c786cb19b541d20a953c5b51c0f53caeea Mon Sep 17 00:00:00 2001
From: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
Date: Sat, 3 Aug 2013 17:55:36 +0200
Subject: [PATCH] Migrate from usb_id and usb_db to udev builtins usb_id and
hwdb
Signed-off-by: Richard Hughes <richard@hughsie.com>
---
rules/69-cd-sensors.rules.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/69-cd-sensors.rules.in b/rules/69-cd-sensors.rules.in
index 6e0a643..eb47e25 100644
--- a/rules/69-cd-sensors.rules.in
+++ b/rules/69-cd-sensors.rules.in
@@ -86,8 +86,8 @@ ATTRS{idVendor}=="273f", ATTRS{idProduct}=="1002", ENV{COLORD_SENSOR_KIND}="colo
# color calibration device
ENV{COLORD_SENSOR_KIND}=="*?", ENV{COLOR_MEASUREMENT_DEVICE}="1"
-ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL}=="", IMPORT{program}="usb_id --export %p"
-ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL_FROM_DATABASE}=="", IMPORT{program}="usb-db %p"
+ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id"
+ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL_FROM_DATABASE}=="", IMPORT{builtin}="hwdb --subsystem=usb"
# Allow the daemon to access the color devices
ENV{COLORD_SENSOR_KIND}=="*?", GROUP="@daemon_user@"
--
1.8.4