[arch-commits] Commit in hal/repos (extra-i686 extra-i686/PKGBUILD)

[Jan de Groot]

    Date: Sunday, April 20, 2008 @ 08:48:51
  Author: jgc
Revision: 515

Merged revisions 2-514 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/hal/trunk

........
  r69 | jgc | 2008-04-10 18:07:20 +0000 (Thu, 10 Apr 2008) | 1 line
  
  upgpkg: hal 0.5.11rc2-1
........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r514 | jgc | 2008-04-20 12:48:38 +0000 (Sun, 20 Apr 2008) | 1 line
  
  upgpkg: hal 0.5.11rc2-2
........

Modified:
  hal/repos/extra-i686/	(properties)
  hal/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)


Property changes on: hal/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /hal/trunk:1
   + /hal/trunk:1-514

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-04-20 12:48:38 UTC (rev 514)
+++ extra-i686/PKGBUILD	2008-04-20 12:48:51 UTC (rev 515)
@@ -3,23 +3,25 @@
 # Contributor: Link Dupont <link at subpop.net>
 
 pkgname=hal
-pkgver=0.5.10
-pkgrel=1
+pkgver=0.5.11rc2
+pkgrel=2
 pkgdesc="Hardware Abstraction Layer"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
 url="http://www.freedesktop.org/wiki/Software/hal"
-depends=('dbus-glib>=0.74' 'libusb' 'udev>=111' 'filesystem>=0.7.1-5' 'hal-info>=0.20071011' 'eject' 'libsmbios>=0.13.6' 'dmidecode' 'pciutils>=2.2.8-2' 'usbutils>=0.73-3' 'pm-utils')
+depends=('dbus-glib>=0.74' 'dbus>=1.2.1' 'libusb>=0.1.12' 'udev>=118' 'filesystem>=0.7.1-5' 'hal-info>=0.20080317' 'eject' 'libsmbios>=2.0.2' 'dmidecode' 'pciutils>=2.2.8-3' 'usbutils>=0.73-5' 'pm-utils>=1.1.0')
 makedepends=('pkgconfig' 'gperf')
 options=('!libtool')
 install=hal.install
 source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
+	addon-input-nval.patch
 	hal
 	hal-policy.patch
 	cryptsetup_location.patch
 	hal-0.5.9-hide-diagnostic.patch
 	ntfs3g-valid-options.patch)
-md5sums=('fce852c428e7cda0b937087c79eec63f'
+md5sums=('ade962044a62e8f2dc4625a17f4a5c7e'
+	 '272755ed2004cfc362ffcf98167a4ef9'
          '882f67668cb14a0a9e4a27ef22278027'
          '5ba8b610aa9763a5f42b9f7cbd7a86ad'
          'c688a3c6574699365926f4fef7441545'
@@ -32,6 +34,7 @@
   patch -Np1 -i ${startdir}/src/cryptsetup_location.patch || return 1
   patch -Np1 -i ${startdir}/src/hal-0.5.9-hide-diagnostic.patch || return 1
   patch -Np0 -i ${startdir}/src/ntfs3g-valid-options.patch || return 1
+  patch -Np0 -i ${startdir}/src/addon-input-nval.patch || return 1
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --libexecdir=/usr/lib/hal --enable-static=no \
@@ -43,10 +46,10 @@
   sed -e 's/device-manager//' -i tools/Makefile || return 1
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1
-  mkdir -p ${startdir}/pkg/etc/rc.d
-  mkdir -p ${startdir}/pkg/media
+  install -m755 -d ${startdir}/pkg/etc/rc.d
+  install -m755 -d ${startdir}/pkg/media || return 1
   install -m 755 ${startdir}/src/hal ${startdir}/pkg/etc/rc.d/hal || return 1
 
-  mkdir -p ${startdir}/pkg/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${startdir}/pkg/usr/share/licenses/${pkgname}
+  install -m755 -d ${startdir}/pkg/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${startdir}/pkg/usr/share/licenses/${pkgname}/ || return 1
 }