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

[Eric Belanger]

    Date: Saturday, July 5, 2008 @ 01:10:33
  Author: eric
Revision: 4199

fixing svn conflict

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

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


Property changes on: bzr/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /bzr/trunk:1-141
   + /bzr/trunk:1-4198

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-07-05 05:09:00 UTC (rev 4198)
+++ extra-x86_64/PKGBUILD	2008-07-05 05:10:33 UTC (rev 4199)
@@ -1,15 +1,15 @@
 # $Id$
-# Maintainer: simo <simo at archlinux.org>
+# Maintainer: Hugo Doria <hugo at archlinux.org>
 pkgname=bzr
-pkgver=1.3
-pkgrel=1
+pkgver=1.5
+pkgrel=2
 pkgdesc="A decentralized revision control system"
 arch=('i686' 'x86_64')
 url="http://www.bazaar-vcs.org"
 license=('GPL')
 depends=('python')
 source=(http://bazaar-vcs.org/releases/src/bzr-$pkgver.tar.gz)
-md5sums=('1af233c6fa0a68851bc6155b2f563c30')
+md5sums=('fa82e556401802537eeb8e50ecc8b4e7')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver