summaryrefslogtreecommitdiff
path: root/extra/subversion
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-12-01 11:08:57 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-12-01 11:08:57 -0300
commit1200fd46a32625f2ac4b035653cb49c22cce6426 (patch)
tree0723ee124b40e6e95200ca002f9ae81361ab7919 /extra/subversion
parent0d0d9e0930114504c15aa8174e2c7d1d2b7a6744 (diff)
parentfd115d7057eb8243df6edfaf1ed440d6f3e70692 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/iat/PKGBUILD community/libnsbmp/PKGBUILD community/libnsgif/PKGBUILD community/libopenraw/PKGBUILD community/netsurf/PKGBUILD core/bison/PKGBUILD core/perl/PKGBUILD extra/avahi/PKGBUILD extra/mutt/PKGBUILD extra/php/PKGBUILD
Diffstat (limited to 'extra/subversion')
-rw-r--r--extra/subversion/PKGBUILD6
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index bcb020df4..824de1897 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 130071 2011-07-01 21:53:41Z stephane $
+# $Id: PKGBUILD 143824 2011-11-29 13:33:54Z stephane $
# Maintainer: Paul Mattal <paul@archlinux.org>
# Contributor: Jason Chu <jason@archlinux.org>
pkgname=subversion
pkgver=1.6.17
-pkgrel=6
+pkgrel=7
pkgdesc="A Modern Concurrent Version Control System"
arch=('i686' 'x86_64' 'mips64el')
license=('apache' 'bsd')
depends=('neon' 'apr-util' 'sqlite3')
optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion')
-makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime'
+makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' 'java-environment'
'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs')
[ "$CARCH" = "mips64el" ] && \
makedepends=('krb5' 'apache' 'python2' 'perl' 'swig'