[arch-commits] Commit in hwd/repos (3 files)

[Eric Bélanger]

    Date: Monday, November 17, 2008 @ 21:57:22
  Author: eric
Revision: 19260

Merged revisions 19253,19255 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/hwd/trunk

........
  r19253 | thayer | 2008-11-17 18:53:18 -0500 (Mon, 17 Nov 2008) | 2 lines
  
  upgpkg: hwd 5.3.4-2
      pkgbuild cleanup
........
  r19255 | thayer | 2008-11-17 18:54:39 -0500 (Mon, 17 Nov 2008) | 1 line
  
  more cleanup
........

Modified:
  hwd/repos/extra-x86_64/	(properties)
  hwd/repos/extra-x86_64/PKGBUILD
  hwd/repos/extra-x86_64/hwd.install

-------------+
 PKGBUILD    |   14 +++++++-------
 hwd.install |    6 +-----
 2 files changed, 8 insertions(+), 12 deletions(-)


Property changes on: hwd/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /hwd/trunk:1-19010
   + /hwd/trunk:1-19259

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-18 02:55:45 UTC (rev 19259)
+++ extra-x86_64/PKGBUILD	2008-11-18 02:57:22 UTC (rev 19260)
@@ -1,22 +1,22 @@
 # $Id$
-# Maintainer: damir <damir at archlinux.org>
 # Contributor: Markku (rasat at Arch Linux Forums)
+# Contributor: damir <damir at archlinux.org>
+# Maintainer: Thayer Williams <thayer at archlinux.org>
 
 pkgname=hwd
 pkgver=5.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Hardware detect for Arch Linux (devfs and udev)."
 url="http://user-contributions.org/projects/hwd/hwd.html"
+license=('GPL')
 arch=('i686' 'x86_64')
-license=('GPL')
 depends=('bash' 'pciutils' 'usbutils' 'ddcxinfo-arch' 'wget')
 install=hwd.install
 source=(http://user-contributions.org/projects/hwd/src/$pkgname-$pkgver.bin.tar.gz)
+md5sums=('002cfb6de516442203073084b6c1a7f9')
 
-
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  cp -R $startdir/src/$pkgname-$pkgver/{etc,usr} $startdir/pkg/ || return 1
+  cd $srcdir/$pkgname-$pkgver
+  cp -R $srcdir/$pkgname-$pkgver/{etc,usr} $pkgdir/ || return 1
 }
 
-md5sums=('002cfb6de516442203073084b6c1a7f9')

Modified: extra-x86_64/hwd.install
===================================================================
--- extra-x86_64/hwd.install	2008-11-18 02:55:45 UTC (rev 19259)
+++ extra-x86_64/hwd.install	2008-11-18 02:57:22 UTC (rev 19260)
@@ -1,15 +1,11 @@
-# arg 1:  the new package version
 post_install() {
     echo "==> Run 'hwd -u' to update xorgtable, pci-, and usb.ids."
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
-    echo "==> Run 'hwd -u' to update xorgtable, pci-, and usb.ids."
+    post_install 
 }
 
-# arg 1:  the old package version
 pre_remove() {
     rm -R /etc/hwd >/dev/null 2>&1
 }