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

[Jan de Groot]

    Date: Sunday, November 9, 2008 @ 06:02:45
  Author: jgc
Revision: 18809

Resolve conflict

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

----------+
 PKGBUILD |   24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)


Property changes on: podsleuth/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /podsleuth/trunk:1-2608
   + /podsleuth/trunk:1-18808

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-09 10:55:53 UTC (rev 18808)
+++ extra-i686/PKGBUILD	2008-11-09 11:02:45 UTC (rev 18809)
@@ -3,30 +3,28 @@
 # Contributor: Hyperair <hyperair at gmail.com>
 
 pkgname=podsleuth
-pkgver=0.6.2
-pkgrel=2
+pkgver=0.6.3
+pkgrel=1
 pkgdesc="Tool to discover detailed information about Apple iPods"
 arch=('i686' 'x86_64')
 url="http://www.banshee-project.org/PodSleuth"
 license=('MIT')
 options=(!makeflags)
-depends=('mono>=1.9.1'
-         'ndesk-dbus>=0.6.0'
-         'sg3_utils'
-	 'hal>=0.5.11')
-	 source=(http://download.banshee-project.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('270978711987fb52e48ec80026fd080a')
+depends=('ndesk-dbus>=0.6.0' 'sg3_utils' 'hal>=0.5.11')
+replaces=('libipoddevice')
+source=(http://download.banshee-project.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('b5ee19f8a4eb8da8d600500df33eda87')
 
 build() {
   export MONO_SHARED_DIR="${srcdir}/.wabi"
-  mkdir -p ${MONO_SHARED_DIR}
+  mkdir -p "${MONO_SHARED_DIR}"
   
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr || return 1
   make || return 1
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-	$pkgdir/usr/share/licenses/$pkgname/COPYING
+  make DESTDIR="${pkgdir}" install || return 1
+  install -m755 -d "${pkgdir}/var/cache/podsleuth" || return 1
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
 }