[arch-commits] Commit in mate-user-share/trunk (PKGBUILD)

[Martin Wimpress]

    Date: Friday, January 17, 2014 @ 13:14:45
  Author: flexiondotorg
Revision: 104311

Conflicts with AUR package mate-user-share-bluez4.

Modified:
  mate-user-share/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-17 11:54:21 UTC (rev 104310)
+++ PKGBUILD	2014-01-17 12:14:45 UTC (rev 104311)
@@ -1,10 +1,9 @@
 # $Id$
 # Maintainer : Martin Wimpress <code at flexion.org>
-# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper at gmail.com>
 
 pkgname=mate-user-share
 pkgver=1.6.1
-pkgrel=4
+pkgrel=5
 pkgdesc="User level public file sharing via WebDAV."
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
@@ -13,6 +12,7 @@
 makedepends=('libcanberra' 'libnotify' 'mate-common' 'mate-doc-utils'
              'mate-file-manager' 'perl-xml-parser')
 options=('!emptydirs')
+conflicts=('mate-user-share-bluez4')
 groups=('mate-extra')
 install=${pkgname}.install
 source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz"