summaryrefslogtreecommitdiff
path: root/extra/avahi/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'extra/avahi/PKGBUILD')
-rw-r--r--extra/avahi/PKGBUILD12
1 files changed, 7 insertions, 5 deletions
diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD
index c050e4fc5..a4f008413 100644
--- a/extra/avahi/PKGBUILD
+++ b/extra/avahi/PKGBUILD
@@ -1,17 +1,19 @@
-# $Id: PKGBUILD 166539 2012-09-10 04:37:24Z bisson $
+# $Id: PKGBUILD 172143 2012-11-30 03:01:06Z bisson $
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=avahi
pkgver=0.6.31
-pkgrel=4
+pkgrel=5
pkgdesc='Multicast/unicast DNS-SD framework'
url='http://www.avahi.org/'
license=('LGPL')
arch=('i686' 'x86_64' 'mips64el')
options=('!libtool' '!emptydirs')
-depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
-optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
+<<<<<<< HEAD
+depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm')
+optdepends=('dbus: communicating with client applications'
+ 'gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
'gtk2: gtk2 bindings')
[ "$CARCH" != "mips64el" ] && optdepends+=('qt3: qt3 bindings')
optdepends+=('qt: qt bindings'
@@ -20,7 +22,7 @@ optdepends+=('qt: qt bindings'
[ "$CARCH" != "mips64el" ] && optdepends+=('mono: mono bindings')
optdepends+=('dbus-python: avahi-discover'
'nss-mdns: NSS support for mDNS')
-makedepends=('qt' 'pygtk' 'intltool' 'dbus-python'
+makedepends=('qt' 'pygtk' 'intltool' 'python2-dbus'
'gobject-introspection' 'gtk3' 'xmltoman')
[ "$CARCH" != "mips64el" ] && makedepends+=('qt3' 'mono' 'gtk-sharp-2')
backup=('etc/avahi/hosts'