diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-20 15:39:19 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-20 15:39:19 +0200 |
| commit | f201c0c97570e91af0fcec400d827a3f1bba79cc (patch) | |
| tree | 6b87f10653f54a3b7294d3f2028704e323849781 /extra/avahi | |
| parent | f97d206e9152e1d29ad8fb9f2ea2aee95f1da625 (diff) | |
| parent | 947c2e7bbbd5942492024997d34d709d436f1c8f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/python/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
testing/colord/PKGBUILD
testing/epiphany/PKGBUILD
testing/fcitx/PKGBUILD
testing/folks/PKGBUILD
testing/gcalctool/PKGBUILD
testing/gcc/PKGBUILD
testing/gnome-games/PKGBUILD
testing/gnome-shell/PKGBUILD
testing/mutter/PKGBUILD
testing/yelp/PKGBUILD
Diffstat (limited to 'extra/avahi')
| -rw-r--r-- | extra/avahi/PKGBUILD | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 1c1b4c30b..0b6b85c53 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 155887 2012-04-08 22:28:42Z bisson $ +# $Id: PKGBUILD 156451 2012-04-18 12:14:05Z bisson $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=avahi pkgver=0.6.31 -pkgrel=2 +pkgrel=3 pkgdesc='Multicast/unicast DNS-SD framework' url='http://www.avahi.org/' license=('LGPL') @@ -36,7 +36,6 @@ sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684' conflicts=('howl' 'mdnsresponder') provides=('howl' 'mdnsresponder') -replaces=('howl' 'mdnsresponder') install=install |