From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Fri, 17 Oct 2008 10:21:52 +0000 (+0200)
Subject: avahi: do not force RDEPENDS for avahi-daemon and avahi-autoipd
X-Git-Tag: Release-2010-05/1~5740
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad538671aba6a6bd6979f9442f47e1325284a6b0;p=openembedded.git

avahi: do not force RDEPENDS for avahi-daemon and avahi-autoipd

* append to RDEPENDS instead of forcing them
* fixes problem where avahi-daemon cannot find libdaemon.so.0
---

diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc
index 268a24faba..9a0685578c 100644
--- a/packages/avahi/avahi.inc
+++ b/packages/avahi/avahi.inc
@@ -8,8 +8,8 @@ DEPENDS = "expat virtual/libintl libdaemon dbus glib-2.0"
 
 # uclibc has no nss
 RRECOMMENDS_avahi-daemon_append_linux = "libnss-mdns"
-RDEPENDS_avahi-daemon = "sysvinit-pidof update-rc.d"
-RDEPENDS_avahi-autoipd = "update-rc.d"
+RDEPENDS_avahi-daemon += "sysvinit-pidof update-rc.d"
+RDEPENDS_avahi-autoipd += "update-rc.d"
 
 SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
 	   file://00avahi-autoipd file://99avahi-autoipd"
diff --git a/packages/avahi/avahi_0.6.19.bb b/packages/avahi/avahi_0.6.19.bb
index 482f0cd5ad..f58923e862 100644
--- a/packages/avahi/avahi_0.6.19.bb
+++ b/packages/avahi/avahi_0.6.19.bb
@@ -1,3 +1,3 @@
 require avahi.inc
 
-FILE_PR = "r8"
+FILE_PR = "r9"
diff --git a/packages/avahi/avahi_0.6.20.bb b/packages/avahi/avahi_0.6.20.bb
index 482f0cd5ad..f58923e862 100644
--- a/packages/avahi/avahi_0.6.20.bb
+++ b/packages/avahi/avahi_0.6.20.bb
@@ -1,3 +1,3 @@
 require avahi.inc
 
-FILE_PR = "r8"
+FILE_PR = "r9"
diff --git a/packages/avahi/avahi_0.6.21.bb b/packages/avahi/avahi_0.6.21.bb
index 7a0546afba..4c66a364bc 100644
--- a/packages/avahi/avahi_0.6.21.bb
+++ b/packages/avahi/avahi_0.6.21.bb
@@ -1,6 +1,6 @@
 require avahi.inc
 
-FILE_PR = "r8"
+FILE_PR = "r9"
 
 SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1"
 SRC_URI += "file://avr32-ipv6-fix.patch;patch=1"
diff --git a/packages/avahi/avahi_0.6.22.bb b/packages/avahi/avahi_0.6.22.bb
index 0dae694e01..e70b8d4801 100644
--- a/packages/avahi/avahi_0.6.22.bb
+++ b/packages/avahi/avahi_0.6.22.bb
@@ -1,6 +1,6 @@
 require avahi.inc
 
 DEPENDS += "intltool-native"
-FILE_PR = "r8"
+FILE_PR = "r9"
 
 PACKAGES =+ "libavahi-gobject"