[arch-commits] Commit in aufs2-util/repos (testing-i686 testing-i686/PKGBUILD)

[Tobias Powalowski]

    Date: Wednesday, April 8, 2009 @ 10:53:32
  Author: tpowa
Revision: 34252

Merged revisions 34121,34251 via svnmerge from 
svn+ssh://tpowa@archlinux.org/srv/svn-packages/aufs2-util/trunk

........
  r34121 | tpowa | 2009-04-06 17:24:52 +0000 (Mo, 06 Apr 2009) | 2 lines
  
  'add id tag'
........
  r34251 | tpowa | 2009-04-08 14:52:21 +0000 (Mi, 08 Apr 2009) | 1 line
  
  upgpkg: aufs2-util 20090406-2
........

Modified:
  aufs2-util/repos/testing-i686/	(properties)
  aufs2-util/repos/testing-i686/PKGBUILD	(contents, properties)

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


Property changes on: aufs2-util/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /aufs2-util/trunk:1-34115
   + /aufs2-util/trunk:1-34251

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-04-08 14:52:21 UTC (rev 34251)
+++ testing-i686/PKGBUILD	2009-04-08 14:53:32 UTC (rev 34252)
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 22880 2008-12-29 19:39:08Z tpowa $
+# $Id$
 # Contributor: Paul Mattal <paul at mattal.com>
 # Maintainer: Paul Mattal <pjmattal at elys.com>
 pkgname=aufs2-util
 pkgver=20090406
-pkgrel=1
+pkgrel=2
 pkgdesc="Another Unionfs Implementation that supports NFS branches"
 arch=('i686' 'x86_64')
 url="http://aufs.sourceforge.net/"
 license=('GPL2')
 depends=('glibc')
-conflicts=('aufs-utils')
+replaces=('aufs-utils')
 source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.bz2)
 
 build() {


Property changes on: aufs2-util/repos/testing-i686/PKGBUILD
___________________________________________________________________
Added: svn:keywords
   + Id