diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-30 17:45:13 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-30 17:45:13 +0100 |
| commit | 704027491dc998e68dc1ac8e173bb0647ec8512e (patch) | |
| tree | 4dc3df4ac72df2b10f24db64fba455ab1d643aa3 /extra/avahi | |
| parent | cd972a1ebaf9446976ea495f013947a8937c15b0 (diff) | |
| parent | 51867161079ab52d5152105142a3bc965c63ca03 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/erlang/PKGBUILD
community/virtkey/PKGBUILD
community/yaws/PKGBUILD
core/openldap/PKGBUILD
extra/avahi/PKGBUILD
extra/gdb/PKGBUILD
Diffstat (limited to 'extra/avahi')
| -rw-r--r-- | extra/avahi/PKGBUILD | 12 |
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' |