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

[Eric Bélanger]

    Date: Friday, November 14, 2008 @ 03:08:49
  Author: eric
Revision: 19032

fixed svn conflict

Added:
  i8kmon/repos/extra-x86_64/i8kmon.daemon
    (from rev 19031, i8kmon/trunk/i8kmon.daemon)
Modified:
  i8kmon/repos/extra-x86_64/	(properties)
  i8kmon/repos/extra-x86_64/PKGBUILD
Deleted:
  i8kmon/repos/extra-x86_64/i8kmon

---------------+
 PKGBUILD      |   31 +++++++++++++++----------------
 i8kmon        |   37 -------------------------------------
 i8kmon.daemon |   37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 53 deletions(-)


Property changes on: i8kmon/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /i8kmon/trunk:1
   + /i8kmon/trunk:1-19031

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-14 08:06:37 UTC (rev 19031)
+++ extra-x86_64/PKGBUILD	2008-11-14 08:08:49 UTC (rev 19032)
@@ -1,34 +1,33 @@
 # $Id$
-# Maintainer: eric <eric at archlinux.org>
 # Contributor: Eric Johnson <eric at coding-zone.com>
+# Contributor: eric <eric at archlinux.org>
+# Maintainer: Thayer Williams <thayer at archlinux.org>
 
 pkgname=i8kmon
-pkgver=1.25
-pkgrel=3
-pkgdesc="Tk script for i8kutils and Dell Inspiron/Latitude notebooks"
-arch=(i686 x86_64)
+pkgver=1.27
+pkgrel=1
+pkgdesc="Tk-based daemon for i8kutils and Dell Inspiron/Latitude notebooks"
 url="http://people.debian.org/~dz/i8k/"
+license=('GPL2')
+arch=('i686' 'x86_64')
 depends=('i8kutils' 'tk')
 backup=(etc/i8kutils/i8kmon.conf)
-source=(http://people.debian.org/~dz/i8k/i8kutils_$pkgver.tar.gz i8kmon)
-md5sums=('50c03dde689c5709406118a7c6c120db' 'a9e6594b4f2b31e03875adfbc405b393')
+source=(http://ftp.archlinux.org/other/i8kutils/i8kutils_$pkgver.tar.gz i8kmon.daemon)
+md5sums=('8f3d3cbf7197fc209b0b64bf0a9732e3' 'a9e6594b4f2b31e03875adfbc405b393')
 
 build() {
   cd $startdir/src/i8kutils-$pkgver
 
   # conform to Arch Linux guidelines
-	#
-  /bin/sed -i 's|/etc/i8kmon|/etc/i8kutils/i8kmon.conf|g' i8kmon.1
-  /bin/sed -i 's|/etc/i8kmon|/etc/i8kutils/i8kmon.conf|g' i8kmon
+  /bin/sed -i 's|/etc/i8kmon|/etc/i8kutils/i8kmon.conf|g' i8kmon.1 || return 1
+  /bin/sed -i 's|/etc/i8kmon|/etc/i8kutils/i8kmon.conf|g' i8kmon || return 1
 
   # no configure script, and Makefile has /usr hardcoded
-	#
-  /bin/install -D -m755 i8kmon $startdir/pkg/usr/bin/i8kmon
-  /bin/install -D -m644 i8kmon.conf $startdir/pkg/etc/i8kutils/i8kmon.conf
-  /bin/install -D -m644 i8kmon.1 $startdir/pkg/usr/man/man1/i8kmon.1
+  /bin/install -D -m755 i8kmon $startdir/pkg/usr/bin/i8kmon || return 1
+  /bin/install -D -m644 i8kmon.conf $startdir/pkg/etc/i8kutils/i8kmon.conf || return 1
+  /bin/install -D -m644 i8kmon.1 $startdir/pkg/usr/share/man/man1/i8kmon.1 || return 1
 
   # install daemon script.
-  /bin/install -D -m755 ../i8kmon $startdir/pkg/etc/rc.d/i8kmon
-
+  /bin/install -D -m755 ../i8kmon.daemon $startdir/pkg/etc/rc.d/i8kmon || return 1
 }
 # vim: ts=2 sw=2 et ft=sh

Deleted: extra-x86_64/i8kmon
===================================================================
--- extra-x86_64/i8kmon	2008-11-14 08:06:37 UTC (rev 19031)
+++ extra-x86_64/i8kmon	2008-11-14 08:08:49 UTC (rev 19032)
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/i8kmon`
-case "$1" in
-  start)
-    stat_busy "Starting i8kmon Daemon"
-    if [ -z "$PID" ]; then 
-      /usr/bin/i8kmon -d &
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon i8kmon
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping i8kmon Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon i8kmon
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac

Copied: i8kmon/repos/extra-x86_64/i8kmon.daemon (from rev 19031, i8kmon/trunk/i8kmon.daemon)
===================================================================
--- extra-x86_64/i8kmon.daemon	                        (rev 0)
+++ extra-x86_64/i8kmon.daemon	2008-11-14 08:08:49 UTC (rev 19032)
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/bin/i8kmon`
+case "$1" in
+  start)
+    stat_busy "Starting i8kmon Daemon"
+    if [ -z "$PID" ]; then 
+      /usr/bin/i8kmon -d &
+    fi
+    if [ ! -z "$PID" -o $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon i8kmon
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping i8kmon Daemon"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon i8kmon
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac