[arch-commits] Commit in avahi/repos (8 files)

Gaetan Bisson bisson at archlinux.org
Mon Nov 10 23:52:44 UTC 2014


    Date: Tuesday, November 11, 2014 @ 00:52:44
  Author: bisson
Revision: 226001

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  avahi/repos/extra-i686/PKGBUILD
    (from rev 226000, avahi/trunk/PKGBUILD)
  avahi/repos/extra-i686/install
    (from rev 226000, avahi/trunk/install)
  avahi/repos/extra-x86_64/PKGBUILD
    (from rev 226000, avahi/trunk/PKGBUILD)
  avahi/repos/extra-x86_64/install
    (from rev 226000, avahi/trunk/install)
Deleted:
  avahi/repos/extra-i686/PKGBUILD
  avahi/repos/extra-i686/install
  avahi/repos/extra-x86_64/PKGBUILD
  avahi/repos/extra-x86_64/install

-----------------------+
 /PKGBUILD             |  160 ++++++++++++++++++++++++++++++++++++++++++++++++
 /install              |   22 ++++++
 extra-i686/PKGBUILD   |   77 -----------------------
 extra-i686/install    |   11 ---
 extra-x86_64/PKGBUILD |   77 -----------------------
 extra-x86_64/install  |   11 ---
 6 files changed, 182 insertions(+), 176 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2014-11-10 23:52:17 UTC (rev 226000)
+++ extra-i686/PKGBUILD	2014-11-10 23:52:44 UTC (rev 226001)
@@ -1,77 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
-
-pkgname=avahi
-pkgver=0.6.31
-pkgrel=13
-pkgdesc='Multicast/unicast DNS-SD framework'
-url='http://www.avahi.org/'
-license=('LGPL')
-arch=('i686' 'x86_64')
-options=('!emptydirs')
-depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm' 'dbus')
-optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
-            'gtk2: gtk2 bindings'
-            'qt4: qt4 bindings'
-            'pygtk: avahi-bookmarks, avahi-discover'
-            'python2-twisted: avahi-bookmarks'
-            'mono: mono bindings'
-            'python2-dbus: avahi-discover'
-            'nss-mdns: NSS support for mDNS')
-makedepends=('qt4' 'pygtk' 'mono' 'intltool' 'python2-dbus'
-             'gtk-sharp-2' 'gobject-introspection' 'gtk3' 'xmltoman')
-backup=('etc/avahi/hosts'
-        'etc/avahi/avahi-daemon.conf'
-        'etc/avahi/services/ssh.service'
-        'etc/avahi/services/sftp-ssh.service'
-        'usr/lib/avahi/service-types.db'
-        'usr/share/avahi/service-types')
-source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz")
-sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684')
-
-conflicts=('howl' 'mdnsresponder')
-provides=('howl' 'mdnsresponder')
-
-install=install
-
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	sed '/^Libs:/s:$: -ldbus-1:' -i avahi-client.pc.in
-	sed 's:netdev:network:g' -i avahi-daemon/avahi-dbus.conf
-	sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action
-	sed 's:-DG[^ ]*_DISABLE_DEPRECATED=1::g' -i avahi-ui/Makefile.*
-}
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	export MOC_QT4=/usr/bin/moc-qt4
-	export PYTHON=/usr/bin/python2
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--sbindir=/usr/bin \
-		--disable-monodoc \
-		--disable-qt3 \
-		--enable-compat-libdns_sd \
-		--enable-compat-howl \
-		--with-distro=archlinux \
-		--with-avahi-priv-access-group=network \
-		--with-autoipd-user=avahi \
-		--with-autoipd-group=avahi \
-		--with-systemdsystemunitdir=/usr/lib/systemd/system \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	rm -fr "${pkgdir}"/etc/rc.d
-
-	# howl and mdnsresponder compatability
-	cd "${pkgdir}"/usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl
-	cd "${pkgdir}"/usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc
-}

Copied: avahi/repos/extra-i686/PKGBUILD (from rev 226000, avahi/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2014-11-10 23:52:44 UTC (rev 226001)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
+
+pkgname=avahi
+pkgver=0.6.31
+pkgrel=14
+pkgdesc='Multicast/unicast DNS-SD framework'
+url='http://www.avahi.org/'
+license=('LGPL')
+arch=('i686' 'x86_64')
+options=('!emptydirs')
+depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm' 'dbus')
+optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
+            'gtk2: gtk2 bindings'
+            'qt4: qt4 bindings'
+            'pygtk: avahi-bookmarks, avahi-discover'
+            'python2-twisted: avahi-bookmarks'
+            'mono: mono bindings'
+            'python2-dbus: avahi-discover'
+            'nss-mdns: NSS support for mDNS')
+makedepends=('qt4' 'pygtk' 'mono' 'intltool' 'python2-dbus'
+             'gtk-sharp-2' 'gobject-introspection' 'gtk3' 'xmltoman')
+backup=('etc/avahi/hosts'
+        'etc/avahi/avahi-daemon.conf'
+        'etc/avahi/services/ssh.service'
+        'etc/avahi/services/sftp-ssh.service'
+        'usr/lib/avahi/service-types.db'
+        'usr/share/avahi/service-types')
+source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz")
+sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684')
+
+conflicts=('howl' 'mdnsresponder')
+provides=('howl' 'mdnsresponder')
+
+install=install
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed '/^Libs:/s:$: -ldbus-1:' -i avahi-client.pc.in
+	sed 's:netdev:network:g' -i avahi-daemon/avahi-dbus.conf
+	sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action
+	sed 's:-DG[^ ]*_DISABLE_DEPRECATED=1::g' -i avahi-ui/Makefile.*
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	export MOC_QT4=/usr/bin/moc-qt4
+	export PYTHON=/usr/bin/python2
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--sbindir=/usr/bin \
+		--disable-monodoc \
+		--disable-qt3 \
+		--enable-compat-libdns_sd \
+		--enable-compat-howl \
+		--with-distro=archlinux \
+		--with-avahi-priv-access-group=network \
+		--with-autoipd-user=avahi \
+		--with-autoipd-group=avahi \
+		--with-systemdsystemunitdir=/usr/lib/systemd/system \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	rm -fr "${pkgdir}"/etc/rc.d
+
+	# howl and mdnsresponder compatability
+	cd "${pkgdir}"/usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl
+	cd "${pkgdir}"/usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc
+
+	# see FS#42638
+	ln avahi-daemon.service -s "${pkgdir}"/usr/lib/systemd/system/dbus-org.freedesktop.Avahi.service
+}

Deleted: extra-i686/install
===================================================================
--- extra-i686/install	2014-11-10 23:52:17 UTC (rev 226000)
+++ extra-i686/install	2014-11-10 23:52:44 UTC (rev 226001)
@@ -1,11 +0,0 @@
-post_install() {
-	getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null
-	getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null
-	true
-}
-
-post_remove() {
-	getent passwd avahi &>/dev/null && userdel avahi >/dev/null
-	getent group avahi &>/dev/null && groupdel avahi >/dev/null
-	true
-}

Copied: avahi/repos/extra-i686/install (from rev 226000, avahi/trunk/install)
===================================================================
--- extra-i686/install	                        (rev 0)
+++ extra-i686/install	2014-11-10 23:52:44 UTC (rev 226001)
@@ -0,0 +1,11 @@
+post_install() {
+	getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null
+	getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null
+	true
+}
+
+post_remove() {
+	getent passwd avahi &>/dev/null && userdel avahi >/dev/null
+	getent group avahi &>/dev/null && groupdel avahi >/dev/null
+	true
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2014-11-10 23:52:17 UTC (rev 226000)
+++ extra-x86_64/PKGBUILD	2014-11-10 23:52:44 UTC (rev 226001)
@@ -1,77 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
-
-pkgname=avahi
-pkgver=0.6.31
-pkgrel=13
-pkgdesc='Multicast/unicast DNS-SD framework'
-url='http://www.avahi.org/'
-license=('LGPL')
-arch=('i686' 'x86_64')
-options=('!emptydirs')
-depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm' 'dbus')
-optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
-            'gtk2: gtk2 bindings'
-            'qt4: qt4 bindings'
-            'pygtk: avahi-bookmarks, avahi-discover'
-            'python2-twisted: avahi-bookmarks'
-            'mono: mono bindings'
-            'python2-dbus: avahi-discover'
-            'nss-mdns: NSS support for mDNS')
-makedepends=('qt4' 'pygtk' 'mono' 'intltool' 'python2-dbus'
-             'gtk-sharp-2' 'gobject-introspection' 'gtk3' 'xmltoman')
-backup=('etc/avahi/hosts'
-        'etc/avahi/avahi-daemon.conf'
-        'etc/avahi/services/ssh.service'
-        'etc/avahi/services/sftp-ssh.service'
-        'usr/lib/avahi/service-types.db'
-        'usr/share/avahi/service-types')
-source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz")
-sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684')
-
-conflicts=('howl' 'mdnsresponder')
-provides=('howl' 'mdnsresponder')
-
-install=install
-
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	sed '/^Libs:/s:$: -ldbus-1:' -i avahi-client.pc.in
-	sed 's:netdev:network:g' -i avahi-daemon/avahi-dbus.conf
-	sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action
-	sed 's:-DG[^ ]*_DISABLE_DEPRECATED=1::g' -i avahi-ui/Makefile.*
-}
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	export MOC_QT4=/usr/bin/moc-qt4
-	export PYTHON=/usr/bin/python2
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--sbindir=/usr/bin \
-		--disable-monodoc \
-		--disable-qt3 \
-		--enable-compat-libdns_sd \
-		--enable-compat-howl \
-		--with-distro=archlinux \
-		--with-avahi-priv-access-group=network \
-		--with-autoipd-user=avahi \
-		--with-autoipd-group=avahi \
-		--with-systemdsystemunitdir=/usr/lib/systemd/system \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	rm -fr "${pkgdir}"/etc/rc.d
-
-	# howl and mdnsresponder compatability
-	cd "${pkgdir}"/usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl
-	cd "${pkgdir}"/usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc
-}

Copied: avahi/repos/extra-x86_64/PKGBUILD (from rev 226000, avahi/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2014-11-10 23:52:44 UTC (rev 226001)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
+
+pkgname=avahi
+pkgver=0.6.31
+pkgrel=14
+pkgdesc='Multicast/unicast DNS-SD framework'
+url='http://www.avahi.org/'
+license=('LGPL')
+arch=('i686' 'x86_64')
+options=('!emptydirs')
+depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm' 'dbus')
+optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
+            'gtk2: gtk2 bindings'
+            'qt4: qt4 bindings'
+            'pygtk: avahi-bookmarks, avahi-discover'
+            'python2-twisted: avahi-bookmarks'
+            'mono: mono bindings'
+            'python2-dbus: avahi-discover'
+            'nss-mdns: NSS support for mDNS')
+makedepends=('qt4' 'pygtk' 'mono' 'intltool' 'python2-dbus'
+             'gtk-sharp-2' 'gobject-introspection' 'gtk3' 'xmltoman')
+backup=('etc/avahi/hosts'
+        'etc/avahi/avahi-daemon.conf'
+        'etc/avahi/services/ssh.service'
+        'etc/avahi/services/sftp-ssh.service'
+        'usr/lib/avahi/service-types.db'
+        'usr/share/avahi/service-types')
+source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz")
+sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684')
+
+conflicts=('howl' 'mdnsresponder')
+provides=('howl' 'mdnsresponder')
+
+install=install
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed '/^Libs:/s:$: -ldbus-1:' -i avahi-client.pc.in
+	sed 's:netdev:network:g' -i avahi-daemon/avahi-dbus.conf
+	sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action
+	sed 's:-DG[^ ]*_DISABLE_DEPRECATED=1::g' -i avahi-ui/Makefile.*
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	export MOC_QT4=/usr/bin/moc-qt4
+	export PYTHON=/usr/bin/python2
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--sbindir=/usr/bin \
+		--disable-monodoc \
+		--disable-qt3 \
+		--enable-compat-libdns_sd \
+		--enable-compat-howl \
+		--with-distro=archlinux \
+		--with-avahi-priv-access-group=network \
+		--with-autoipd-user=avahi \
+		--with-autoipd-group=avahi \
+		--with-systemdsystemunitdir=/usr/lib/systemd/system \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	rm -fr "${pkgdir}"/etc/rc.d
+
+	# howl and mdnsresponder compatability
+	cd "${pkgdir}"/usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl
+	cd "${pkgdir}"/usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc
+
+	# see FS#42638
+	ln avahi-daemon.service -s "${pkgdir}"/usr/lib/systemd/system/dbus-org.freedesktop.Avahi.service
+}

Deleted: extra-x86_64/install
===================================================================
--- extra-x86_64/install	2014-11-10 23:52:17 UTC (rev 226000)
+++ extra-x86_64/install	2014-11-10 23:52:44 UTC (rev 226001)
@@ -1,11 +0,0 @@
-post_install() {
-	getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null
-	getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null
-	true
-}
-
-post_remove() {
-	getent passwd avahi &>/dev/null && userdel avahi >/dev/null
-	getent group avahi &>/dev/null && groupdel avahi >/dev/null
-	true
-}

Copied: avahi/repos/extra-x86_64/install (from rev 226000, avahi/trunk/install)
===================================================================
--- extra-x86_64/install	                        (rev 0)
+++ extra-x86_64/install	2014-11-10 23:52:44 UTC (rev 226001)
@@ -0,0 +1,11 @@
+post_install() {
+	getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null
+	getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null
+	true
+}
+
+post_remove() {
+	getent passwd avahi &>/dev/null && userdel avahi >/dev/null
+	getent group avahi &>/dev/null && groupdel avahi >/dev/null
+	true
+}


More information about the arch-commits mailing list