avahi-0.6.25: remove opendreambox override in order to avoid starting avahi-daemon...

diff --git a/recipes/avahi/avahi-python_0.6.25.bb b/recipes/avahi/avahi-python_0.6.25.bb
index 9c9e77d..1b4e667 100644 (file)
--- a/recipes/avahi/avahi-python_0.6.25.bb
+++ b/recipes/avahi/avahi-python_0.6.25.bb
@@ -1,6 +1,6 @@
 require avahi.inc
 
-PR = "r1"
+PR = "r2"
 
 # FIXME: without --enable-gtk, avahi-discover (pygtk) won't be built
 FILES_avahi-discover = ""

diff --git a/recipes/avahi/avahi-ui_0.6.25.bb b/recipes/avahi/avahi-ui_0.6.25.bb
index 966958d..7a31c47 100644 (file)
--- a/recipes/avahi/avahi-ui_0.6.25.bb
+++ b/recipes/avahi/avahi-ui_0.6.25.bb
@@ -1,6 +1,6 @@
 require avahi.inc
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS += "avahi gtk+"
 

diff --git a/recipes/avahi/avahi.inc b/recipes/avahi/avahi.inc
index f699318..55ae660 100644 (file)
--- a/recipes/avahi/avahi.inc
+++ b/recipes/avahi/avahi.inc
@@ -64,10 +64,8 @@ CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
 INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
 INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
 INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
-INITSCRIPT_PARAMS_avahi-daemon_opendreambox = "start 21 S 2 3 5 . stop 19 0 1 6 ."
 INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
 INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
-INITSCRIPT_PARAMS_avahi-dnsconfd_opendreambox = "start 22 S 2 3 5 . stop 19 0 1 6 ."
 
 # At the time the postinst runs, dbus might not be setup so only restart if running
 

diff --git a/recipes/avahi/avahi_0.6.25.bb b/recipes/avahi/avahi_0.6.25.bb
index 61a62a5..9a89826 100644 (file)
--- a/recipes/avahi/avahi_0.6.25.bb
+++ b/recipes/avahi/avahi_0.6.25.bb
@@ -1,6 +1,6 @@
 require avahi.inc
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS += "intltool-native"