[arch-commits] Commit in acpi/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Bélanger]

    Date: Wednesday, November 12, 2008 @ 21:32:45
  Author: eric
Revision: 18971

fixed svn conflict

Modified:
  acpi/repos/extra-x86_64/	(properties)
  acpi/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-12 21:36:04 UTC (rev 18970)
+++ extra-x86_64/PKGBUILD	2008-11-13 02:32:45 UTC (rev 18971)
@@ -1,14 +1,17 @@
 # $Id$
-# Maintainer: Judd Vinet <jvinet at zeroflux.org>
+# Contributor: Judd Vinet <jvinet at zeroflux.org>
+# Maintainer: Thayer Williams <thayer at archlinux.org>
+
 pkgname=acpi
 pkgver=0.09
-pkgrel=1
-pkgdesc="Linux ACPI Client"
-arch=(i686 x86_64)
+pkgrel=2
+pkgdesc="a Linux ACPI client providing battery, AC power, and thermal readings"
+arch=('i686' 'x86_64')
 url="http://grahame.angrygoats.net/acpi.shtml"
 depends=('glibc')
 source=(http://grahame.angrygoats.net/source/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('a5a70595834b487c3a2f9278a3d60768')
+license=('GPL2')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver