Date: Tuesday, July 23, 2013 @ 16:05:15 Author: jgc Revision: 191316 archrelease: copy trunk to extra-i686, extra-x86_64
Added: colord/repos/extra-i686/PKGBUILD (from rev 191315, colord/trunk/PKGBUILD) colord/repos/extra-i686/colord.install (from rev 191315, colord/trunk/colord.install) colord/repos/extra-i686/udev-systemd.patch (from rev 191315, colord/trunk/udev-systemd.patch) colord/repos/extra-x86_64/PKGBUILD (from rev 191315, colord/trunk/PKGBUILD) colord/repos/extra-x86_64/colord.install (from rev 191315, colord/trunk/colord.install) colord/repos/extra-x86_64/udev-systemd.patch (from rev 191315, colord/trunk/udev-systemd.patch) Deleted: colord/repos/extra-i686/PKGBUILD colord/repos/extra-i686/colord.install colord/repos/extra-x86_64/PKGBUILD colord/repos/extra-x86_64/colord.install ---------------------------------+ /PKGBUILD | 92 ++++++++++++++++++++++++++++++++++++++ /colord.install | 22 +++++++++ extra-i686/PKGBUILD | 39 ---------------- extra-i686/colord.install | 11 ---- extra-i686/udev-systemd.patch | 17 +++++++ extra-x86_64/PKGBUILD | 39 ---------------- extra-x86_64/colord.install | 11 ---- extra-x86_64/udev-systemd.patch | 17 +++++++ 8 files changed, 148 insertions(+), 100 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2013-07-23 14:05:05 UTC (rev 191315) +++ extra-i686/PKGBUILD 2013-07-23 14:05:15 UTC (rev 191316) @@ -1,39 +0,0 @@ -# $Id$ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> -# Contributor: Ionut Biru <ib...@archlinux.org> - -pkgname=colord -pkgver=1.0.2 -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 udev dconf dbus) -makedepends=(intltool gobject-introspection vala docbook2x sane bash-completion) -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') - -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 - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: Copied: colord/repos/extra-i686/PKGBUILD (from rev 191315, colord/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-07-23 14:05:15 UTC (rev 191316) @@ -0,0 +1,46 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Contributor: Ionut Biru <ib...@archlinux.org> + +pkgname=colord +pkgver=1.0.2 +pkgrel=2 +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 udev dconf dbus) +makedepends=(intltool gobject-introspection vala docbook2x sane bash-completion) +optdepends=('sane: UseSANE support [/etc/colord.conf]') +options=('!libtool') +install=colord.install +backup=(etc/colord.conf) +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 + + # 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 + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: Deleted: extra-i686/colord.install =================================================================== --- extra-i686/colord.install 2013-07-23 14:05:05 UTC (rev 191315) +++ extra-i686/colord.install 2013-07-23 14:05:15 UTC (rev 191316) @@ -1,11 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: colord/repos/extra-i686/colord.install (from rev 191315, colord/trunk/colord.install) =================================================================== --- extra-i686/colord.install (rev 0) +++ extra-i686/colord.install 2013-07-23 14:05:15 UTC (rev 191316) @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: colord/repos/extra-i686/udev-systemd.patch (from rev 191315, colord/trunk/udev-systemd.patch) =================================================================== --- extra-i686/udev-systemd.patch (rev 0) +++ extra-i686/udev-systemd.patch 2013-07-23 14:05:15 UTC (rev 191316) @@ -0,0 +1,17 @@ +Description: Migrate from usb_id and usb_db to udev builtins usb_id and hwdb. +Author: Dmitrijs Ledkovs <dmitrij.led...@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@" Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2013-07-23 14:05:05 UTC (rev 191315) +++ extra-x86_64/PKGBUILD 2013-07-23 14:05:15 UTC (rev 191316) @@ -1,39 +0,0 @@ -# $Id$ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> -# Contributor: Ionut Biru <ib...@archlinux.org> - -pkgname=colord -pkgver=1.0.2 -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 udev dconf dbus) -makedepends=(intltool gobject-introspection vala docbook2x sane bash-completion) -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') - -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 - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: Copied: colord/repos/extra-x86_64/PKGBUILD (from rev 191315, colord/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2013-07-23 14:05:15 UTC (rev 191316) @@ -0,0 +1,46 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Contributor: Ionut Biru <ib...@archlinux.org> + +pkgname=colord +pkgver=1.0.2 +pkgrel=2 +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 udev dconf dbus) +makedepends=(intltool gobject-introspection vala docbook2x sane bash-completion) +optdepends=('sane: UseSANE support [/etc/colord.conf]') +options=('!libtool') +install=colord.install +backup=(etc/colord.conf) +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 + + # 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 + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: Deleted: extra-x86_64/colord.install =================================================================== --- extra-x86_64/colord.install 2013-07-23 14:05:05 UTC (rev 191315) +++ extra-x86_64/colord.install 2013-07-23 14:05:15 UTC (rev 191316) @@ -1,11 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: colord/repos/extra-x86_64/colord.install (from rev 191315, colord/trunk/colord.install) =================================================================== --- extra-x86_64/colord.install (rev 0) +++ extra-x86_64/colord.install 2013-07-23 14:05:15 UTC (rev 191316) @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: colord/repos/extra-x86_64/udev-systemd.patch (from rev 191315, colord/trunk/udev-systemd.patch) =================================================================== --- extra-x86_64/udev-systemd.patch (rev 0) +++ extra-x86_64/udev-systemd.patch 2013-07-23 14:05:15 UTC (rev 191316) @@ -0,0 +1,17 @@ +Description: Migrate from usb_id and usb_db to udev builtins usb_id and hwdb. +Author: Dmitrijs Ledkovs <dmitrij.led...@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@"