[arch-commits] Commit in colord/trunk (PKGBUILD colord.install)

2016-05-08 Thread Jan Steffens
Date: Sunday, May 8, 2016 @ 22:37:51
  Author: heftig
Revision: 267217

1.3.2-2

Modified:
  colord/trunk/PKGBUILD
  colord/trunk/colord.install

+
 PKGBUILD   |2 +-
 colord.install |   13 +++--
 2 files changed, 4 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-08 17:44:59 UTC (rev 267216)
+++ PKGBUILD2016-05-08 20:37:51 UTC (rev 267217)
@@ -4,7 +4,7 @@
 
 pkgname=colord
 pkgver=1.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="System daemon for managing color devices"
 arch=(i686 x86_64)
 url="http://www.freedesktop.org/software/colord;

Modified: colord.install
===
--- colord.install  2016-05-08 17:44:59 UTC (rev 267216)
+++ colord.install  2016-05-08 20:37:51 UTC (rev 267217)
@@ -1,15 +1,8 @@
 post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  if ! getent passwd colord >/dev/null; then
-groupadd -g 124 colord
-useradd -d /var/lib/colord -u 124 -g colord -s /bin/false colord
-  fi
+  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
 }
 
 post_upgrade() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
+  post_install
 }
-
-post_remove() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}


[arch-commits] Commit in colord/trunk (PKGBUILD colord.install)

2015-02-27 Thread Jan Steffens
Date: Friday, February 27, 2015 @ 13:40:15
  Author: heftig
Revision: 232068

1.2.9

Modified:
  colord/trunk/PKGBUILD
  colord/trunk/colord.install

+
 PKGBUILD   |4 ++--
 colord.install |   16 +++-
 2 files changed, 9 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-27 12:30:20 UTC (rev 232067)
+++ PKGBUILD2015-02-27 12:40:15 UTC (rev 232068)
@@ -3,7 +3,7 @@
 # Contributor: Ionut Biru ib...@archlinux.org
 
 pkgname=colord
-pkgver=1.2.8
+pkgver=1.2.9
 pkgrel=1
 pkgdesc=System daemon for managing color devices
 arch=(i686 x86_64)
@@ -17,7 +17,7 @@
 replaces=('shared-color-profiles')
 install=colord.install
 source=($url/releases/$pkgname-$pkgver.tar.xz{,.asc})
-sha1sums=('e5c2a3432896cac180b089291c0e38bd809328cf'
+sha1sums=('1b6319812b12ab7f906983959bbaaf2e5b78bdb7'
   'SKIP')
 validpgpkeys=('163EB50119225DB3DF8F49EA17ACBA8DFA970E17')
 

Modified: colord.install
===
--- colord.install  2015-02-27 12:30:20 UTC (rev 232067)
+++ colord.install  2015-02-27 12:40:15 UTC (rev 232068)
@@ -1,17 +1,15 @@
 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
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  if ! getent passwd colord /dev/null; then
+groupadd -g 124 colord
+useradd -d /var/lib/colord -u 124 -g colord -s /bin/false colord
+  fi
 }
 
 post_upgrade() {
-post_install
+  glib-compile-schemas /usr/share/glib-2.0/schemas
 }
 
 post_remove() {
-glib-compile-schemas /usr/share/glib-2.0/schemas
-getent passwd colord /dev/null  userdel colord
-getent group colord /dev/null  groupdel colord
+  glib-compile-schemas /usr/share/glib-2.0/schemas
 }


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

2014-04-21 Thread Jan de Groot
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
===
--- PKGBUILD2014-04-21 14:38:24 UTC (rev 211586)
+++ PKGBUILD2014-04-21 15:31:19 UTC (rev 211587)
@@ -3,38 +3,27 @@
 # Contributor: Ionut Biru ib...@archlinux.org
 
 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 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@



[arch-commits] Commit in colord/trunk (PKGBUILD colord.install)

2013-01-25 Thread Ionuț Mircea Bîru
Date: Friday, January 25, 2013 @ 17:17:48
  Author: ioni
Revision: 175991

update to 0.1.28

Added:
  colord/trunk/colord.install
Modified:
  colord/trunk/PKGBUILD

+
 PKGBUILD   |7 ---
 colord.install |   11 +++
 2 files changed, 15 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-01-25 16:01:14 UTC (rev 175990)
+++ PKGBUILD2013-01-25 16:17:48 UTC (rev 175991)
@@ -3,8 +3,8 @@
 # Contributor: Ionut Biru ib...@archlinux.org
 
 pkgname=colord
-pkgver=0.1.24
-pkgrel=3
+pkgver=0.1.28
+pkgrel=1
 pkgdesc=System daemon for managing color devices
 arch=('i686' 'x86_64')
 url=http://www.freedesktop.org/software/colord;
@@ -13,7 +13,8 @@
 makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x')
 source=($url/releases/$pkgname-$pkgver.tar.xz)
 options=('!libtool')
-sha1sums=('52089b72d79cd4358a86b7e646c42d23157bbcf9')
+install=colord.install
+sha1sums=('d53167727ab0f1014ded86675ac8b518c188a88b')
 
 build() {
   cd $pkgname-$pkgver

Added: colord.install
===
--- colord.install  (rev 0)
+++ colord.install  2013-01-25 16:17:48 UTC (rev 175991)
@@ -0,0 +1,11 @@
+post_install() {
+glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+post_install
+}
+
+post_remove() {
+post_install
+}