Date: Monday, April 21, 2014 @ 17:31:19 Author: jgc Revision: 211587 upgpkg: colord 1.2.0-1
colord 1.2.0 update Modified: colord/trunk/PKGBUILD colord/trunk/colord.install Deleted: colord/trunk/udev-systemd.patch --------------------+ PKGBUILD | 27 ++++++++------------------- colord.install | 8 +++++++- udev-systemd.patch | 17 ----------------- 3 files changed, 15 insertions(+), 37 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-04-21 14:38:24 UTC (rev 211586) +++ PKGBUILD 2014-04-21 15:31:19 UTC (rev 211587) @@ -3,38 +3,27 @@ # Contributor: Ionut Biru <[email protected]> pkgname=colord -pkgver=1.0.6 +pkgver=1.2.0 pkgrel=1 pkgdesc="System daemon for managing color devices" arch=(i686 x86_64) url="http://www.freedesktop.org/software/colord"; license=(GPL2) -depends=(lcms2 libgusb polkit shared-color-profiles sqlite systemd dconf dbus) +depends=(lcms2 libgusb polkit sqlite systemd dconf dbus) makedepends=(intltool gobject-introspection vala docbook2x sane bash-completion) -optdepends=('sane: UseSANE support [/etc/colord.conf]') +optdepends=('sane: scanner support') +replaces=('shared-color-profiles') install=colord.install -backup=(etc/colord.conf) -source=($url/releases/$pkgname-$pkgver.tar.xz{,.asc} - udev-systemd.patch) -sha1sums=('b3ad9d1cd90ff0ea4d955b253dc0491d851c2778' - 'SKIP' - '3b467b9674f767c804943d191beaf6bd1ba3a606') +source=($url/releases/$pkgname-$pkgver.tar.xz{,.asc}) +sha1sums=('a96619dcca24aea1527054f0117211cf7ac30dec' + 'SKIP') -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i ../udev-systemd.patch -} - build() { cd $pkgname-$pkgver - - # put udev files in /usr/lib - sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/$pkgname --disable-static \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --enable-vala --enable-sane --disable-volume-search + --enable-vala --enable-sane --with-daemon-user=colord make } Modified: colord.install =================================================================== --- colord.install 2014-04-21 14:38:24 UTC (rev 211586) +++ colord.install 2014-04-21 15:31:19 UTC (rev 211587) @@ -1,5 +1,9 @@ post_install() { glib-compile-schemas /usr/share/glib-2.0/schemas + getent group colord >/dev/null || groupadd -g 124 colord + getent passwd colord >/dev/null || useradd -d /var/lib/colord -u 124 -g colord -s /bin/false colord + chown colord:colord /var/lib/colord + chown colord:colord /var/lib/colord/*.db 2>/dev/null || return 0 } post_upgrade() { @@ -7,5 +11,7 @@ } post_remove() { - post_install + glib-compile-schemas /usr/share/glib-2.0/schemas + getent passwd colord >/dev/null && userdel colord + getent group colord >/dev/null && groupdel colord } Deleted: udev-systemd.patch =================================================================== --- udev-systemd.patch 2014-04-21 14:38:24 UTC (rev 211586) +++ udev-systemd.patch 2014-04-21 15:31:19 UTC (rev 211587) @@ -1,17 +0,0 @@ -Description: Migrate from usb_id and usb_db to udev builtins usb_id and hwdb. -Author: Dmitrijs Ledkovs <[email protected]> -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@"
