[arch-commits] Commit in subversion/repos (4 files)

[Douglas Soares de Andrade]

    Date: Friday, April 17, 2009 @ 08:18:48
  Author: douglas
Revision: 35818

Merged revisions 35817 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/subversion/trunk

........
  r35817 | douglas | 2009-04-17 09:18:03 -0300 (Sex, 17 Abr 2009) | 2 lines
  
  upgpkg: subversion 1.6.1-3
      Updated svnmerge to work with python2.6
........

Modified:
  subversion/repos/extra-i686/	(properties)
  subversion/repos/extra-i686/ChangeLog
  subversion/repos/extra-i686/PKGBUILD
  subversion/repos/extra-i686/svnmerge.py

-------------+
 ChangeLog   |    4 ++++
 PKGBUILD    |    7 ++++---
 svnmerge.py |    2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)


Property changes on: subversion/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /subversion/trunk:1-35305
   + /subversion/trunk:1-35817

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2009-04-17 12:18:03 UTC (rev 35817)
+++ extra-i686/ChangeLog	2009-04-17 12:18:48 UTC (rev 35818)
@@ -1,4 +1,8 @@
 
+2009-04-17  Douglas Soares de Andrade  <douglas at archlinux.org>
+
+	* Back to use svnmerge.py from trunk
+
 2009-04-11  Douglas Soares de Andrade  <douglas at archlinux.org>
 
 	* Removing libtool files

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-17 12:18:03 UTC (rev 35817)
+++ extra-i686/PKGBUILD	2009-04-17 12:18:48 UTC (rev 35818)
@@ -4,7 +4,7 @@
 
 pkgname=subversion
 pkgver=1.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Replacement for CVS, another versioning system (svn)"
 arch=(i686 x86_64)
 license=('apache' 'bsd')
@@ -71,11 +71,12 @@
    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/subversion-$pkgver/contrib/client-side/svnmerge/svnmerge.py $startdir/pkg/usr/bin/svnmerge
+   install -m 755 $startdir/src/svnmerge.py $startdir/pkg/usr/bin/svnmerge
    install -D -m 644 $startdir/src/subversion-$pkgver/COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
 }
 md5sums=('32014fe70397357fa1e0ef8f937a0232'
          'c5a2e490b3e58c6bd2ca3a2e72b71845'
          'a0db6dd43af33952739b6ec089852630'
          'c459e299192552f61578f3438abf0664'
-         '9540c341d669b3cdc27dcf2d36727aee')
+         '21bf3aa5b797ce98eba8307f30e9c070')

Modified: extra-i686/svnmerge.py
===================================================================
--- extra-i686/svnmerge.py	2009-04-17 12:18:03 UTC (rev 35817)
+++ extra-i686/svnmerge.py	2009-04-17 12:18:48 UTC (rev 35818)
@@ -913,7 +913,7 @@
         # As of 1.6 propdel no longer supports deleting a
         # non-existent property.
         out = launchsvn('propget "%s" "%s"' % (name, dir))
-        if (len(out) > 0):
+        if out:
             svn_command('propdel "%s" "%s"' % (name, dir))
 
 def set_merge_props(dir, props):