From f4264e218200b57dd39b57531ba086d107e967b5 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Wed, 24 Jul 2013 01:48:51 -0700
Subject: Wed Jul 24 01:48:49 PDT 2013

---
 extra/colord/PKGBUILD           | 15 +++++++++++----
 extra/colord/udev-systemd.patch | 17 +++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 extra/colord/udev-systemd.patch

(limited to 'extra/colord')

diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD
index 4a64e5ed4..c9a3f2d02 100644
--- a/extra/colord/PKGBUILD
+++ b/extra/colord/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 190115 2013-07-15 20:06:47Z heftig $
+# $Id: PKGBUILD 191316 2013-07-23 14:05:15Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 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,8 +15,15 @@ optdepends=('sane: UseSANE support [/etc/colord.conf]')
 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
diff --git a/extra/colord/udev-systemd.patch b/extra/colord/udev-systemd.patch
new file mode 100644
index 000000000..311a92437
--- /dev/null
+++ b/extra/colord/udev-systemd.patch
@@ -0,0 +1,17 @@
+Description: Migrate from usb_id and usb_db to udev builtins usb_id and hwdb.
+Author: Dmitrijs Ledkovs <dmitrij.ledkov@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@"
-- 
cgit v1.2.3-54-g00ecf