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

[andyrtr at archlinux.org]

    Date: Saturday, November 6, 2010 @ 16:48:21
  Author: andyrtr
Revision: 98307

fix conflicts/replaces

Modified:
  garcon/trunk/PKGBUILD

----------+
 PKGBUILD |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-06 20:39:51 UTC (rev 98306)
+++ PKGBUILD	2010-11-06 20:48:21 UTC (rev 98307)
@@ -12,7 +12,8 @@
 groups=('xfce4')
 depends=('glib2' 'perl')
 makedepends=('pkgconfig' 'intltool' 'xfce4-dev-tools>=4.7.3')
-conflicts=('garcon-git')
+conflicts=('garcon-git' 'xfdesktop<4.7.0')
+replaces=('libxfce4menu')
 options=('!libtool')
 source=(http://archive.xfce.org/src/libs/garcon/0.1/garcon-${pkgver}.tar.bz2)
 md5sums=('22067b008b6d41c7b70b1608858cdd6d')