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

[Eric Belanger]

    Date: Tuesday, September 30, 2008 @ 20:13:35
  Author: eric
Revision: 13984

fixing svn conflict

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

----------+
 PKGBUILD |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-10-01 00:10:21 UTC (rev 13983)
+++ extra-x86_64/PKGBUILD	2008-10-01 00:13:35 UTC (rev 13984)
@@ -1,16 +1,16 @@
 # $Id$
-# Maintainer: simo <simo at archlinux.org>
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
 pkgname=sshfs
-pkgver=1.9
+pkgver=2.1
 pkgrel=1
 pkgdesc="FUSE client based on the SSH File Transfer Protocol."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://fuse.sourceforge.net/sshfs.html"
-license="GPL"
+license=('GPL2')
 depends=('fuse' 'glib2' 'openssh')
 makedepends=('pkgconfig')
-source=(http://switch.dl.sourceforge.net/sourceforge/fuse/$pkgname-fuse-$pkgver.tar.gz)
-md5sums=('05c3da4fa0f673f7ce5f480b3023af61')
+source=(http://downloads.sourceforge.net/sourceforge/fuse/$pkgname-fuse-$pkgver.tar.gz)
+md5sums=('997a419b6d0ad32a516823f8746b75c7')
 
 build() {
   cd $startdir/src/$pkgname-fuse-$pkgver