[arch-commits] Commit in subversion/trunk (PKGBUILD)

[Douglas Soares de Andrade]

    Date: Saturday, March 21, 2009 @ 13:51:03
  Author: douglas
Revision: 30730

upgpkg: subversion 1.6.0-1

Modified:
  subversion/trunk/PKGBUILD

----------+
 PKGBUILD |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-21 17:45:08 UTC (rev 30729)
+++ PKGBUILD	2009-03-21 17:51:03 UTC (rev 30730)
@@ -12,7 +12,7 @@
 makedepends=('heimdal>=1.2' 'db>=4.7' 'apache>=2.2.9-3' 'python>=2.6-1'
              'perl>=5.10.0-3' 'swig>=1.3.31' 'ruby' 'openjdk6' 'autoconf')
 source=(http://svn.collab.net/tarballs/${pkgname}-${pkgver}.tar.gz
-        svnserve svn svnserve.conf)
+        svnserve svn svnserve.conf svnmerge.py)
 
 backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
 url="http://subversion.tigris.org/"
@@ -63,7 +63,8 @@
    install -m 755 $startdir/src/svnserve $startdir/pkg/etc/rc.d
    install -m 644 $startdir/src/svn $startdir/pkg/etc/xinetd.d
    install -m 644 $startdir/src/svnserve.conf $startdir/pkg/etc/conf.d/svnserve
-   install -m 755 $startdir/src/subversion-$pkgver/contrib/client-side/svnmerge/svnmerge.py $startdir/pkg/usr/bin/svnmerge
+   install -m 755 $startdir/src/svnmerge.py $pkgdir/usr/bin/svnmerge
+   #install -m 755 $startdir/src/subversion-$pkgver/contrib/client-side/svnmerge/svnmerge.py $startdir/pkg/usr/bin/svnmerge
    install -D -m 644 $startdir/src/subversion-$pkgver/COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
 
    #libtoolslay not all because of kdesdk
@@ -74,4 +75,5 @@
 md5sums=('b74985c9191d4a652a9f618a06171880'
          'c5a2e490b3e58c6bd2ca3a2e72b71845'
          'a0db6dd43af33952739b6ec089852630'
-         'c459e299192552f61578f3438abf0664')
+         'c459e299192552f61578f3438abf0664'
+         '9540c341d669b3cdc27dcf2d36727aee')