Package: argyll
Version: 1.4.0-8
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 argyll depends on:
ii  libc6         2.17-7
ii  libicc2       2.12+argyll1.4.0-8
ii  libimdi0      1.4.0-8
ii  libjpeg8      8d-1
ii  libtiff4      3.9.7-1
ii  libusb-0.1-4  2:0.1.12-23.2
ii  libx11-6      2:1.6.0-1
ii  libxext6      2:1.3.2-1
ii  libxinerama1  2:1.1.3-1
ii  libxrandr2    2:1.4.1-1
ii  libxss1       1:1.2.2-1
ii  libxxf86vm1   1:1.1.2-1+deb7u1

Versions of packages argyll recommends:
ii  consolekit  0.4.5-3.1
ii  udev        204-1

argyll suggests no packages.

-- no debconf information
Description: Test for usb-db helper before running it
 In newer udev versions, the usb-db udev helper 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.
Author: Michael Biebl <bi...@debian.org>
--- argyll-1.4.0.orig/libusb1/55-Argyll.rules
+++ argyll-1.4.0/libusb1/55-Argyll.rules
@@ -59,6 +59,6 @@ TEST=="/lib/udev/udev-acl", TEST=="/var/
 ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}!="*?", MODE="660", GROUP="plugdev"
 
 # Set ID_VENDOR and ID_MODEL acording to VID and PID
-IMPORT{program}="usb-db %p"
+TEST=="/lib/udev/usb-db", IMPORT{program}="usb-db %p"
 
 LABEL="argyll_rules_end"

Reply via email to