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

Ionut Biru ibiru at archlinux.org
Sun Feb 5 06:46:41 EST 2012


    Date: Sunday, February 5, 2012 @ 06:46:41
  Author: ibiru
Revision: 148680

db-move: moved avahi from [testing] to [extra] (x86_64)

Added:
  avahi/repos/extra-x86_64/PKGBUILD
    (from rev 148654, avahi/repos/testing-x86_64/PKGBUILD)
  avahi/repos/extra-x86_64/gnome-nettool.png
    (from rev 148654, avahi/repos/testing-x86_64/gnome-nettool.png)
  avahi/repos/extra-x86_64/install
    (from rev 148654, avahi/repos/testing-x86_64/install)
  avahi/repos/extra-x86_64/rc.d.patch
    (from rev 148654, avahi/repos/testing-x86_64/rc.d.patch)
Deleted:
  avahi/repos/extra-x86_64/PKGBUILD
  avahi/repos/extra-x86_64/gnome-nettool.png
  avahi/repos/extra-x86_64/install
  avahi/repos/extra-x86_64/rc.d.patch
  avahi/repos/testing-x86_64/

------------+
 PKGBUILD   |  150 +++++++++++++++++++++++++++++------------------------------
 install    |   42 ++++++++--------
 rc.d.patch |   22 ++++----
 3 files changed, 107 insertions(+), 107 deletions(-)

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-02-05 11:46:38 UTC (rev 148679)
+++ extra-x86_64/PKGBUILD	2012-02-05 11:46:41 UTC (rev 148680)
@@ -1,75 +0,0 @@
-# $Id$
-# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-
-pkgname=avahi
-pkgver=0.6.30
-pkgrel=6
-pkgdesc='A multicast/unicast DNS-SD framework'
-arch=('i686' 'x86_64')
-url='http://www.avahi.org/'
-license=('LGPL')
-depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
-optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
-            'gtk2: gtk2 bindings'
-            'qt3: qt3 bindings'
-            'qt: qt bindings'
-            'pygtk: avahi-bookmarks, avahi-discover'
-            'twisted: avahi-bookmarks'
-            'mono: mono bindings'
-            'dbus-python: avahi-discover'
-            'nss-mdns: NSS support for mDNS')
-makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
-             'gtk-sharp-2' 'gobject-introspection' 'gtk3')
-backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
-install=install
-conflicts=('howl' 'mdnsresponder')
-provides=('howl' 'mdnsresponder')
-replaces=('howl' 'mdnsresponder')
-options=('!libtool')
-source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz"
-        'gnome-nettool.png'
-        'rc.d.patch')
-sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06'
-          'cf56387c88aed246b9f435efc182ef44de4d52f3'
-          '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
-	patch -p1 -i "../rc.d.patch"
-
-	# pygtk requires python2; make it explicit in case other python are installed: FS#21865
-	PYTHON=python2 \
-	PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \
-		./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-monodoc \
-		--disable-doxygen-doc \
-		--disable-xmltoman \
-		--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=/lib/systemd/system # See FS#20999
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	install -D -m 644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png
-
-	cd "${pkgdir}"
-	sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover}
-	# howl and mdnsresponder compatability
-	(cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl)
-	(cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc)
-}

Copied: avahi/repos/extra-x86_64/PKGBUILD (from rev 148654, avahi/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-02-05 11:46:41 UTC (rev 148680)
@@ -0,0 +1,75 @@
+# $Id$
+# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+
+pkgname=avahi
+pkgver=0.6.30
+pkgrel=7
+pkgdesc='A multicast/unicast DNS-SD framework'
+arch=('i686' 'x86_64')
+url='http://www.avahi.org/'
+license=('LGPL')
+depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
+optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
+            'gtk2: gtk2 bindings'
+            'qt3: qt3 bindings'
+            'qt: qt bindings'
+            'pygtk: avahi-bookmarks, avahi-discover'
+            'twisted: avahi-bookmarks'
+            'mono: mono bindings'
+            'dbus-python: avahi-discover'
+            'nss-mdns: NSS support for mDNS')
+makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
+             'gtk-sharp-2' 'gobject-introspection' 'gtk3')
+backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
+install=install
+conflicts=('howl' 'mdnsresponder')
+provides=('howl' 'mdnsresponder')
+replaces=('howl' 'mdnsresponder')
+options=('!libtool')
+source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz"
+        'gnome-nettool.png'
+        'rc.d.patch')
+sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06'
+          'cf56387c88aed246b9f435efc182ef44de4d52f3'
+          '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
+	patch -p1 -i "../rc.d.patch"
+
+	# pygtk requires python2; make it explicit in case other python are installed: FS#21865
+	PYTHON=python2 \
+	PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \
+		./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--disable-static \
+		--disable-monodoc \
+		--disable-doxygen-doc \
+		--disable-xmltoman \
+		--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=/lib/systemd/system # See FS#20999
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	install -D -m 644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png
+
+	cd "${pkgdir}"
+	sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover}
+	# howl and mdnsresponder compatability
+	(cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl)
+	(cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc)
+}

Deleted: extra-x86_64/gnome-nettool.png
===================================================================
(Binary files differ)

Copied: avahi/repos/extra-x86_64/gnome-nettool.png (from rev 148654, avahi/repos/testing-x86_64/gnome-nettool.png)
===================================================================
(Binary files differ)

Deleted: extra-x86_64/install
===================================================================
--- extra-x86_64/install	2012-02-05 11:46:38 UTC (rev 148679)
+++ extra-x86_64/install	2012-02-05 11:46:41 UTC (rev 148680)
@@ -1,21 +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
-
-  cat <<EOF
-==> The following daemons may be added to DAEMONS in /etc/rc.conf:
-==> avahi-daemon: the mdns responder, you probably want this.
-==>               dbus needs to be running when you start it.
-==> avahi-dnsconfd: daemon used for peer-to-peer automatic dns
-==>                 configuration on dhcp-less networks.
-
-==> To use some of the client applications you will have to install python.
-==> In addition, pygtk is required for the graphical ones and
-==> twisted for avahi-bookmarks.
-EOF
-}
-
-post_remove() {
-  getent passwd avahi &>/dev/null && userdel avahi >/dev/null
-  getent group avahi &>/dev/null && groupdel avahi >/dev/null
-}

Copied: avahi/repos/extra-x86_64/install (from rev 148654, avahi/repos/testing-x86_64/install)
===================================================================
--- extra-x86_64/install	                        (rev 0)
+++ extra-x86_64/install	2012-02-05 11:46:41 UTC (rev 148680)
@@ -0,0 +1,21 @@
+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
+
+  cat <<EOF
+==> The following daemons may be added to DAEMONS in /etc/rc.conf:
+==> avahi-daemon: the mdns responder, you probably want this.
+==>               dbus needs to be running when you start it.
+==> avahi-dnsconfd: daemon used for peer-to-peer automatic dns
+==>                 configuration on dhcp-less networks.
+
+==> To use some of the client applications you will have to install python.
+==> In addition, pygtk is required for the graphical ones and
+==> twisted for avahi-bookmarks.
+EOF
+}
+
+post_remove() {
+  getent passwd avahi &>/dev/null && userdel avahi >/dev/null
+  getent group avahi &>/dev/null && groupdel avahi >/dev/null
+}

Deleted: extra-x86_64/rc.d.patch
===================================================================
--- extra-x86_64/rc.d.patch	2012-02-05 11:46:38 UTC (rev 148679)
+++ extra-x86_64/rc.d.patch	2012-02-05 11:46:41 UTC (rev 148680)
@@ -1,11 +0,0 @@
-diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in
---- old/initscript/archlinux/avahi-daemon.in	2011-06-24 03:07:00.916170590 +0200
-+++ new/initscript/archlinux/avahi-daemon.in	2011-06-24 03:16:32.220596377 +0200
-@@ -33,6 +33,7 @@
- 
- case "$1" in
-     start)
-+        ck_daemon dbus && { echo -n "Start dbus first." >&2; stat_die; }
-         stat_busy "Starting $DESC"
-         $DAEMON -D > /dev/null 2>&1
-         if [ $? -gt 0 ]; then

Copied: avahi/repos/extra-x86_64/rc.d.patch (from rev 148654, avahi/repos/testing-x86_64/rc.d.patch)
===================================================================
--- extra-x86_64/rc.d.patch	                        (rev 0)
+++ extra-x86_64/rc.d.patch	2012-02-05 11:46:41 UTC (rev 148680)
@@ -0,0 +1,11 @@
+diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in
+--- old/initscript/archlinux/avahi-daemon.in	2011-06-24 03:07:00.916170590 +0200
++++ new/initscript/archlinux/avahi-daemon.in	2011-06-24 03:16:32.220596377 +0200
+@@ -33,6 +33,7 @@
+ 
+ case "$1" in
+     start)
++        ck_daemon dbus && { echo -n "Start dbus first." >&2; stat_die; }
+         stat_busy "Starting $DESC"
+         $DAEMON -D > /dev/null 2>&1
+         if [ $? -gt 0 ]; then



More information about the arch-commits mailing list