[arch-commits] Commit in colord/trunk (PKGBUILD udev-systemd.patch)

[Jan de Groot]

    Date: Tuesday, July 23, 2013 @ 16:05:05
  Author: jgc
Revision: 191315

upgpkg: colord 1.0.2-2

Fix calls to usb_id and usb-db

Added:
  colord/trunk/udev-systemd.patch
Modified:
  colord/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   13 ++++++++++---
 udev-systemd.patch |   17 +++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-23 13:45:44 UTC (rev 191314)
+++ PKGBUILD	2013-07-23 14:05:05 UTC (rev 191315)
@@ -4,7 +4,7 @@
 
 pkgname=colord
 pkgver=1.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="System daemon for managing color devices"
 arch=(i686 x86_64)
 url="http://www.freedesktop.org/software/colord"
@@ -15,9 +15,16 @@
 options=('!libtool')
 install=colord.install
 backup=(etc/colord.conf)
-source=($url/releases/$pkgname-$pkgver.tar.xz)
-sha1sums=('081ce4457e9752c726e68820b1b079ab314093a0')
+source=($url/releases/$pkgname-$pkgver.tar.xz
+        udev-systemd.patch)
+sha1sums=('081ce4457e9752c726e68820b1b079ab314093a0'
+          '3b467b9674f767c804943d191beaf6bd1ba3a606')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../udev-systemd.patch
+}
+
 build() {
   cd $pkgname-$pkgver
   

Added: udev-systemd.patch
===================================================================
--- udev-systemd.patch	                        (rev 0)
+++ udev-systemd.patch	2013-07-23 14:05:05 UTC (rev 191315)
@@ -0,0 +1,17 @@
+Description: Migrate from usb_id and usb_db to udev builtins usb_id and hwdb.
+Author: Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1200185
+
+--- colord-1.0.1.orig/rules/69-cd-sensors.rules.in
++++ colord-1.0.1/rules/69-cd-sensors.rules.in
+@@ -86,8 +86,8 @@ ATTRS{idVendor}=="273f", ATTRS{idProduct
+ 
+ # 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@"