[arch-commits] Commit in avahi/trunk (5 files)

[Gaetan Bisson]

    Date: Thursday, June 23, 2011 @ 23:51:45
  Author: bisson
Revision: 128481

fix FS#24844 and cleanup file prefixes

Added:
  avahi/trunk/install
    (from rev 128451, avahi/trunk/avahi.install)
  avahi/trunk/rc.d.patch
Modified:
  avahi/trunk/PKGBUILD
Deleted:
  avahi/trunk/avahi-daemon-dbus.patch
  avahi/trunk/avahi.install

-------------------------+
 PKGBUILD                |   14 +++++++-------
 avahi-daemon-dbus.patch |   11 -----------
 avahi.install           |   21 ---------------------
 install                 |   21 +++++++++++++++++++++
 rc.d.patch              |   11 +++++++++++
 5 files changed, 39 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-24 03:31:37 UTC (rev 128480)
+++ PKGBUILD	2011-06-24 03:51:45 UTC (rev 128481)
@@ -4,7 +4,7 @@
 
 pkgname=avahi
 pkgver=0.6.30
-pkgrel=3
+pkgrel=4
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'
@@ -22,23 +22,23 @@
 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=avahi.install
+install=install
 conflicts=('howl' 'mdnsresponder')
 provides=('howl' 'mdnsresponder')
 replaces=('howl' 'mdnsresponder')
 options=('!libtool')
 source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz"
-        'avahi-daemon-dbus.patch'
-        'gnome-nettool.png')
+        'gnome-nettool.png'
+        'rc.d.patch')
 sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06'
-          '36735096a6eeb3a4012fe14f875259ee8558e220'
-          'cf56387c88aed246b9f435efc182ef44de4d52f3')
+          'cf56387c88aed246b9f435efc182ef44de4d52f3'
+          '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
-	patch -p1 -i "../avahi-daemon-dbus.patch"
+	patch -p1 -i "../rc.d.patch"
 
 	# pygtk requires python2; make it explicit in case other python are installed: FS#21865
 	PYTHON=python2 \

Deleted: avahi-daemon-dbus.patch
===================================================================
--- avahi-daemon-dbus.patch	2011-06-24 03:31:37 UTC (rev 128480)
+++ avahi-daemon-dbus.patch	2011-06-24 03:51:45 UTC (rev 128481)
@@ -1,11 +0,0 @@
-diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in
---- old/initscript/archlinux/avahi-daemon.in	2010-06-29 05:30:35.000000000 +0200
-+++ new/initscript/archlinux/avahi-daemon.in	2011-06-07 12:20:03.237701492 +0200
-@@ -33,6 +33,7 @@
- 
- case "$1" in
-     start)
-+        ck_daemon dbus && /etc/rc.d/dbus start
-         stat_busy "Starting $DESC"
-         $DAEMON -D > /dev/null 2>&1
-         if [ $? -gt 0 ]; then

Deleted: avahi.install
===================================================================
--- avahi.install	2011-06-24 03:31:37 UTC (rev 128480)
+++ avahi.install	2011-06-24 03:51:45 UTC (rev 128481)
@@ -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/trunk/install (from rev 128451, avahi/trunk/avahi.install)
===================================================================
--- install	                        (rev 0)
+++ install	2011-06-24 03:51:45 UTC (rev 128481)
@@ -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
+}

Added: rc.d.patch
===================================================================
--- rc.d.patch	                        (rev 0)
+++ rc.d.patch	2011-06-24 03:51:45 UTC (rev 128481)
@@ -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