[arch-commits] Commit in keytouch/trunk (ChangeLog PKGBUILD keytouch.daemon)

[Eric Bélanger]

    Date: Thursday, June 23, 2011 @ 19:07:34
  Author: eric
Revision: 128421

upgpkg: keytouch 2.4.1-3
Removed automatic startup of acpid daemon (close FS#24847), Added gtk2 depends, Added acpid optdepends, PKGBUILD cleanup, Removed ChangeLog

Modified:
  keytouch/trunk/PKGBUILD
  keytouch/trunk/keytouch.daemon
Deleted:
  keytouch/trunk/ChangeLog

-----------------+
 ChangeLog       |   18 --------------
 PKGBUILD        |   67 +++++++++++++++++++++++++++---------------------------
 keytouch.daemon |    3 --
 3 files changed, 34 insertions(+), 54 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2011-06-23 22:38:02 UTC (rev 128420)
+++ ChangeLog	2011-06-23 23:07:34 UTC (rev 128421)
@@ -1,18 +0,0 @@
-2009-10-17  Eric Belanger  <eric at archlinux.org>
-
-	* keytouch 2.4.1-2
-	* Fixed daemon script (close FS#15693)
-
-2008-07-20  Eric Belanger  <eric at archlinux.org>
-
-	* keytouch 2.4.1-1
-	* Upstream update
-	* Removed unnecessary post-upgrade message
-
-2008-06-16  Eric Belanger  <eric at archlinux.org>
-
-	* keytouch 2.4.0-1
-	* Upstream update
-	* Patched for glibc 2.8
-	* Added to [extra] repo
-	* Added ChangeLog

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-23 22:38:02 UTC (rev 128420)
+++ PKGBUILD	2011-06-23 23:07:34 UTC (rev 128421)
@@ -1,58 +1,59 @@
 # $Id$
-# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Eric Bélanger <eric at archlinux.org>
 # Contributor: mouse256 & AndyRTR
 # Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=keytouch
 pkgver=2.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A program which allows you to easily configure the extra function keys of your keyboard"
 arch=('i686' 'x86_64')
 url="http://keytouch.sourceforge.net/"
 license=('GPL')
-depends=('libxtst' 'gnome-menus' 'alsa-lib')
-makedepends=('pkgconfig')
+depends=('libxtst' 'gnome-menus' 'alsa-lib' 'gtk2')
+optdepends=('acpid: for ACPI support')
 options=('!makeflags')
 install=keytouch.install
 source=(http://downloads.sourceforge.net/sourceforge/keytouch/${pkgname}-${pkgver}.tar.gz \
         keytouch.daemon keytouch.desktop Xsession)
-md5sums=('c3a917ae9666c9649d43d9aa09ecc96a' 'a35776aee9361577220f718be81c2b4d'\
-         'c5ffe28988dc74fae812ffe204f8883b' '795430001f4fdb6691d0e93b09a241a9')
-sha1sums=('f1f26dc95c21afd404aebe2b1066e75c8313ca80' 'af23f4526cb1f3e5b9a3680af6a24d1566dabb7d'\
-         '5bac2f62f1ac26caa32da02a8075dc090d981cfb' '960b2fa51cfdeb2bc3fa7e086dc9f3a3be483dff')
+md5sums=('c3a917ae9666c9649d43d9aa09ecc96a'
+         '5bd72f347f56c0524c7a7c8f44fc9a3a'
+         'c5ffe28988dc74fae812ffe204f8883b'
+         '795430001f4fdb6691d0e93b09a241a9')
+sha1sums=('f1f26dc95c21afd404aebe2b1066e75c8313ca80'
+          '9c3ff4fd979fd0322014768bec132ddf005c7f7b'
+          '5bac2f62f1ac26caa32da02a8075dc090d981cfb'
+          '960b2fa51cfdeb2bc3fa7e086dc9f3a3be483dff')
 
 build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	./configure --prefix=/usr --sysconfdir=/etc || return 1
-	make || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
 
-	cd keytouch-config
-	./configure --prefix=/usr --sysconfdir=/etc || return 1
-	make || return 1
+  cd keytouch-config
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
 
-	cd ../keytouch-keyboard
-	./configure --prefix=/usr --sysconfdir=/etc || return 1
-	make || return 1
+  cd ../keytouch-keyboard
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
 }
 
 package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	install -d ${pkgdir}/etc/{rc.d,X11/Xsession.d} || return 1
-	install -d ${pkgdir}/usr/share/keytouch || return 1
-	make DESTDIR=${pkgdir} install || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  install -d "${pkgdir}"/etc/{rc.d,X11/Xsession.d}
+  install -d "${pkgdir}/usr/share/keytouch"
+  make DESTDIR="${pkgdir}" install
 
-	cd keytouch-config
-	make DESTDIR=${pkgdir} install || return 1
+  cd keytouch-config
+  make DESTDIR="${pkgdir}" install
 
-	cd ../keytouch-keyboard
-  	make DESTDIR=${pkgdir} install || return 1
+  cd ../keytouch-keyboard
+  make DESTDIR="${pkgdir}" install
 
-	install -Dm755 ${srcdir}/keytouch.daemon \
-	    ${pkgdir}/etc/rc.d/keytouch || return 1
-	install -Dm644 ${srcdir}/keytouch.desktop \
-	    ${pkgdir}/usr/share/applications/keytouch.desktop || return 1
-	install -Dm755 ${srcdir}/Xsession \
-	    ${pkgdir}/etc/X11/Xsession || return 1
-	chmod 755  ${pkgdir}/etc/X11/Xsession.d/* || return 1
-	rm ${pkgdir}/etc/rc.d/*.sh
+  install -Dm755 "${srcdir}/keytouch.daemon" "${pkgdir}/etc/rc.d/keytouch"
+  install -Dm644 "${srcdir}/keytouch.desktop" "${pkgdir}/usr/share/applications/keytouch.desktop"
+  install -Dm755 "${srcdir}/Xsession" "${pkgdir}/etc/X11/Xsession"
+  chmod 755 "${pkgdir}"/etc/X11/Xsession.d/*
+  rm "${pkgdir}"/etc/rc.d/*.sh
 }

Modified: keytouch.daemon
===================================================================
--- keytouch.daemon	2011-06-23 22:38:02 UTC (rev 128420)
+++ keytouch.daemon	2011-06-23 23:07:34 UTC (rev 128421)
@@ -7,9 +7,6 @@
 case "$1" in
   start)
     stat_busy "Starting keyTouch Daemon"
-    if [ -x /etc/rc.d/acpid ]; then
-      ck_daemon acpid && /etc/rc.d/acpid start
-    fi
     /usr/bin/keytouch-init
     if [ -z "$PID" ]; then
       /usr/bin/keytouch-acpid &> /dev/null &