Package: colord
Version: 1.0.1-1
Severity: normal
Tags: patch
In newer udev versions, usb-db has been replaced by the hwdb builtin.
Instead of removing the import, test for the helper before running it.
This way we are compatible with both old and new udev.
Eventually we should switch to hwdb fully, but for now it is probably
safest to support older udev versions without hwdb, too.
Patch attached.
Would be great if you can prepare a new release soon, as we want to
upload udev 204-1 from experimental to unstable and this will generate a
warning/errror message on each boot.
Michael
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.10-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages colord depends on:
ii acl 2.2.52-1
ii adduser 3.113+nmu3
ii dconf-gsettings-backend [gsettings-backend] 0.16.1-1
ii libc6 2.17-7
ii libcolord1 1.0.1-1
ii libcolorhug1 1.0.1-1
ii libdbus-1-3 1.6.12-1
ii libglib2.0-0 2.36.3-3
ii libgudev-1.0-0 175-7.2
ii libgusb2 0.1.6-2
ii liblcms2-2 2.2+git20110628-2.2
ii libpolkit-gobject-1-0 0.105-3
ii libsane 1.0.23-3
ii libsqlite3-0 3.7.17-1
ii libsystemd-login0 204-1
ii libusb-1.0-0 2:1.0.16-1
ii policykit-1 0.105-3
colord recommends no packages.
colord suggests no packages.
-- no debconf information
>From 4c6bbd75f070ebd55a889868182891fa9adacc0e Mon Sep 17 00:00:00 2001
From: Michael Biebl <bi...@debian.org>
Date: Sun, 21 Jul 2013 17:26:58 +0200
Subject: [PATCH] Test for usb-db before running it
In newer udev versions, usb-db has been replaced by the hwdb builtin.
Instead of removing the import, test for the helper before running it.
This way we are compatible with both old and new udev.
---
rules/69-cd-sensors.rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/69-cd-sensors.rules b/rules/69-cd-sensors.rules
index a955a63..5bc8cdb 100644
--- a/rules/69-cd-sensors.rules
+++ b/rules/69-cd-sensors.rules
@@ -87,7 +87,7 @@ 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_FROM_DATABASE}=="", TEST=="/lib/udev/usb-db", IMPORT{program}="usb-db %p"
# Allow the daemon to access the color devices
ENV{COLORD_SENSOR_KIND}=="*?", GROUP="root"
--
1.8.3.2
