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 268a24faba44a15135b5fa5eb1190a4813fa3147..9a0685578ca3b7804b1d07baa171674ddc8f6edc 100644 (file)
--- 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 482f0cd5ad6e8fcf44b822311e222b911c19c74c..f58923e862905b4554aa713649a8d94ef639cbf5 100644 (file)
--- 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 482f0cd5ad6e8fcf44b822311e222b911c19c74c..f58923e862905b4554aa713649a8d94ef639cbf5 100644 (file)
--- 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 7a0546afbaefc21ed48b51d9853952263b8a0d1d..4c66a364bcb95cc3e2c5dafe3f0c77af35808f08 100644 (file)
--- 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 0dae694e010d2aa444291f88121203b32b1bf25f..e70b8d4801a4fa3990715f34a0d6e19efd3607a5 100644 (file)
--- 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"