summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrey Christoforo2015-10-14 08:49:09 +0100
committerGrey Christoforo2015-10-14 08:49:09 +0100
commitb9c18bd76bc2388999cad6dc7a4caeb41a5d61ae (patch)
treed46950ec1f6ba3ef9c8a4072740310c3790dfc80
parent42804c4057c85cfe4afe022ff9eb246eee6b70bc (diff)
downloadaur-b9c18bd76bc2388999cad6dc7a4caeb41a5d61ae.tar.gz
should now properly replace avahi from extra
-rw-r--r--.SRCINFO4
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD6
3 files changed, 7 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4e2d65834464..c1596add4a39 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = avahi-git
pkgdesc = Multicast DNS-SD / Zeroconf Suite git master
- pkgver = 0.6.32.rc.r0.g4a087c4
+ pkgver = 0.6.32.rc.r7.g916f65b
pkgrel = 1
url = http://www.avahi.org/
install = avahi.install
@@ -34,8 +34,10 @@ pkgbase = avahi-git
optdepends = nss-mdns: NSS support for mDNS
provides = howl
provides = mdnsresponder
+ provides = avahi
conflicts = howl
conflicts = mdnsresponder
+ conflicts = avahi
options = !emptydirs
backup = etc/avahi/hosts
backup = etc/avahi/avahi-daemon.conf
diff --git a/.gitignore b/.gitignore
index 4552cbc6889a..6b5aed4e452f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
pkg
src
*.log
+avahi/*
diff --git a/PKGBUILD b/PKGBUILD
index 362fa7628597..d384cfaa0505 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Grey Christoforo <first name [at] last name [dot] net>
pkgname=avahi-git
-pkgver=0.6.32.rc.r0.g4a087c4
+pkgver=0.6.32.rc.r7.g916f65b
pkgrel=1
pkgdesc='Multicast DNS-SD / Zeroconf Suite git master'
url='http://www.avahi.org/'
@@ -19,8 +19,8 @@ optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
'mono: mono bindings'
'python2-dbus: avahi-discover'
'nss-mdns: NSS support for mDNS')
-conflicts=(howl mdnsresponder)
-provides=(howl mdnsresponder)
+conflicts=(howl mdnsresponder avahi)
+provides=(howl mdnsresponder avahi)
install=avahi.install
options=(!emptydirs)
backup=(etc/avahi/{hosts,avahi-daemon.conf,services/{ssh,sftp-ssh}.service}