[arch-commits] Commit in keytouch/repos (4 files)

[Eric Bélanger]

    Date: Saturday, October 17, 2009 @ 15:51:11
  Author: eric
Revision: 56012

Merged revisions 56011 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/keytouch/trunk

........
  r56011 | eric | 2009-10-17 15:49:50 -0400 (Sat, 17 Oct 2009) | 2 lines
  
  upgpkg: keytouch 2.4.1-2
      Fixed daemon script (close FS#15693)
........

Modified:
  keytouch/repos/extra-i686/	(properties)
  keytouch/repos/extra-i686/ChangeLog
  keytouch/repos/extra-i686/PKGBUILD
  keytouch/repos/extra-i686/keytouch.daemon

-----------------+
 ChangeLog       |    7 ++++++-
 PKGBUILD        |   36 +++++++++++++++++-------------------
 keytouch.daemon |   16 +++++++++++++---
 3 files changed, 36 insertions(+), 23 deletions(-)


Property changes on: keytouch/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /keytouch/trunk:1-5814
   + /keytouch/trunk:1-56011

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2009-10-17 19:49:50 UTC (rev 56011)
+++ extra-i686/ChangeLog	2009-10-17 19:51:11 UTC (rev 56012)
@@ -1,3 +1,8 @@
+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
@@ -3,5 +8,5 @@
 	* Upstream update
 	* Removed unnecessary post-upgrade message
-	
+
 2008-06-16  Eric Belanger  <eric at archlinux.org>
 

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-17 19:49:50 UTC (rev 56011)
+++ extra-i686/PKGBUILD	2009-10-17 19:51:11 UTC (rev 56012)
@@ -4,7 +4,7 @@
 
 pkgname=keytouch
 pkgver=2.4.1
-pkgrel=1
+pkgrel=2
 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/"
@@ -15,34 +15,32 @@
 install=keytouch.install
 source=(http://downloads.sourceforge.net/sourceforge/keytouch/${pkgname}-${pkgver}.tar.gz \
         keytouch.daemon keytouch.desktop Xsession)
-md5sums=('c3a917ae9666c9649d43d9aa09ecc96a' '80dbcf0dfb9d4d4d2c2d7932ca551040'\
+md5sums=('c3a917ae9666c9649d43d9aa09ecc96a' 'a35776aee9361577220f718be81c2b4d'\
          'c5ffe28988dc74fae812ffe204f8883b' '795430001f4fdb6691d0e93b09a241a9')
-sha1sums=('f1f26dc95c21afd404aebe2b1066e75c8313ca80'
-          'cd87632574349bd7c9ac00b7b8a8711000d43569'
-          '5bac2f62f1ac26caa32da02a8075dc090d981cfb'
-          '960b2fa51cfdeb2bc3fa7e086dc9f3a3be483dff')
+sha1sums=('f1f26dc95c21afd404aebe2b1066e75c8313ca80' 'af23f4526cb1f3e5b9a3680af6a24d1566dabb7d'\
+         '5bac2f62f1ac26caa32da02a8075dc090d981cfb' '960b2fa51cfdeb2bc3fa7e086dc9f3a3be483dff')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc || return 1
   make  || return 1
-  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
+  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}/keytouch-config
+  cd "${srcdir}/${pkgname}-${pkgver}/keytouch-config"
   ./configure --prefix=/usr --sysconfdir=/etc || return 1
   make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 
-  cd ${srcdir}/${pkgname}-${pkgver}/keytouch-keyboard
+  cd "${srcdir}/${pkgname}-${pkgver}/keytouch-keyboard"
   ./configure --prefix=/usr --sysconfdir=/etc || return 1
   make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 
-  install -D -m755 ${srcdir}/keytouch.daemon ${pkgdir}/etc/rc.d/keytouch || return 1
-  install -D -m644 ${srcdir}/keytouch.desktop ${pkgdir}/usr/share/applications/keytouch.desktop || return 1
-  install -D -m755 ${srcdir}/Xsession ${pkgdir}/etc/X11/Xsession || return 1
-  chmod 755  ${pkgdir}/etc/X11/Xsession.d/* || return 1
-  rm ${pkgdir}/etc/rc.d/*.sh
+  install -D -m755 "${srcdir}/keytouch.daemon" "${pkgdir}/etc/rc.d/keytouch" || return 1
+  install -D -m644 "${srcdir}/keytouch.desktop" "${pkgdir}/usr/share/applications/keytouch.desktop" || return 1
+  install -D -m755 "${srcdir}/Xsession" "${pkgdir}/etc/X11/Xsession" || return 1
+  chmod 755  "${pkgdir}"/etc/X11/Xsession.d/* || return 1
+  rm "${pkgdir}"/etc/rc.d/*.sh
 }

Modified: extra-i686/keytouch.daemon
===================================================================
--- extra-i686/keytouch.daemon	2009-10-17 19:49:50 UTC (rev 56011)
+++ extra-i686/keytouch.daemon	2009-10-17 19:51:11 UTC (rev 56012)
@@ -3,23 +3,33 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
+PID=$(pidof -o %PPID /usr/bin/keytouch-acpid)
 case "$1" in
   start)
     stat_busy "Starting keyTouch Daemon"
     if [ -x /etc/rc.d/acpid ]; then
-        ck_daemon acpid && /etc/rc.d/acpid start
+      ck_daemon acpid && /etc/rc.d/acpid start
     fi
     /usr/bin/keytouch-init
-    /usr/bin/keytouch-acpid &
+    if [ -z "$PID" ]; then
+      /usr/bin/keytouch-acpid &> /dev/null &
+    fi
     if [ $? -gt 0 ]; then
       stat_fail
     else
+      add_daemon keytouch
       stat_done
     fi
     ;;
   stop)
     stat_busy "Stopping keyTouch Daemon"
-    stat_done
+    [ ! -z "$PID" ] && kill $PID &>/dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon keytouch
+      stat_done
+    fi
     ;;
   restart)
     $0 stop