[arch-commits] Commit in gpm/trunk (ChangeLog PKGBUILD gpm gpm.conf.d gpm.install)

Eric Bélanger eric at archlinux.org
Sun Sep 20 05:28:22 UTC 2009


    Date: Sunday, September 20, 2009 @ 01:28:21
  Author: eric
Revision: 52457

upgpkg: gpm 1.20.6-2
    Updated stock config and fixed rc.d script (close FS#16126), Removed array in install scriptlet

Modified:
  gpm/trunk/ChangeLog
  gpm/trunk/PKGBUILD
  gpm/trunk/gpm
  gpm/trunk/gpm.conf.d
  gpm/trunk/gpm.install

-------------+
 ChangeLog   |    6 ++++++
 PKGBUILD    |   23 +++++++++++------------
 gpm         |    5 +++--
 gpm.conf.d  |    2 +-
 gpm.install |   10 +++-------
 5 files changed, 24 insertions(+), 22 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2009-09-20 02:28:07 UTC (rev 52456)
+++ ChangeLog	2009-09-20 05:28:21 UTC (rev 52457)
@@ -1,3 +1,9 @@
+2009-09-20  Eric Belanger  <eric at archlinux.org>
+
+	* gpm 1.20.6-2
+	* Updated stock config and fixed rc.d script (close FS#16126)
+	* Removed array in install scriptlet
+
 2009-02-09  Eric Belanger  <eric at archlinux.org>
 
 	* gpm 1.20.6-1

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-09-20 02:28:07 UTC (rev 52456)
+++ PKGBUILD	2009-09-20 05:28:21 UTC (rev 52457)
@@ -4,7 +4,7 @@
 
 pkgname=gpm
 pkgver=1.20.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A mouse server for the console and xterm"
 arch=('i686' 'x86_64')
 url="http://unix.schottelius.org/gpm/"
@@ -15,22 +15,21 @@
 install=gpm.install
 source=(http://unix.schottelius.org/gpm/archives/${pkgname}-${pkgver}.tar.bz2 \
         gpm gpm.conf.d)
-md5sums=('6b534da16dc1b28ba828dea89e520f6f' 'c4d42a4725503a5524cae060a959a3d3'\
-         '5f109341a7d1bb18c59d7c3a395d848a')
-sha1sums=('f3bb9272878b7934968381c8b25edab359114150' 'c13ad1422d24af320e2abb9786c7eacef39b293c'\
-          '3bcb67027f0ad7dc393388fb02c261126671f9f5')
+md5sums=('6b534da16dc1b28ba828dea89e520f6f' '945ecde0836687e05c13ea837092ea6c'\
+         '13b7d82a20cc7a625ba098469d8b8d10')
+sha1sums=('f3bb9272878b7934968381c8b25edab359114150' '19e1feb1493373512a77801699df012d186336ea'\
+         '2a415a5d9a48dc7ce02bd62c7518dfd5aacbc1d1')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc || return 1
   make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  install -D -m755 ../gpm ${pkgdir}/etc/rc.d/gpm || return 1
-  install -D -m644 ../gpm.conf.d ${pkgdir}/etc/conf.d/gpm || return 1
-  gzip ${pkgdir}/usr/share/info/gpm.info
+  make DESTDIR="${pkgdir}" install || return 1
+  install -D -m755 ../gpm "${pkgdir}/etc/rc.d/gpm" || return 1
+  install -D -m644 ../gpm.conf.d "${pkgdir}/etc/conf.d/gpm" || return 1
 
 # library fixes
-  cd ${pkgdir}/usr/lib/
+  cd "${pkgdir}/usr/lib/"
   ln -s libgpm.so.2.* libgpm.so || return 1
-  chmod 755 ${pkgdir}/usr/lib/libgpm.so.* || return 1
+  chmod 755 "${pkgdir}"/usr/lib/libgpm.so.* || return 1
 }

Modified: gpm
===================================================================
--- gpm	2009-09-20 02:28:07 UTC (rev 52456)
+++ gpm	2009-09-20 05:28:21 UTC (rev 52457)
@@ -7,12 +7,13 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`pidof -o %PPID /usr/sbin/gpm`
+PID=$(pidof -o %PPID /usr/sbin/gpm)
 case "$1" in
   start)
     stat_busy "Starting GPM Daemon"
     [ -z "$PID" ] && /usr/sbin/gpm ${GPM_ARGS}
-    if [ $? -gt 0 ]; then
+    PID=$(pidof -o %PPID /usr/sbin/gpm)
+    if [ -z "$PID" ]; then
       stat_fail
     else
       add_daemon gpm

Modified: gpm.conf.d
===================================================================
--- gpm.conf.d	2009-09-20 02:28:07 UTC (rev 52456)
+++ gpm.conf.d	2009-09-20 05:28:21 UTC (rev 52457)
@@ -1,4 +1,4 @@
 #
 # Parameters to be passed to gpm
 #
-GPM_ARGS="-m /dev/misc/psaux"
+GPM_ARGS="-m /dev/psaux"

Modified: gpm.install
===================================================================
--- gpm.install	2009-09-20 02:28:07 UTC (rev 52456)
+++ gpm.install	2009-09-20 05:28:21 UTC (rev 52457)
@@ -1,10 +1,8 @@
 infodir=/usr/share/info
-filelist=(gpm.info.gz)
+file=gpm.info.gz
 
 post_install() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
+  install-info $infodir/$file $infodir/dir 2> /dev/null
 }
 
 post_upgrade() {
@@ -12,7 +10,5 @@
 }
 
 pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
+  install-info --delete $infodir/$file $infodir/dir 2> /dev/null
 }




More information about the arch-commits mailing list