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

[Ronald van Haren]

    Date: Sunday, September 28, 2008 @ 12:57:01
  Author: ronald
Revision: 13801

fix svn merge conflict

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

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


Property changes on: xmoto/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /xmoto/trunk:1-236
   + /xmoto/trunk:1-13800

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-09-28 16:55:04 UTC (rev 13800)
+++ extra-i686/PKGBUILD	2008-09-28 16:57:01 UTC (rev 13801)
@@ -5,12 +5,12 @@
 
 pkgname=xmoto
 pkgver=0.4.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A challenging 2D motocross platform game, where physics play an important role."
 arch=('i686' 'x86_64')
 url="http://xmoto.tuxfamily.org"
 license=('GPL')
-depends=('bzip2' 'libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode' 'curl>=7.16.2' 
+depends=('bzip2' 'libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode=0.10.1' 'curl>=7.16.2' 
 	 'mesa' 'libxdamage' 'libxfixes' 'sqlite3' 'sdl_ttf' 'desktop-file-utils')
 install=xmoto.install
 source=(http://download.tuxfamily.org/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver-src.tar.gz \